Added serialization of tiles (seems to work) and roads (don't have a way to test right now)

root · root · commit 76e73d9363cb · 2014-03-01T03:08:51.000-06:00
diff --git a/include/City.h b/include/City.h
@@ -12,7 +12,7 @@ class City : public CornerPiece {
 	~City();
 	City& operator=(City&) = delete;
 	
-	void accept(GameVisitor&);
+	virtual void accept(GameVisitor&);
 };
 
 #endif
diff --git a/include/GameBoard.h b/include/GameBoard.h
@@ -22,7 +22,7 @@ class GameBoard {
 private:
 	std::map<Coordinate, std::unique_ptr<GamePiece>> corners;
 	std::map<Coordinate, std::unique_ptr<GamePiece>> resources;
-	std::vector<std::unique_ptr<const Road>> roads;
+	std::vector<std::unique_ptr<Road>> roads;
 	
 	int constructBoardFromFile(std::ifstream &file);
 	int constructFileFromBoard(std::ofstream &file);
diff --git a/include/GamePiece.h b/include/GamePiece.h
@@ -25,7 +25,8 @@ class GamePiece {
 	
 	Coordinate location;
 	
-	void accept(GameVisitor&);
+	virtual void accept(GameVisitor&) = 0;
+	Coordinate getLocation() const;
 };
 
 class ResourceTile : public GamePiece {
@@ -43,7 +44,9 @@ class ResourceTile : public GamePiece {
 
 	virtual ~ResourceTile();
 	
-	void accept(GameVisitor&);
+	virtual void accept(GameVisitor&);
+	resourceType getType() const;
+	int getDiceValue() const;
 };
 
 #endif
diff --git a/include/Player.h b/include/Player.h
@@ -60,7 +60,7 @@ class Player {
     void setWheat(int resource);
     void setWool(int resource);
 
-
+    std::string getName() const;
 };
 
 #endif
diff --git a/include/Road.h b/include/Road.h
@@ -3,19 +3,25 @@
 
 #include "Util.h"
 
+#include "Player.h"
+
 class GameVisitor;
 
 class Road {
 private:
+	Player& owner;
 	Coordinate start;
 	Coordinate end;
 public:
-	Road(Coordinate start, Coordinate end);
+	Road(Player& owner, Coordinate start, Coordinate end);
 	Road(Road&) = delete;
 	~Road();
 	Road& operator=(Road&) = delete;
 	
-	void accept(GameVisitor& visitor);
+	virtual void accept(GameVisitor& visitor);
+	Coordinate getStart() const;
+	Coordinate getEnd() const;
+	Player& getOwner();
 };
 
 #endif
diff --git a/include/Settlement.h b/include/Settlement.h
@@ -12,7 +12,7 @@ class Settlement : public CornerPiece {
 	~Settlement();
 	Settlement& operator=(Settlement&) = delete;
 	
-	void accept(GameVisitor&);
+	virtual void accept(GameVisitor&);
 };
 
 #endif
diff --git a/include/XMLVisitor.h b/include/XMLVisitor.h
@@ -2,12 +2,15 @@
 #define XML_VISITOR_H
 
 #include "GameVisitor.h"
+#include "Util.h"
 
 #include "tinyxml2.h"
 
 class XMLVisitor : public GameVisitor {
 private:
 	tinyxml2::XMLDocument xmldoc;
+	
+	tinyxml2::XMLElement* coordinateElement(const Coordinate& c);
 public:
 	XMLVisitor();
 	virtual ~XMLVisitor();
@@ -18,6 +21,8 @@ class XMLVisitor : public GameVisitor {
 	virtual void visit(City&);
 	virtual void visit(Player&);
 	virtual void visit(ResourceTile&);
+	
+	const tinyxml2::XMLDocument& getXMLDoc() const;
 };
 
 #endif
diff --git a/src/GameBoard.cpp b/src/GameBoard.cpp
@@ -137,6 +137,15 @@ void GameBoard::PlaceSettlement(Coordinate location, Player& Owner){
 }
 
 void GameBoard::accept(GameVisitor& visitor) {
-		visitor.visit(*this);
+	for(auto& it : corners) {
+		it.second->accept(visitor);
+	}
+	for(auto& it : resources) {
+		it.second->accept(visitor);
+	}
+	for(auto& it : roads) {
+		it->accept(visitor);
+	}
+	visitor.visit(*this);
 }
 
diff --git a/src/GamePiece.cpp b/src/GamePiece.cpp
@@ -23,6 +23,10 @@ const GameBoard& GamePiece::getBoard() const {
 	return board;
 }
 
+Coordinate GamePiece::getLocation() const {
+	return location;
+}
+
 ResourceTile::ResourceTile(GameBoard& board, Coordinate location, resourceType resource, int value) : 
 GamePiece(board, location), resource(resource), value(value) {
 	
@@ -36,6 +40,14 @@ void ResourceTile::accept(GameVisitor& visitor) {
 	visitor.visit(*this);
 }
 
+resourceType ResourceTile::getType() const {
+	return resource;
+}
+
+int ResourceTile::getDiceValue() const {
+	return value;
+}
+
 //pay resource cards to owners of this tile
 /*
 void ResourceTile::Payout() {
diff --git a/src/Player.cpp b/src/Player.cpp
@@ -115,3 +115,8 @@ void Player::setWool(int resource)
 {
     resources[4] = resource;
 }
+
+std::string Player::getName() const
+{
+    return name;
+}
diff --git a/src/Road.cpp b/src/Road.cpp
@@ -2,7 +2,7 @@
 
 #include "GameVisitor.h"
 
-Road::Road(Coordinate start, Coordinate end) {
+Road::Road(Player& owner, Coordinate start, Coordinate end) : owner(owner) {
 	if(start < end) {
 		this->start = start;
 		this->end = end;
@@ -18,4 +18,16 @@ Road::~Road() {
 
 void Road::accept(GameVisitor& visitor) {
 	visitor.visit(*this);
-}
+}
+
+Coordinate Road::getStart() const {
+	return start;
+}
+
+Coordinate Road::getEnd() const {
+	return end;
+}
+
+Player& Road::getOwner() {
+	return owner;
+}
diff --git a/src/XMLVisitor.cpp b/src/XMLVisitor.cpp
@@ -1,15 +1,24 @@
 #include "XMLVisitor.h"
 
+#include <map>
+#include <utility>
+#include <stdexcept>
+
 #include "GameBoard.h"
 #include "GamePiece.h"
 #include "City.h"
 #include "Settlement.h"
 #include "Road.h"
 
+using std::map;
+using std::runtime_error;
+
 using tinyxml2::XMLElement;
+using tinyxml2::XMLText;
 
 XMLVisitor::XMLVisitor() {
-	
+	xmldoc.InsertEndChild(xmldoc.NewElement("catangame"));
+	//xmldoc.RootElement()->SetName("catangame");
 }
 
 XMLVisitor::~XMLVisitor() {
@@ -21,7 +30,26 @@ void XMLVisitor::visit(GameBoard& board) {
 }
 
 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);
 }
 
 void XMLVisitor::visit(Settlement& settlement) {
@@ -37,6 +65,41 @@ void XMLVisitor::visit(Player& player) {
 }
 
 void XMLVisitor::visit(ResourceTile& tile) {
+	if(!xmldoc.RootElement()->FirstChildElement("tiles")) {
+		xmldoc.RootElement()->InsertEndChild(xmldoc.NewElement("tiles"));
+	}
+	XMLElement* tilesElement = xmldoc.RootElement()->FirstChildElement("tiles");
+	XMLElement* newTileElement = xmldoc.NewElement("tile");
 	
+	static const map<resourceType, std::string> typeToText = {
+		std::make_pair(WHEAT, "wheat"),
+		std::make_pair(SHEEP, "sheep"),
+		std::make_pair(STONE, "stone"),
+		std::make_pair(BRICK, "brick"),
+		std::make_pair(WOOD, "wood"),
+		std::make_pair(DESERT, "desert"),
+	};
+	auto it = typeToText.find(tile.getType());
+	if(it == typeToText.end()) {
+		throw runtime_error("Invalid resource type.");
+	}
+	XMLElement* tileTypeElement = xmldoc.NewElement("type");
+	tileTypeElement->InsertEndChild(xmldoc.NewText(it->second.c_str()));
+	newTileElement->InsertEndChild(tileTypeElement);
+	
+	newTileElement->InsertEndChild(coordinateElement(tile.getCoordinates()));
+	
+	tilesElement->InsertEndChild(newTileElement);
+}
+
+XMLElement* XMLVisitor::coordinateElement(const Coordinate& c) {
+	XMLElement* ret = xmldoc.NewElement("coordinate");
+	ret->SetAttribute("u", c.first);
+	ret->SetAttribute("v", c.second);
+	return ret;
+}
+
+const tinyxml2::XMLDocument& XMLVisitor::getXMLDoc() const {
+	return xmldoc;
 }
 
diff --git a/tests/testSerialization.cpp b/tests/testSerialization.cpp
@@ -0,0 +1,21 @@
+#include <UnitTest++.h>
+
+#include "XMLVisitor.h"
+#include "GameBoard.h"
+#include "Player.h"
+
+#include "tinyxml2.h"
+
+#include <iostream>
+
+TEST(xmlPrint) {
+	GameBoard testBoard;
+	
+	XMLVisitor vs;
+	testBoard.accept(vs);
+	
+	tinyxml2::XMLPrinter printer;
+	vs.getXMLDoc().Print( &printer );
+	
+	std::cout << printer.CStr() << std::endl;
+}

Original file line number	Diff line number	Diff line change
`@@ -115,3 +115,8 @@ void Player::setWool(int resource)`
`115`	`115`	`{`
`116`	`116`	`resources[4] = resource;`
`117`	`117`	`}`
	`118`	`+`
	`119`	`+std::string Player::getName() const`
	`120`	`+{`
	`121`	`+ return name;`
	`122`	`+}`