Relintai/MLPP
1
0
Fork 0
mirror of https://github.com/Relintai/MLPP.git synced 2025-04-23 21:23:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up code for LinAlg.kronecker_product

Browse Source
This commit is contained in:
novak_99 2021-05-29 21:40:43 -07:00
parent d6e94f662b
commit ad38db03cd
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MLPP/LinAlg/LinAlg.cpp
View File

@ -76,12 +76,8 @@ namespace MLPP{
std::vector<std::vector<double>> LinAlg::kronecker_product(std::vector<std::vector<double>> A, std::vector<std::vector<double>> B){ std::vector<std::vector<double>> LinAlg::kronecker_product(std::vector<std::vector<double>> A, std::vector<std::vector<double>> B){
std::vector<std::vector<double>> C; std::vector<std::vector<double>> C;
// C.resize(A.size() * B.size());
// for(int i = 0; i < C.size(); i++){
// C[i].resize(A[0].size() * B[0].size());
// }
// [1,2,3,4] [1,2,3,4,5] // [1,1,1,1] [1,2,3,4,5]
// [1,1,1,1] [1,2,3,4,5] // [1,1,1,1] [1,2,3,4,5]
// [1,2,3,4,5] // [1,2,3,4,5]
@ -95,11 +91,11 @@ namespace MLPP{
// Resulting matrix: A.size() * B.size() // Resulting matrix: A.size() * B.size()
// A[0].size() * B[0].size() // A[0].size() * B[0].size()
for(int k = 0; k < A.size(); k++){ for(int i = 0; i < A.size(); i++){
for(int j = 0; j < B.size(); j++){ for(int j = 0; j < B.size(); j++){
std::vector<std::vector<double>> row; std::vector<std::vector<double>> row;
for(int i = 0; i < A[0].size(); i++){ for(int k = 0; k < A[0].size(); k++){
row.push_back(scalarMultiply(A[k][i], B[j])); row.push_back(scalarMultiply(A[i][k], B[j]));
} }
C.push_back(flatten(row)); C.push_back(flatten(row));
} }