diff --git a/HW10/MakePermutationMatrix.h b/HW10/MakePermutationMatrix.h index 88ff1c1..1ed7d2d 100644 --- a/HW10/MakePermutationMatrix.h +++ b/HW10/MakePermutationMatrix.h @@ -10,10 +10,10 @@ class MakePermutationMatrix { public: - long double GetLowestCost(std::vector source, int rank, int size, std::vector> costMatrix); + static long double GetLowestCost(std::vector source, int rank, int size, std::vector> costMatrix); private: - long double MakePermutation(std::vector source, int rank, int size, std::vector> costMatrix); + static long double MakePermutation(std::vector source, int rank, int size, std::vector> costMatrix); }; #endif // HW10_MAKEPERMUTATIONMATRIX_H diff --git a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/CXX.includecache b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/CXX.includecache index 7e4fdc3..422bf91 100644 --- a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/CXX.includecache +++ b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/CXX.includecache @@ -16,10 +16,34 @@ cmath vector - +/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.cpp +MakePermutationMatrix.h +/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.h +mpi.h +/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/mpi.h +algorithm +- +iostream +- +cfloat +- + +/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.h +City.h +/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/City.h +vector +- + /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ParseMatrixForMPI.h vector - +/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.cpp +experimental/filesystem +- +ReadFromFile.h +/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.h + /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.h City.h /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/City.h @@ -34,17 +58,25 @@ string vector - +/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/SerializeCities.h +vector +- +City.h +/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/City.h + /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/main.cpp CostMatrixGenerator.h /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/CostMatrixGenerator.h -ReadFromFile.h -/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.h +MakePermutationMatrix.h +/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.h ParseMatrixForMPI.h /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ParseMatrixForMPI.h +ReadFromFile.h +/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.h mpi.h /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/mpi.h -iostream -- +SerializeCities.h +/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/SerializeCities.h /usr/local/Cellar/open-mpi/4.0.2/include/mpi.h stddef.h 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 fd9bbaa..5db3682 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/depend.internal b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/depend.internal index c62d27e..68fb46b 100644 --- a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/depend.internal +++ b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/depend.internal @@ -9,6 +9,8 @@ CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/City.h /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.cpp /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.h + /usr/local/Cellar/open-mpi/4.0.2/include/mpi.h + /usr/local/Cellar/open-mpi/4.0.2/include/mpi_portable_platform.h CMakeFiles/HW10.dir/ReadFromFile.cpp.o /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/City.h /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.cpp @@ -16,8 +18,10 @@ CMakeFiles/HW10.dir/ReadFromFile.cpp.o CMakeFiles/HW10.dir/main.cpp.o /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/City.h /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/CostMatrixGenerator.h + /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.h /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ParseMatrixForMPI.h /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.h + /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/SerializeCities.h /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/main.cpp /usr/local/Cellar/open-mpi/4.0.2/include/mpi.h /usr/local/Cellar/open-mpi/4.0.2/include/mpi_portable_platform.h diff --git a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/depend.make b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/depend.make index e06ac96..0eded82 100644 --- a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/depend.make +++ b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/depend.make @@ -8,6 +8,8 @@ CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.o: ../CostMatrixGenerator.h CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o: ../City.h CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o: ../MakePermutationMatrix.cpp CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o: ../MakePermutationMatrix.h +CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o: /usr/local/Cellar/open-mpi/4.0.2/include/mpi.h +CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o: /usr/local/Cellar/open-mpi/4.0.2/include/mpi_portable_platform.h CMakeFiles/HW10.dir/ReadFromFile.cpp.o: ../City.h CMakeFiles/HW10.dir/ReadFromFile.cpp.o: ../ReadFromFile.cpp @@ -15,8 +17,10 @@ CMakeFiles/HW10.dir/ReadFromFile.cpp.o: ../ReadFromFile.h CMakeFiles/HW10.dir/main.cpp.o: ../City.h CMakeFiles/HW10.dir/main.cpp.o: ../CostMatrixGenerator.h +CMakeFiles/HW10.dir/main.cpp.o: ../MakePermutationMatrix.h CMakeFiles/HW10.dir/main.cpp.o: ../ParseMatrixForMPI.h CMakeFiles/HW10.dir/main.cpp.o: ../ReadFromFile.h +CMakeFiles/HW10.dir/main.cpp.o: ../SerializeCities.h CMakeFiles/HW10.dir/main.cpp.o: ../main.cpp CMakeFiles/HW10.dir/main.cpp.o: /usr/local/Cellar/open-mpi/4.0.2/include/mpi.h CMakeFiles/HW10.dir/main.cpp.o: /usr/local/Cellar/open-mpi/4.0.2/include/mpi_portable_platform.h diff --git a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/main.cpp.o b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/main.cpp.o deleted file mode 100644 index f710b9b..0000000 Binary files a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/main.cpp.o and /dev/null differ diff --git a/HW10/cmake-build-debug/CMakeFiles/Progress/1 b/HW10/cmake-build-debug/CMakeFiles/Progress/1 new file mode 100644 index 0000000..7b4d68d --- /dev/null +++ b/HW10/cmake-build-debug/CMakeFiles/Progress/1 @@ -0,0 +1 @@ +empty \ No newline at end of file diff --git a/HW10/cmake-build-debug/CMakeFiles/Progress/2 b/HW10/cmake-build-debug/CMakeFiles/Progress/2 new file mode 100644 index 0000000..7b4d68d --- /dev/null +++ b/HW10/cmake-build-debug/CMakeFiles/Progress/2 @@ -0,0 +1 @@ +empty \ No newline at end of file diff --git a/HW10/cmake-build-debug/CMakeFiles/Progress/4 b/HW10/cmake-build-debug/CMakeFiles/Progress/4 new file mode 100644 index 0000000..7b4d68d --- /dev/null +++ b/HW10/cmake-build-debug/CMakeFiles/Progress/4 @@ -0,0 +1 @@ +empty \ No newline at end of file diff --git a/HW10/cmake-build-debug/CMakeFiles/Progress/count.txt b/HW10/cmake-build-debug/CMakeFiles/Progress/count.txt new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/HW10/cmake-build-debug/CMakeFiles/Progress/count.txt @@ -0,0 +1 @@ +5 diff --git a/HW10/main.cpp b/HW10/main.cpp index 1be0194..93e8f87 100644 --- a/HW10/main.cpp +++ b/HW10/main.cpp @@ -57,6 +57,7 @@ int main(int argc, char* argv[]) } lowestCost = MakePermutationMatrix::GetLowestCost(cities, rank, size, costMatrix); + std::cout << "The lowest cost is " << lowestCost << std::endl; // if(!rank){ // std::cout << costs.size() << std::endl; // std::cout << costs[0];