X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bot%2Fbot.h;h=1c40b44214d8ae1eef0277e7796d37abc26c0d32;hb=f4121d29718ebe595283200700956369776dbdca;hp=7d278319332a6c9e2c416d9fa3d3f6aef5f34a41;hpb=f42b544842d9b9f21da3898225a70dec23c57a36;p=icfp05.git

diff --git a/bot/bot.h b/bot/bot.h
index 7d27831..1c40b44 100644
--- a/bot/bot.h
+++ b/bot/bot.h
@@ -39,7 +39,7 @@ enum IntersectionType{hq, bank, robber_start, ordinary};
 
 struct Intersection{
 	__gnu_cxx::hash_map<std::string,StreetType> connections;
-	std::string type;
+	IntersectionType type;
 	int x;
 	int y;
 };
@@ -57,19 +57,43 @@ struct Bank{
 template<class T>
 T value(std::string input);
 
+struct SPInfo{
+	std::string name;
+	bool settled;
+	SPInfo* parent;
+	int cost;
+};
+
+
+struct SPGoal{
+	virtual ~SPGoal(){}
+	virtual int operator()(const SPInfo* node) const = 0;
+};
+
+struct SimpleSPGoal : public SPGoal{
+	std::string _to;
+	SimpleSPGoal(std::string to):_to(to){};
+	~SimpleSPGoal(){}
+	int operator()(const SPInfo* node) const{
+		if (node->name == _to)
+			return 1;
+		return 0;
+	}
+};
+
 class Bot {
 	public:
 		Bot(const std::string& name, PlayerType type);
-		virtual ~Bot();
+		virtual ~Bot(){};
 
 		virtual void play();
 
 	protected:
 		void buildGraph();
 		void updateWorld();
-		virtual std::string turn();
+		virtual std::string turn() = 0;
 		void move(std::string location);
-		std::list<std::string> shortestPath(const std::string& from, const std::string& to, PlayerType type);
+		std::list<std::string> shortestPath(const std::string& from, PlayerType type, const SPGoal& goal);
 
 	__gnu_cxx::hash_map<std::string, Intersection> _intersections;
 	__gnu_cxx::hash_map<std::string, Player> _players;
@@ -84,5 +108,4 @@ class Bot {
 	int _smell;
 };
 
-
 #endif