diff --git a/HW10/City.h b/HW10/City.h index 50d7030..9357532 100644 --- a/HW10/City.h +++ b/HW10/City.h @@ -14,8 +14,14 @@ public: int GetX(){ return X; } int GetY(){ return Y; } int GetName(){ return Name; } - bool operator< (const City &other) const { - return Name < other.Name; + bool operator < (const City &other) const { + return this->Name < other.Name; + } + bool operator > (const City &other) const { + return this->Name > other.Name; + } + bool operator == (const City &other) const{ + return this->Name == other.Name; } }; diff --git a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/CXX.includecache b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/CXX.includecache index cf6566a..61afb55 100644 --- a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/CXX.includecache +++ b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/CXX.includecache @@ -8,6 +8,18 @@ /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/City.h +/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/CostMatrixGenerator.cpp +CostMatrixGenerator.h +/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/CostMatrixGenerator.h + +/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/CostMatrixGenerator.h +City.h +/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/City.h +cmath +- +vector +- + /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.cpp MakePermutationMatrix.h /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.h @@ -18,6 +30,12 @@ City.h vector - +/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.cpp +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 @@ -33,8 +51,8 @@ vector - /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/main.cpp -MakePermutationMatrix.h -/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.h +CostMatrixGenerator.h +/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/CostMatrixGenerator.h ReadFromFile.h /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.h mpi.h diff --git a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.o b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.o new file mode 100644 index 0000000..57039d1 Binary files /dev/null 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 4478413..97016fc 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 20aaf87..932160c 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/depend.internal b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/depend.internal index 467e524..e395d18 100644 --- a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/depend.internal +++ b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/depend.internal @@ -1,6 +1,10 @@ # CMAKE generated file: DO NOT EDIT! # Generated by "Unix Makefiles" Generator, CMake Version 3.15 +CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.o + /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/City.h + /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/CostMatrixGenerator.cpp + /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/CostMatrixGenerator.h CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/City.h /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.cpp @@ -11,7 +15,7 @@ CMakeFiles/HW10.dir/ReadFromFile.cpp.o /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.h CMakeFiles/HW10.dir/main.cpp.o /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/City.h - /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.h + /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/CostMatrixGenerator.h /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.h /Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/main.cpp /usr/local/Cellar/open-mpi/4.0.2/include/mpi.h diff --git a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/depend.make b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/depend.make index 8e0230d..c0fbbd5 100644 --- a/HW10/cmake-build-debug/CMakeFiles/HW10.dir/depend.make +++ b/HW10/cmake-build-debug/CMakeFiles/HW10.dir/depend.make @@ -1,6 +1,10 @@ # CMAKE generated file: DO NOT EDIT! # Generated by "Unix Makefiles" Generator, CMake Version 3.15 +CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.o: ../City.h +CMakeFiles/HW10.dir/CostMatrixGenerator.cpp.o: ../CostMatrixGenerator.cpp +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 @@ -10,7 +14,7 @@ CMakeFiles/HW10.dir/ReadFromFile.cpp.o: ../ReadFromFile.cpp CMakeFiles/HW10.dir/ReadFromFile.cpp.o: ../ReadFromFile.h CMakeFiles/HW10.dir/main.cpp.o: ../City.h -CMakeFiles/HW10.dir/main.cpp.o: ../MakePermutationMatrix.h +CMakeFiles/HW10.dir/main.cpp.o: ../CostMatrixGenerator.h CMakeFiles/HW10.dir/main.cpp.o: ../ReadFromFile.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 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 faa1ec3..a53da2d 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 396d971..39c1e0a 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 6d3e29c..a3b9720 100644 --- a/HW10/main.cpp +++ b/HW10/main.cpp @@ -1,5 +1,5 @@ #import "CostMatrixGenerator.h" -#import "MakePermutationMatrix.h" +//#import "MakePermutationMatrix.h" #import "ReadFromFile.h" #import "mpi.h"