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

diff --git a/robber/robber.cpp b/robber/robber.cpp
index 4e2ec89..dbb287a 100644
--- a/robber/robber.cpp
+++ b/robber/robber.cpp
@@ -1,6 +1,7 @@
 #include "robber.h"
 #include <iostream>
 #include <iterator>
+#include <queue>
 #include <cmath>
 
 using namespace std;
@@ -11,36 +12,65 @@ 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 = 10;
-		int curx = _intersections[_location].x;
-		int cury = _intersections[_location].y;
-
-		int newx = _intersections[street->first].x;
-		int newy = _intersections[street->first].y;
-		for (hash_map<string, Player>::const_iterator player = _players.begin();
-				player != _players.end(); ++player){
-			if (player->first == _name)
-				continue;
+		if (street->second == car){
+			cerr << "Discarding: " << street->first << " since car is needed" << endl;
+			continue;
+		}
+		double goodness = 0;
+		Intersection& conInter = _intersections[street->first];
 
-			int px = _intersections[player->second.location].x;
-			int py = _intersections[player->second.location].y;
+		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);
 
-			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;
-			*/
+		unsigned int closestCop = 0;
+		bool copInCar = false;
 
+		if (closestCarCop.size() < closestFootCop.size() && closestCarCop.size() > 0){
+			closestCop = closestCarCop.size();
+			copInCar = true;
+		}else 
+			closestCop = closestFootCop.size();
 
-			if (dist2 < 50 && dist2 < dist1)
-				goodness *= 0.95;
+		if (closestCop > 0 && closestCop < 3){
+			cerr << "Cop " << closestCop << " intersections away." << endl;
+			continue;
+		}
 
-			if (player->second.type == cop_foot && dist2 <= 3)
-				goodness /= 100;
-			else if (player->second.type == cop_car && dist2 <= 2)
-				goodness /= 100;
+		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>());
 
+		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;
@@ -48,25 +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, bank->first,_type);
-			if (l.size() < 1)
-				continue;
-			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;
 	*/
 
-	string destination;
+	string destination = _location;
 	double goodness = 0;
 	for (hash_map<string,double>::const_iterator dest = streets.begin();
 			dest != streets.end(); ++dest){