Added road serialization

Author: Databean

include/Serialization.h

@@ -3,6 +3,7 @@
 
 #include <map>
 #include <string>
+#include <set>
 
 #include "GameVisitor.h"
 #include "Util.h"
@@ -13,6 +14,7 @@ class XMLVisitor : public GameVisitor {
 private:
 	tinyxml2::XMLDocument xmldoc;
 	std::map<std::string, tinyxml2::XMLElement*> playerElementMap;
+	std::set<Road*> serializedRoads;
 
 	tinyxml2::XMLElement* coordinateElement(const Coordinate& c);
 public:

src/GameBoard.cpp

@@ -63,6 +63,27 @@ GameBoard::GameBoard(istream& in) {
 			players.emplace_back(std::move(player));
 		}
 	}
+	
+	auto roadElements = doc.RootElement()->FirstChildElement("roads");
+	if(roadElements) {
+		for(auto roadElement = roadElements->FirstChildElement(); roadElement; roadElement = roadElement->NextSiblingElement()) {
+			Coordinate start = xmlElementToCoord(*(roadElement->FirstChildElement("start")->FirstChildElement("coordinate")));
+			Coordinate end = xmlElementToCoord(*(roadElement->FirstChildElement("end")->FirstChildElement("coordinate")));
+			std::string ownerName = roadElement->FirstChildElement("owner")->FirstChild()->Value();
+			Player* owner = nullptr;
+			for(auto& playerUnique : players) {
+				if(playerUnique->getName() == ownerName) {
+					owner = playerUnique.get();
+				}
+			}
+			if(owner == nullptr) {
+				throw std::runtime_error("Road is owned by a nonexistant player.");
+			}
+			Road* newRoad = new Road(start, end, *owner);
+			roads[start].push_back(newRoad);
+			roads[end].push_back(newRoad);
+		}
+	}
 }
 
 GameBoard::~GameBoard() {
@@ -99,11 +120,9 @@ void GameBoard::freeRoads(){
  */
 void GameBoard::removeRoadEnd(Road * startRoad){
 	std::vector<Road*> endRoadVector = roads[startRoad->getEnd()];
-	for(std::vector<Road*>::iterator endRoad = endRoadVector.begin(); endRoad != endRoadVector.end(); ++endRoad){
+	for(std::vector<Road*>::iterator endRoad = endRoadVector.begin(); endRoad != endRoadVector.end(); endRoad++){
 		if((*endRoad) == startRoad){
-			endRoadVector.erase(endRoad);
-			//Need to decrement the iterator to account for the lost item
-			endRoad--;
+			(*endRoad) = nullptr;
 		}
 	}
 }
@@ -363,6 +382,11 @@ void GameBoard::accept(GameVisitor& visitor) {
 	for(auto& it : resources) {
 		it.second->accept(visitor);
 	}
+	for(auto& roadCoordVec : roads) {
+		for(auto& road : roadCoordVec.second) {
+			road->accept(visitor);
+		}
+	}
 	for(auto& it : players) {
 		it->accept(visitor);
 	}
@@ -390,6 +414,24 @@ bool GameBoard::operator==(const GameBoard& other) const {
 			return false;
 		}
 	}
+	for(auto& roadCoordVec : roads) {
+		const auto& otherVecIt = other.roads.find(roadCoordVec.first);
+		if(otherVecIt == other.roads.end()) {
+			return false;
+		}
+		auto& otherCoordVec = *otherVecIt;
+		if(roadCoordVec.second.size() != otherCoordVec.second.size()) {
+			return false;
+		}
+		for(size_t i = 0; i < roadCoordVec.second.size(); i++) {
+			const Road& myRoad = *(roadCoordVec.second[i]);
+			const Road& otherRoad = *(otherCoordVec.second[i]);
+			if(myRoad == otherRoad) {}
+			else {
+				return false;
+			}
+		}
+	}
 	if(players.size() != other.players.size()) {
 		return false;
 	}

src/Road.cpp

@@ -44,7 +44,7 @@ void Road::accept(GameVisitor& visitor) {
 bool Road::operator==(const Road& other) const {
 	return getStart() == other.getStart() &&
 		getEnd() == other.getEnd() &&
-		owner == other.owner;
+		owner->getName() == other.owner->getName();
 }
 
 /**

src/Serialization.cpp

@@ -35,23 +35,26 @@ void XMLVisitor::visit(Road& road) {
 	if(!xmldoc.RootElement()->FirstChildElement("roads")) {
 		xmldoc.RootElement()->InsertEndChild(xmldoc.NewElement("roads"));
 	}
-	XMLElement* roadsElement = xmldoc.RootElement()->FirstChildElement("roads");
-	XMLElement* newRoadElement = xmldoc.NewElement("road");
-	
-	XMLElement* ownerElement = xmldoc.NewElement("owner");
-	XMLText* ownerText = xmldoc.NewText(road.getOwner().getName().c_str());
-	ownerElement->InsertEndChild(ownerText);
-	newRoadElement->InsertEndChild(ownerElement);
-	
-	XMLElement* startElement = xmldoc.NewElement("start");
-	startElement->InsertEndChild(coordinateElement(road.getStart()));
-	newRoadElement->InsertEndChild(startElement);
-	
-	XMLElement* endElement = xmldoc.NewElement("end");
-	endElement->InsertEndChild(coordinateElement(road.getEnd()));
-	newRoadElement->InsertEndChild(endElement);
-	
-	roadsElement->InsertEndChild(newRoadElement);
+	if(serializedRoads.find(&road) == serializedRoads.end()) {
+		XMLElement* roadsElement = xmldoc.RootElement()->FirstChildElement("roads");
+		XMLElement* newRoadElement = xmldoc.NewElement("road");
+		
+		XMLElement* ownerElement = xmldoc.NewElement("owner");
+		XMLText* ownerText = xmldoc.NewText(road.getOwner().getName().c_str());
+		ownerElement->InsertEndChild(ownerText);
+		newRoadElement->InsertEndChild(ownerElement);
+		
+		XMLElement* startElement = xmldoc.NewElement("start");
+		startElement->InsertEndChild(coordinateElement(road.getStart()));
+		newRoadElement->InsertEndChild(startElement);
+		
+		XMLElement* endElement = xmldoc.NewElement("end");
+		endElement->InsertEndChild(coordinateElement(road.getEnd()));
+		newRoadElement->InsertEndChild(endElement);
+		
+		roadsElement->InsertEndChild(newRoadElement);
+		serializedRoads.insert(&road);
+	}
 }
 
 void XMLVisitor::visit(Settlement& settlement) {

tests/testSerialization.cpp

@@ -62,3 +62,24 @@ TEST(testCardSerialization) {
 
 	CHECK(testBoard == copyBoard);
 }
+
+TEST(roadSerialization) {
+	vector<unique_ptr<Player>> players;
+	players.emplace_back(unique_ptr<Player>(new Player("test")));
+	players.emplace_back(unique_ptr<Player>(new Player("test2")));
+	
+	Player& firstPlayer = *players[0];
+	Player& secondPlayer = *players[1];
+	
+	GameBoard testBoard(std::move(players));
+	
+	testBoard.PlaceRoad(Coordinate(0,0), Coordinate(-1,1), firstPlayer);
+	testBoard.PlaceRoad(Coordinate(-1,1), Coordinate(-1,2), secondPlayer);
+	
+	stringstream stream;
+	testBoard.save(stream);
+	
+	GameBoard copyBoard(stream);
+	
+	CHECK(testBoard == copyBoard);
+}