Added operator== to Board and GamePiece, and serialization test

Author: Databean

include/City.h

@@ -13,6 +13,7 @@ class City : public CornerPiece {
 	City& operator=(City&) = delete;
 
 	virtual void accept(GameVisitor&);
+	virtual bool operator==(const GamePiece& piece) const;
 };
 
 #endif

include/GameBoard.h

@@ -42,6 +42,8 @@ class GameBoard {
 	void init_resources();
 
 	void accept(GameVisitor& visitor);
+	
+	bool operator==(const GameBoard& other) const;
 };
 
 #endif

include/GamePiece.h

@@ -26,6 +26,8 @@ class GamePiece {
 	Coordinate location;
 
 	virtual void accept(GameVisitor&) = 0;
+	virtual bool operator==(const GamePiece& other) const = 0;
+	
 	Coordinate getLocation() const;
 };
 
@@ -45,6 +47,8 @@ class ResourceTile : public GamePiece {
 	virtual ~ResourceTile();
 
 	virtual void accept(GameVisitor&);
+	virtual bool operator==(const GamePiece& other) const;
+	
 	resourceType getType() const;
 	int getDiceValue() const;
 };

include/Player.h

@@ -61,6 +61,8 @@ class Player {
     void setWool(int resource);
 
     std::string getName() const;
+	
+	bool operator==(const Player& player) const;
 };
 
 #endif

include/Road.h

@@ -22,6 +22,9 @@ class Road {
 	Coordinate getStart() const;
 	Coordinate getEnd() const;
 	Player& getOwner();
+	const Player& getOwner() const;
+	
+	bool operator==(const Road&) const;
 };
 
 #endif

include/Settlement.h

@@ -13,6 +13,7 @@ class Settlement : public CornerPiece {
 	Settlement& operator=(Settlement&) = delete;
 
 	virtual void accept(GameVisitor&);
+	virtual bool operator==(const GamePiece&) const;
 };
 
 #endif

src/City.cpp

@@ -13,3 +13,7 @@ City::~City() {
 void City::accept(GameVisitor& visitor) {
 	visitor.visit(*this);
 }
+
+bool City::operator==(const GamePiece& p) const {
+	return false;
+}

src/GameBoard.cpp

@@ -144,3 +144,39 @@ void GameBoard::accept(GameVisitor& visitor) {
 	visitor.visit(*this);
 }
 
+bool GameBoard::operator==(const GameBoard& other) const {
+	if(corners.size() != other.corners.size()) {
+		return false;
+	}
+	for(auto& it : corners) {
+		auto otherIt = other.corners.find(it.first);
+		if(otherIt == other.corners.end()) {
+			return false; // This location isn't in the other array
+		}
+		if(!(*(it.second) == *(otherIt->second))) {
+			return false;
+		}
+	}
+	for(auto& it : resources) {
+		auto otherIt = other.resources.find(it.first);
+		if(otherIt == other.resources.end()) {
+			return false; // This location isn't in the other array
+		}
+		if(!(*(it.second) == *(otherIt->second))) {
+			return false;
+		}
+	}
+	for(auto& it : roads) {
+		bool hasIt = false;
+		for(auto& otherIt : other.roads) {
+			if(*it == *otherIt) {
+				hasIt = true;
+			}
+		}
+		if(hasIt == false) {
+			return false;
+		}
+	}
+	return true;
+}
+

src/GamePiece.cpp

@@ -48,6 +48,15 @@ int ResourceTile::getDiceValue() const {
 	return value;
 }
 
+bool ResourceTile::operator==(const GamePiece& other) const {
+	const ResourceTile* tile = dynamic_cast<const ResourceTile*>(&other);
+	if(tile == nullptr) {
+		return false;
+	}
+	
+	return getType() == tile->getType() && getDiceValue() == tile->getDiceValue();
+}
+
 //pay resource cards to owners of this tile
 /*
 void ResourceTile::Payout() {

src/Player.cpp

@@ -120,3 +120,7 @@ std::string Player::getName() const
 {
     return name;
 }
+
+bool Player::operator==(const Player& player) const {
+	return getName() == player.getName();
+}