From: Michael Andreen <harv@ruin.nu>
Date: Sun, 26 Jun 2005 16:20:00 +0000 (+0000)
Subject: robber didn't know as much as I thought, avoid intersections with cops two intersecti... 
X-Git-Url: https://ruin.nu/git/?p=icfp05.git;a=commitdiff_plain;h=33d49b42ba7bb8e9d043d0f33489cffaad303d43

robber didn't know as much as I thought, avoid intersections with cops two intersections away
---

diff --git a/robber/robber.cpp b/robber/robber.cpp
index 87ef645..52e00de 100644
--- a/robber/robber.cpp
+++ b/robber/robber.cpp
@@ -38,68 +38,44 @@ string Robber::turn(){
 		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 (l.size() < 3)
+				continue;
+			goodness *= 1 - 1/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){
+				continue;
+			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 = conInter.x;
-		int newy = conInter.y;
-		for (hash_map<string, Player>::const_iterator player = _players.begin();
-				player != _players.end(); ++player){
-			if (player->first == _name)
-				continue;
-
-			int px = _intersections[player->second.location].x;
-			int py = _intersections[player->second.location].y;
-
-			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 << "New distance: " << dist2 << endl;
-			*/
-
-
-			if (dist2 < 50 && dist2 < dist1)
-				goodness *= 0.95;
-
-			if (player->second.type == cop_foot && dist2 <= 3)
-				goodness /= 100;
-			else if (player->second.type == cop_car && dist2 <= 2)
-				goodness /= 100;
-
-
+		if (goodness == 0)
+			continue;
+		vector<double> banks;
+		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){
+				list<string> l = shortestPath(street->first, _type, SimpleSPGoal(bank->first));
+				if (l.size() < 1)
+					continue;
+				list<string>::iterator i = l.begin();
+				//++i;
+				banks.push_back(bank->second/(pow(l.size(),2.0)));
+			}
 		}
-		
+		sort(banks.begin(),banks.end());
+		for (unsigned int i = 0; i < 2 && i < banks.size();++i)
+			goodness += banks[i];
 		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){
-			list<string> l = shortestPath(_location, _type, SimpleSPGoal(bank->first));
-			if (l.size() < 2)
-				continue;
-			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, " : "));