bradybod-usu/cs5500_parallel_prog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed flatten

Browse Source
This commit is contained in:
bbod
2020-03-29 21:12:13 -06:00
parent 45b16003d4
commit 33f3a10e1d
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
HW10/ParseMatrixForMPI.h
View File

@@ -19,15 +19,19 @@ namespace matrixTools
} }
template <typename T> template <typename T>
std::vector<T> FlattenMatrix(std::vector<std::vector<T>> matrix, int columnSize, int rowSize) std::vector<T> FlattenMatrix(std::vector<std::vector<T>> matrix)
{ {
std::vector<T> rVector((rowSize*columnSize), 0); std::vector<T> ret;
for (int i = 0; i < columnSize; i++) { for(const auto &v: matrix)
for (int j = 0; j < rowSize; j++) { ret.insert(ret.end(), v.begin(), v.end());
rVector[j*i] = matrix[i][j]; return ret;
} // std::vector<T> rVector((rowSize*columnSize), 0);
} // for (int i = 0; i < columnSize; i++) {
return rVector; // for (int j = 0; j < rowSize; j++) {
// rVector[j*i] = matrix[i][j];
// }
// }
// return rVector;
} }
} }
#endif //HW10_PARSEMATRIXFORMPI_H #endif //HW10_PARSEMATRIXFORMPI_H

2
HW10/main.cpp
View File

@@ -28,7 +28,7 @@ int main(int argc, char* argv[])
} }
std::cout << std::endl; std::cout << std::endl;
} }
flatMatrix = matrixTools::FlattenMatrix(matrix, matrix.size(), matrix[0].size()); flatMatrix = matrixTools::FlattenMatrix(matrix);
for(int i = 0; i < flatMatrix.size(); i++){ for(int i = 0; i < flatMatrix.size(); i++){
std::cout << flatMatrix[i] << " "; std::cout << flatMatrix[i] << " ";
} }