made the shortest path algorithm more modular and tuned the robber more

[icfp05.git] / bot / bot.h

diff --git a/bot/bot.h b/bot/bot.h
index 7d278319332a6c9e2c416d9fa3d3f6aef5f34a41..1c40b44214d8ae1eef0277e7796d37abc26c0d32 100644 (file)
--- 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