fixed comparison operators of City
This commit is contained in:
10
HW10/City.h
10
HW10/City.h
@@ -14,8 +14,14 @@ public:
|
|||||||
int GetX(){ return X; }
|
int GetX(){ return X; }
|
||||||
int GetY(){ return Y; }
|
int GetY(){ return Y; }
|
||||||
int GetName(){ return Name; }
|
int GetName(){ return Name; }
|
||||||
bool operator< (const City &other) const {
|
bool operator < (const City &other) const {
|
||||||
return Name < other.Name;
|
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;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,18 @@
|
|||||||
|
|
||||||
/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/City.h
|
/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
|
/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.cpp
|
||||||
MakePermutationMatrix.h
|
MakePermutationMatrix.h
|
||||||
/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.h
|
/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.h
|
||||||
@@ -18,6 +30,12 @@ City.h
|
|||||||
vector
|
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
|
/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.h
|
||||||
City.h
|
City.h
|
||||||
/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/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
|
/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/main.cpp
|
||||||
MakePermutationMatrix.h
|
CostMatrixGenerator.h
|
||||||
/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/MakePermutationMatrix.h
|
/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/CostMatrixGenerator.h
|
||||||
ReadFromFile.h
|
ReadFromFile.h
|
||||||
/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.h
|
/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.h
|
||||||
mpi.h
|
mpi.h
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,6 +1,10 @@
|
|||||||
# CMAKE generated file: DO NOT EDIT!
|
# CMAKE generated file: DO NOT EDIT!
|
||||||
# Generated by "Unix Makefiles" Generator, CMake Version 3.15
|
# 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
|
CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o
|
||||||
/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/City.h
|
/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.cpp
|
||||||
@@ -11,7 +15,7 @@ CMakeFiles/HW10.dir/ReadFromFile.cpp.o
|
|||||||
/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.h
|
/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/ReadFromFile.h
|
||||||
CMakeFiles/HW10.dir/main.cpp.o
|
CMakeFiles/HW10.dir/main.cpp.o
|
||||||
/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/City.h
|
/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/ReadFromFile.h
|
||||||
/Users/bradybodily/Repositories/CS5500_Parallel_Programming/HW10/main.cpp
|
/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.h
|
||||||
|
|||||||
@@ -1,6 +1,10 @@
|
|||||||
# CMAKE generated file: DO NOT EDIT!
|
# CMAKE generated file: DO NOT EDIT!
|
||||||
# Generated by "Unix Makefiles" Generator, CMake Version 3.15
|
# 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: ../City.h
|
||||||
CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o: ../MakePermutationMatrix.cpp
|
CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o: ../MakePermutationMatrix.cpp
|
||||||
CMakeFiles/HW10.dir/MakePermutationMatrix.cpp.o: ../MakePermutationMatrix.h
|
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/ReadFromFile.cpp.o: ../ReadFromFile.h
|
||||||
|
|
||||||
CMakeFiles/HW10.dir/main.cpp.o: ../City.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: ../ReadFromFile.h
|
||||||
CMakeFiles/HW10.dir/main.cpp.o: ../main.cpp
|
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.h
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -1,5 +1,5 @@
|
|||||||
#import "CostMatrixGenerator.h"
|
#import "CostMatrixGenerator.h"
|
||||||
#import "MakePermutationMatrix.h"
|
//#import "MakePermutationMatrix.h"
|
||||||
#import "ReadFromFile.h"
|
#import "ReadFromFile.h"
|
||||||
#import "mpi.h"
|
#import "mpi.h"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user