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

[icfp05.git] / robber / robber.cpp

diff --git a/robber/robber.cpp b/robber/robber.cpp
index 4e2ec89521436121c22d5f62cc8f4bc2233a94cc..d8154c09705aaca0dd5957dfbf8370fcbcfaecd1 100644 (file)
--- a/robber/robber.cpp
+++ b/robber/robber.cpp
@@ -6,17 +6,51 @@
 using namespace std;
 using namespace __gnu_cxx;
 
+struct FindCop : SPGoal{
+       int _limit;
+       const hash_map<string, Player>& _players;
+       FindCop(const hash_map<string, Player>& players, int limit = 0) : _players(players), _limit(limit){}
+       int operator()(const SPInfo* node) const{
+               if (_limit > 0 && node->cost > _limit)
+                       return -1;
+               for(hash_map<string, Player>::const_iterator player = _players.begin();
+                               player != _players.end(); ++player){
+                       if (player->second.type != robber && player->second.location == node->name){
+                               return 1;
+                       }
+               }
+               return 0;
+       }
+};
+
 string Robber::turn(){
        hash_map<string,double> streets;
        Intersection& inter = _intersections[_location];
        for (hash_map<string,StreetType>::const_iterator street = inter.connections.begin();
                street != inter.connections.end(); ++street){
+               if (street->second == car){
+                       cerr << "Discarding: " << street->first << " since car is needed" << endl;
+                       continue;
+               }
                double goodness = 10;
-               int curx = _intersections[_location].x;
-               int cury = _intersections[_location].y;
+               Intersection& conInter = _intersections[street->first];
+
+               if (conInter.type == bank){
+                       cerr << "FOUND A BANK" << endl;
+                       list<string> l = shortestPath(_location, _type, FindCop(_players, 3));
+                       if (l.size() > 0){
+                               cerr << "Cop " << l.size() << " intersections away." << endl;
+                               goodness = 0;
+                       }else if (_banks[street->first] > 0){
+                               cerr << "No cop close to bank" << endl;
+                               return street->first;
+                       }
+               }
+               int curx = inter.x;
+               int cury = inter.y;
 
-               int newx = _intersections[street->first].x;
-               int newy = _intersections[street->first].y;
+               int newx = conInter.x;
+               int newy = conInter.y;
                for (hash_map<string, Player>::const_iterator player = _players.begin();
                                player != _players.end(); ++player){
                        if (player->first == _name)
@@ -52,11 +86,13 @@ string Robber::turn(){
                        bank != _banks.end(); ++bank){
                //cerr << "Handling bank at: " << bank->first << endl;
                if (bank->second > 0){
-                       list<string> l = shortestPath(_location, bank->first,_type);
-                       if (l.size() < 1)
+                       list<string> l = shortestPath(_location, _type, SimpleSPGoal(bank->first));
+                       if (l.size() < 2)
                                continue;
                        list<string>::iterator i = l.begin();
-                       streets[*++i] += bank->second/(pow(5.0,double(l.size())));
+                       if (*++i == "53-and-kimbark")
+                               cerr << "We should NOT find 53-and-kimbark here" << endl;
+                       streets[*i] += bank->second/(pow(5.0,double(l.size())));
 
                }
        }