From 33f3a10e1dc77587db79afccc1aea477c12e51cc Mon Sep 17 00:00:00 2001
From: bbod <bradybod@gmail.com>
Date: Sun, 29 Mar 2020 21:12:13 -0600
Subject: [PATCH] changed flatten

---
 HW10/ParseMatrixForMPI.h | 20 ++++++++++++--------
 HW10/main.cpp            |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/HW10/ParseMatrixForMPI.h b/HW10/ParseMatrixForMPI.h
index b4f1a46..539f1e9 100644
--- a/HW10/ParseMatrixForMPI.h
+++ b/HW10/ParseMatrixForMPI.h
@@ -19,15 +19,19 @@ namespace matrixTools
     }
 
     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);
-        for (int i = 0; i < columnSize; i++) {
-            for (int j = 0; j < rowSize; j++) {
-                rVector[j*i] = matrix[i][j];
-            }
-        }
-        return rVector;
+        std::vector<T> ret;
+        for(const auto &v: matrix)
+            ret.insert(ret.end(), v.begin(), v.end());
+        return ret;
+//        std::vector<T> rVector((rowSize*columnSize), 0);
+//        for (int i = 0; i < columnSize; i++) {
+//            for (int j = 0; j < rowSize; j++) {
+//                rVector[j*i] = matrix[i][j];
+//            }
+//        }
+//        return rVector;
     }
 }
 #endif //HW10_PARSEMATRIXFORMPI_H
diff --git a/HW10/main.cpp b/HW10/main.cpp
index 2551935..f8b45f5 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, matrix.size(), matrix[0].size());
+        flatMatrix = matrixTools::FlattenMatrix(matrix);
         for(int i = 0; i < flatMatrix.size(); i++){
             std::cout << flatMatrix[i] << " ";
         }