From 182b1aec9bdbf11eb23de820e9fad5f6b3cf0664 Mon Sep 17 00:00:00 2001 From: bbod Date: Mon, 30 Mar 2020 12:42:56 -0600 Subject: [PATCH] Auto Commit --- HW10/main.cpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/HW10/main.cpp b/HW10/main.cpp index f76eecb..a771482 100644 --- a/HW10/main.cpp +++ b/HW10/main.cpp @@ -23,22 +23,18 @@ int main(int argc, char* argv[]) citiesSize = cities.size(); //Make costMatrix costMatrix = CostMatrixGenerator::GenerateCostMatrix(cities); -// for(int i =0; i < cities.size(); i++){ -// for(int j = 0; j< cities.size(); j++){ -// std::cout << costMatrix[i][j] << " "; -// } -// std::cout << std::endl; -// } + flatMatrix = matrixTools::FlattenMatrix(costMatrix); SerializeCities::Serialize(cities); - std::cout << cities.size() << " Here: "; - for(int i = 0; i < cities.size(); i++){ - std::cout << cities[i].GetName() << " "; - } - std::cout << std::endl; +// std::cout << cities.size() << " Here: "; +// for(int i = 0; i < cities.size(); i++){ +// std::cout << cities[i].GetName() << " "; +// } +// std::cout << std::endl; } MPI_Bcast(&citiesSize, 1, MPI_INT, 0, MPI_COMM_WORLD); + if(rank){ // reserve memory for vectors flatMatrix.resize(citiesSize*citiesSize); @@ -57,7 +53,7 @@ int main(int argc, char* argv[]) } MPI_Bcast(&flatMatrix[0], flatMatrix.size(), MPI_DOUBLE, 0, MPI_COMM_WORLD); - MPI_Bcast(&serializedCity[0], citiesSize*3, MPI_INT, 0, MPI_COMM_WORLD); + MPI_Bcast(&serializedCity[0], serializedCity.size(), MPI_INT, 0, MPI_COMM_WORLD); std::vector costs; if(rank){