X-Git-Url: https://ruin.nu/git/?p=icfp05.git;a=blobdiff_plain;f=robber%2Frobber.cpp;h=dbb287a4d760b5bb2dd231497778866318fb24a4;hp=d8154c09705aaca0dd5957dfbf8370fcbcfaecd1;hb=d7d9942fc9d1066670e166182e36791dfbf035d7;hpb=f4121d29718ebe595283200700956369776dbdca

diff --git a/robber/robber.cpp b/robber/robber.cpp
index d8154c0..dbb287a 100644
--- a/robber/robber.cpp
+++ b/robber/robber.cpp
@@ -1,28 +1,12 @@
 #include "robber.h"
 #include <iostream>
 #include <iterator>
+#include <queue>
 #include <cmath>
 
 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];
@@ -32,49 +16,61 @@ string Robber::turn(){
 			cerr << "Discarding: " << street->first << " since car is needed" << endl;
 			continue;
 		}
-		double goodness = 10;
+		double goodness = 0;
 		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 = 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;
+		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);
 
-			int px = _intersections[player->second.location].x;
-			int py = _intersections[player->second.location].y;
+		unsigned int closestCop = 0;
+		bool copInCar = false;
 
-			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 (closestCarCop.size() < closestFootCop.size() && closestCarCop.size() > 0){
+			closestCop = closestCarCop.size();
+			copInCar = true;
+		}else 
+			closestCop = closestFootCop.size();
 
+		if (closestCop > 0 && closestCop < 3){
+			cerr << "Cop " << closestCop << " intersections away." << endl;
+			continue;
+		}
 
-			if (dist2 < 50 && dist2 < dist1)
-				goodness *= 0.95;
+		priority_queue<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(bank->second/(pow(l.size(),4.0)));
+			}
+		}
+		//sort(banks.begin(),banks.end(),greater<double>());
 
-			if (player->second.type == cop_foot && dist2 <= 3)
-				goodness /= 100;
-			else if (player->second.type == cop_car && dist2 <= 2)
-				goodness /= 100;
+		for (unsigned int i = 0; i < 2 && banks.size() > 0;++i){
+			goodness += banks.top();
+			banks.pop();
+		}
 
+		cerr << "Goodness before cop: " << goodness << endl;
+		if (closestCop > 2){
+			cerr << "Cop " << closestCop << " intersections away." << endl;
+			goodness *= 1 - 1/(copInCar ? closestCop : closestCop - 1);
+		}
+		cerr << "Goodness after cop: " << goodness << endl;
 
+		if (conInter.type == bank){
+			cerr << "FOUND A BANK" << endl;
+			if (closestCop > 0 && closestCop < 4)
+				continue;
+			else if (_banks[street->first] > 0){
+				cerr << "No cop close to bank" << endl;
+				return street->first;
+			}
 		}
 		
 		cerr << "Street: " << street->first << " goodness: " << goodness << endl;
@@ -82,27 +78,14 @@ string Robber::turn(){
 	}
 	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, " : "));
 	cerr << endl;
 	*/
 
-	string destination;
+	string destination = _location;
 	double goodness = 0;
 	for (hash_map<string,double>::const_iterator dest = streets.begin();
 			dest != streets.end(); ++dest){