Moved road marking into a map parameter to not affect road state

Author: Databean

include/GameBoard.h

@@ -39,7 +39,7 @@ class GameBoard {
 	int constructFileFromBoard(std::ofstream &file);
 
 	void removeRoadEnd(std::shared_ptr<Road> startRoad);
-	int FindLongestRoad_FromPoint(Coordinate curr, Player & owner, std::map<Coordinate, bool>& marked, int length);
+	int FindLongestRoad_FromPoint(Coordinate curr, Player & owner, std::map<Coordinate, bool>& marked, std::map<Road*, bool>& markedRoads, int length);
 
 	void createRing(Coordinate topRight, int sideLength, std::vector<resourceType>& resources, std::vector<int>& rolls);
 	void insertTile(Coordinate location, std::vector<resourceType>& resources, std::vector<int>& rolls);

include/Road.h

@@ -16,8 +16,6 @@ class Road {
 
 	Coordinate start;
 	Coordinate end;
-
-	bool marker;
 public:
 	Road(Coordinate start, Coordinate end, Player& Owner);
 	Road(Road&) = delete;
@@ -29,10 +27,6 @@ class Road {
 
 	bool equals(const Road& otherRoad);
 	bool equals(const Coordinate& otherStart, const Coordinate& otherEnd);
-
-	bool isMarked();
-	void mark();
-	void unmark();
 
 	Player& getOwner();
 	Player& getOwner() const;

src/GameBoard.cpp

@@ -361,8 +361,9 @@ int GameBoard::FindLongestRoad(Player & owner){
 	for (auto roadVector = roads.begin(); roadVector != roads.end(); ++roadVector){
 		//find the longest path from v
 		std::map<Coordinate, bool> marked;
+		std::map<Road*, bool> markedRoads;
 		Coordinate start = roadVector->first;
-		int temp_longest_path = FindLongestRoad_FromPoint(start, owner, marked, 0);
+		int temp_longest_path = FindLongestRoad_FromPoint(start, owner, marked, markedRoads, 0);
 
 		//if that path is longer than the current longest, set to the longest
 		if (temp_longest_path > longest_path)
@@ -373,7 +374,7 @@ int GameBoard::FindLongestRoad(Player & owner){
 }
 
 
-int GameBoard::FindLongestRoad_FromPoint(Coordinate curr, Player & owner, std::map<Coordinate, bool>& marked, int length){
+int GameBoard::FindLongestRoad_FromPoint(Coordinate curr, Player & owner, std::map<Coordinate, bool>& marked, std::map<Road*, bool>& markedRoads, int length){
 	marked[curr] = true;
 	int longest_path = length;
 	//traverse all the surrounding edges and vertices
@@ -382,17 +383,17 @@ int GameBoard::FindLongestRoad_FromPoint(Coordinate curr, Player & owner, std::m
 		int temp_longest_path = length;
 
 		//if the owner is correct and the road is unmarked
-		if ( !(*road)->isMarked() && (*road)->owner->getName().compare(owner.getName()) == 0){
+		if ( !markedRoads[road->get()] && (*road)->owner->getName() == owner.getName()){
 
 			temp_longest_path++;
-			(*road)->mark();
+			markedRoads[road->get()] = true;
 			//Check if you can traverse to the next vertex and make that step if you can
 			if(curr != (*road)->getStart() && !marked[(*road)->getStart()]){
-				temp_longest_path = FindLongestRoad_FromPoint((*road)->getStart(), owner, marked, temp_longest_path);
+				temp_longest_path = FindLongestRoad_FromPoint((*road)->getStart(), owner, marked, markedRoads, temp_longest_path);
 			}else if (curr != (*road)->getEnd() && !marked[(*road)->getEnd()]){
-				temp_longest_path = FindLongestRoad_FromPoint((*road)->getEnd(), owner, marked, temp_longest_path);
+				temp_longest_path = FindLongestRoad_FromPoint((*road)->getEnd(), owner, marked, markedRoads, temp_longest_path);
 			}
-			(*road)->unmark();
+			markedRoads[road->get()] = false;
 		}
 
 		if(temp_longest_path > longest_path)

src/Road.cpp

@@ -11,9 +11,7 @@ Road::Road(Coordinate start, Coordinate end, Player& Owner) {
 		this->start = end;
 	}
 	owner = &Owner;
-
-	marker = false;
-
+	
 	//If the input is bad, throw an exception so bad roads won't be built
 	if(!checkRoad()){
 		throw -1;
@@ -79,27 +77,6 @@ bool Road::equals(const Coordinate& otherStart, const Coordinate& otherEnd){
 	return false;
 }
 
-/**
- * Returns true if the road is marked, false otherwise
- */
-bool Road::isMarked(){
-	return marker;
-}
-
-/**
- * Marks the road
- */
-void Road::mark(){
-	marker = true;
-}
-
-/**
- * Unmarks the road
- */
-void Road::unmark(){
-	marker = false;
-}
-
 Player& Road::getOwner() {
 	return *owner;
 }

tests/test_Roads.cpp

@@ -78,19 +78,6 @@ TEST(road_equals_Coordinate){
 	CHECK(!test_road_1.equals(start_3, end_3));
 }
 
-TEST(road_marker){
-	Coordinate start(0,0);
-	Coordinate end(1,0);
-	Player test_player("tester");
-	Road test_road(start, end, test_player);
-
-	CHECK(test_road.isMarked() == false);
-	test_road.mark();
-	CHECK(test_road.isMarked() == true);
-	test_road.unmark();
-	CHECK(test_road.isMarked() == false);
-}
-