X-Git-Url: https://ruin.nu/git/index.pl?a=blobdiff_plain;f=robber%2Frobber.cpp;h=4e2ec89521436121c22d5f62cc8f4bc2233a94cc;hb=f42b544842d9b9f21da3898225a70dec23c57a36;hp=efe40ded9ece7b52f43049d1529699e1c9c999d6;hpb=c587459e89e9d1123425df5b42a367e7bf439e64;p=icfp05.git

diff --git a/robber/robber.cpp b/robber/robber.cpp
index efe40de..4e2ec89 100644
--- a/robber/robber.cpp
+++ b/robber/robber.cpp
@@ -11,7 +11,7 @@ string Robber::turn(){
 	Intersection& inter = _intersections[_location];
 	for (hash_map<string,StreetType>::const_iterator street = inter.connections.begin();
                street != inter.connections.end(); ++street){
-		double goodness = 100;
+		double goodness = 10;
 		int curx = _intersections[_location].x;
 		int cury = _intersections[_location].y;
 
@@ -27,36 +27,40 @@ 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, bank->first,_type);
+			if (l.size() < 1)
 				continue;
-			streets[v[1]] *= bank->second/v.size();
-			
+			list<string>::iterator i = l.begin();
+			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 +77,7 @@ string Robber::turn(){
 			destination = dest->first;
 		}
 	}
+	_oldLocation = _location;
 		
 	return destination;