diff --git a/HW10/ReadFromFile.cpp b/HW10/ReadFromFile.cpp index e41dbc7..e1296e2 100644 --- a/HW10/ReadFromFile.cpp +++ b/HW10/ReadFromFile.cpp @@ -1,8 +1,9 @@ // // Created by Brady Bodily on 3/28/20. // -#include +#include #include "ReadFromFile.h" + std::vector ReadFromFile::ReadFile(const std::string& fileName) { std::vector cities; diff --git a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.o b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.o index 57039d1..7d11ac1 100644 Binary files a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.o and b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.o differ diff --git a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o index 97016fc..fd9bbaa 100644 Binary files a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o and b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o differ diff --git a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/ReadFromFile.cpp.o b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/ReadFromFile.cpp.o index 932160c..520020b 100644 Binary files a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/ReadFromFile.cpp.o and b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/ReadFromFile.cpp.o differ diff --git a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/main.cpp.o b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/main.cpp.o index a53da2d..c3d1f24 100644 Binary files a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/main.cpp.o and b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/main.cpp.o differ diff --git a/HW10/cmake-build-debug/HW10 b/HW10/cmake-build-debug/HW10 index d339ac6..d2fa3a0 100755 Binary files a/HW10/cmake-build-debug/HW10 and b/HW10/cmake-build-debug/HW10 differ diff --git a/HW10/main.cpp b/HW10/main.cpp index a3b9720..ef27233 100644 --- a/HW10/main.cpp +++ b/HW10/main.cpp @@ -29,12 +29,12 @@ int main(int argc, char* argv[]) matrix[i].resize(citiesSize); } } - MPI_Bcast(&matrix[0][0], citiesSize*citiesSize, MPI_FLOAT, 0, MPI_COMM_WORLD); + MPI_Bcast(&matrix[0][0], citiesSize*citiesSize, MPI_DOUBLE, 0, MPI_COMM_WORLD); - if(!rank){ + if(rank){ for(int i = 0; i < citiesSize; i++){ for(int j = 0; j < citiesSize; j++) { - std::cout<<"Process " << rank << " has value " << matrix[i][j]; + std::cout<<"Process " << rank << " has value " << matrix[i][j] << std::endl; } } }