Auto Commit

This commit is contained in:
2020-03-31 00:41:53 -06:00
parent 30458e0e6d
commit 6351c5058d
11 changed files with 51 additions and 6 deletions

View File

@@ -10,10 +10,10 @@
class MakePermutationMatrix
{
public:
long double GetLowestCost(std::vector<City> source, int rank, int size, std::vector<std::vector<double>> costMatrix);
static long double GetLowestCost(std::vector<City> source, int rank, int size, std::vector<std::vector<double>> costMatrix);
private:
long double MakePermutation(std::vector<City> source, int rank, int size, std::vector<std::vector<double>> costMatrix);
static long double MakePermutation(std::vector<City> source, int rank, int size, std::vector<std::vector<double>> costMatrix);
};
#endif // HW10_MAKEPERMUTATIONMATRIX_H

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -0,0 +1 @@
empty

View File

@@ -0,0 +1 @@
empty

View File

@@ -0,0 +1 @@
empty

View File

@@ -0,0 +1 @@
5

View File

@@ -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];