From 7f98eb207fab223f79c409080dffe01e0f4d9b72 Mon Sep 17 00:00:00 2001 From: bbod Date: Sun, 29 Mar 2020 21:05:11 -0600 Subject: [PATCH] test --- HW10/ParseMatrixForMPI.h | 8 ++++---- HW10/main.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/HW10/ParseMatrixForMPI.h b/HW10/ParseMatrixForMPI.h index 54fada7..f76d13c 100644 --- a/HW10/ParseMatrixForMPI.h +++ b/HW10/ParseMatrixForMPI.h @@ -19,11 +19,11 @@ namespace matrixTools } template - std::vector FlattenMatrix(std::vector> matrix) + std::vector FlattenMatrix(std::vector> matrix, int columnSize, int rowSize) { - std::vector rVector(matrix.size() * matrix[0].size(), 0); - for (int i = 0; i < matrix.size(); i++) { - for (int j = 0; j < matrix[0].size(); j++) { + std::vector rVector((rowSize*columnSize), 0); + for (int i = 0; i < columnSize; i++) { + for (int j = 0; j < rowSize; j++) { rVector[i + j] = matrix[i][j]; } } diff --git a/HW10/main.cpp b/HW10/main.cpp index f8b45f5..2551935 100644 --- a/HW10/main.cpp +++ b/HW10/main.cpp @@ -28,7 +28,7 @@ int main(int argc, char* argv[]) } std::cout << std::endl; } - flatMatrix = matrixTools::FlattenMatrix(matrix); + flatMatrix = matrixTools::FlattenMatrix(matrix, matrix.size(), matrix[0].size()); for(int i = 0; i < flatMatrix.size(); i++){ std::cout << flatMatrix[i] << " "; }