fixed a bug and some reordering

[icfp05.git] / robbersrc / robber.cpp

diff --git a/robbersrc/robber.cpp b/robbersrc/robber.cpp
index a9ab618d90cd144e81a4365a0f4a8b1110d097dd..abf638b1c1f0c9f4107d3e3f415207bcd5d391b6 100644 (file)
--- a/robbersrc/robber.cpp
+++ b/robbersrc/robber.cpp
@@ -20,16 +20,17 @@ string Robber::turn(){
                Intersection& conInter = _intersections[street->first];
 
                list<string> closestFootCop = shortestPath(street->first, cop_foot, FindPlayer(_players, cop_foot, 6), true);
-               list<string> closestCarCop = shortestPath(street->first, cop_car, FindPlayer(_players, cop_car, 5), true);
-
-               unsigned int closestCop = 0;
+               unsigned int closestCop = closestFootCop.size();
+               //cerr << "Cop on fot " << closestCop << " intersections away." << endl;
                bool copInCar = false;
+               list<string> closestCarCop = shortestPath(street->first, cop_car, FindPlayer(_players, cop_car, closestCop > 0 ? closestCop : 5), true);
+               //cerr << "Cop in car " << closestCarCop.size() << " intersections away." << endl;
+
 
-               if (closestCarCop.size() < closestFootCop.size() && closestCarCop.size() > 0){
+               if (closestCarCop.size() > 0){
                        closestCop = closestCarCop.size();
                        copInCar = true;
-               }else 
-                       closestCop = closestFootCop.size();
+               }
 
                if (closestCop > 0 && closestCop < 3){
                        //cerr << "Cop " << closestCop << " intersections away." << endl;
@@ -106,13 +107,14 @@ string Robber::turn(){
                }
        }
        _oldLocation = _location;
+       //cerr << "Moving to: " << destination << endl;
                
        return destination;
        
 }
 
 int main(){
-       Robber robber("robber");
+       Robber robber("harv-robber");
        robber.play();
 
        return 0;