fixed comparison operators of City

This commit is contained in:
2020-03-29 16:58:35 -06:00
parent 9416bf4dc6
commit 21ca45ead4
10 changed files with 39 additions and 7 deletions

View File

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

View File

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

View File

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

View File

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

Binary file not shown.

View File

@@ -1,5 +1,5 @@
#import "CostMatrixGenerator.h"
#import "MakePermutationMatrix.h"
//#import "MakePermutationMatrix.h"
#import "ReadFromFile.h"
#import "mpi.h"