tuned robber a bit

[icfp05.git] / robber / robber.cpp

diff --git a/robber/robber.cpp b/robber/robber.cpp
index efe40ded9ece7b52f43049d1529699e1c9c999d6..87ef6454fee9985e125debb241bc09984f0c7753 100644 (file)
--- a/robber/robber.cpp
+++ b/robber/robber.cpp
@@ -6,17 +6,55 @@
 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){
-               double goodness = 100;
-               int curx = _intersections[_location].x;
-               int cury = _intersections[_location].y;
+               if (street->second == car){
+                       cerr << "Discarding: " << street->first << " since car is needed" << endl;
+                       continue;
+               }
+               double goodness = 10;
+               Intersection& conInter = _intersections[street->first];
+
+               list<string> l = shortestPath(street->first, _type, FindCop(_players, 5));
+               if (l.size() > 0){
+                       cerr << "Cop " << l.size() << " intersections away." << endl;
+                       goodness *= 1 - 1/(6 - l.size());
+               }
+
+               if (conInter.type == bank){
+                       cerr << "FOUND A BANK" << endl;
+                       if (l.size() > 0 && l.size() < 4)
+                               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)
@@ -27,36 +65,42 @@ string Robber::turn(){
 
                        double dist1 = sqrt(pow((curx-px),2.0)+pow((cury-py),2.0));
                        double dist2 = sqrt(pow((newx-px),2.0)+pow((newy-py),2.0));
-                       cerr << "Original distance: " << dist1 << endl;
+                       /*cerr << "Original distance: " << dist1 << endl;
                        cerr << "New distance: " << dist2 << endl;
+                       */
 
 
-                       if (dist2 > dist1)
-                               goodness *= 4;
-                       else
-                               goodness /= 4;
+                       if (dist2 < 50 && dist2 < dist1)
+                               goodness *= 0.95;
 
-                       if (player->second.type == "cop-foot" && dist2 <= 3)
-                               goodness /= 10;
-                       else if (player->second.type == "cop-car" && dist2 <= 2)
-                               goodness /= 10;
+                       if (player->second.type == cop_foot && dist2 <= 3)
+                               goodness /= 100;
+                       else if (player->second.type == cop_car && dist2 <= 2)
+                               goodness /= 100;
 
 
                }
+               
+               cerr << "Street: " << street->first << " goodness: " << goodness << endl;
                streets[street->first] = goodness;
        }
+       streets[_oldLocation] /= 10;
 
        for(hash_map<string,int>::const_iterator bank = _banks.begin();
                        bank != _banks.end(); ++bank){
                //cerr << "Handling bank at: " << bank->first << endl;
                if (bank->second > 0){
-                       vector<string> v = shortestPath(_location, bank->first,_type);
-                       if (v.size() < 2)
+                       list<string> l = shortestPath(_location, _type, SimpleSPGoal(bank->first));
+                       if (l.size() < 2)
                                continue;
-                       streets[v[1]] *= bank->second/v.size();
-                       
+                       list<string>::iterator i = l.begin();
+                       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())));
+
                }
        }
+
        /*cerr << "Using route: ";
        copy(v.begin(), v.end(), ostream_iterator<string>(cerr, " : "));
        cerr << endl;
@@ -73,6 +117,7 @@ string Robber::turn(){
                        destination = dest->first;
                }
        }
+       _oldLocation = _location;
                
        return destination;