X-Git-Url: https://ruin.nu/git/?p=icfp05.git;a=blobdiff_plain;f=bot%2Fbot.cpp;h=28e8004a2167997f2b5a8bbe629a486ac03f6711;hp=dd516328979baf7ea150909a1c69d0f85f20f287;hb=d7d9942fc9d1066670e166182e36791dfbf035d7;hpb=f4121d29718ebe595283200700956369776dbdca

diff --git a/bot/bot.cpp b/bot/bot.cpp
index dd51632..28e8004 100644
--- a/bot/bot.cpp
+++ b/bot/bot.cpp
@@ -21,41 +21,6 @@ Bot::Bot(const string& name, PlayerType type){
 	_playerTypes["robber"] = robber;
 	_playerTypes["cop-foot"] = cop_foot;
 	_playerTypes["cop-car"] = cop_car;
-	/*
-	priority_queue<vector<string>, vector<vector<string> >, VectComp> pq;
-
-	vector<string> v;
-	v.push_back("hej");
-	pq.push(v);
-	v.push_back("hå");
-	pq.push(v);
-	v.push_back("blaha");
-	pq.push(v);
-	v.clear();
-	v.push_back("hej hå");
-	pq.push(v);
-	v.clear();
-	v.push_back("hejsan");
-	pq.push(v);
-	v.push_back("what?");
-	pq.push(v);
-	v.push_back("blaha");
-	pq.push(v);
-
-	cerr << "Size: " << pq.top().size() << " " << pq.top()[0] << endl;
-	pq.pop();
-	cerr << "Size: " << pq.top().size() << " " << pq.top()[0] << endl;
-	pq.pop();
-	cerr << "Size: " << pq.top().size() << " " << pq.top()[0] << endl;
-	pq.pop();
-	cerr << "Size: " << pq.top().size() << " " << pq.top()[0] << endl;
-	pq.pop();
-	cerr << "Size: " << pq.top().size() << " " << pq.top()[0] << endl;
-	pq.pop();
-	cerr << "Size: " << pq.top().size() << " " << pq.top()[0] << endl;
-	pq.pop();
-
-*/
 
 }
 
@@ -70,22 +35,11 @@ void Bot::play(){
 	_name = value<string>(input);
 	cerr << "Got name: " << _name << endl;
 
-	//robber and 5 cops
-	getline(cin, input);
-	_players[value<string>(input)];
-	getline(cin, input);
-	_players[value<string>(input)];
-	getline(cin, input);
-	_players[value<string>(input)];
-	getline(cin, input);
-	_players[value<string>(input)];
-	getline(cin, input);
-	_players[value<string>(input)];
+	getPlayers();
 
 	cerr << "Got players, building graph." << endl;
 	getline(cin, input);
 	buildGraph();
-	getline(cin, input);
 
 	while (true){
 		getline(cin, input);
@@ -94,13 +48,27 @@ void Bot::play(){
 		updateWorld();
 		_type = _players[_name].type;
 		_location = _players[_name].location;
-		getline(cin, input);
 		cerr << "New turn" << endl;
 		move(turn());
 		cerr << "Done with turn." << endl;
 	}
 }
 
+void Bot::getPlayers(){
+	string input;
+	//robber and 5 cops
+	getline(cin, input);
+	_players[value<string>(input)].type = robber;
+	getline(cin, input);
+	_players[value<string>(input)].type = cop_foot;
+	getline(cin, input);
+	_players[value<string>(input)].type = cop_foot;
+	getline(cin, input);
+	_players[value<string>(input)].type = cop_foot;
+	getline(cin, input);
+	_players[value<string>(input)].type = cop_foot;
+}
+
 /**
  	  	 	  	nod\ eol	
  	  	 	  	( nod: loc node-tag coordinate coordinate eol )*	
@@ -168,6 +136,7 @@ void Bot::buildGraph(){
 			_intersections[from].connections[to] = car;
 	}
 	cerr << "Number of streets: " << streets << endl;
+	getline(cin, input);
 }
 
 void Bot::updateWorld(){
@@ -198,6 +167,11 @@ void Bot::updateWorld(){
 		if (input == "ev/")
 			break;
 		istringstream evidence(input);
+		int world;
+		evidence >> input;
+		evidence >> input;
+		evidence >> world;
+		_evidence[world] = input;
 	}
 	
 	getline(cin,input);
@@ -218,6 +192,7 @@ void Bot::updateWorld(){
 		pl.type = _playerTypes[input];
 	}
 	//cerr << "Number of players: " << _players.size() << endl;
+	getline(cin, input);
 }
 
 void Bot::move(std::string location){
@@ -245,7 +220,7 @@ struct SPInfoComp{
 	}
 };
 
-std::list<std::string> Bot::shortestPath(const std::string& from, PlayerType type, const SPGoal& goal){
+std::list<std::string> Bot::shortestPath(const std::string& from, PlayerType type, const SPGoal& goal, bool reverse){
 
 	//cerr << "New shortest path from: " << from << endl;
 	
@@ -260,6 +235,7 @@ std::list<std::string> Bot::shortestPath(const std::string& from, PlayerType typ
 	pq.push(node);
 
 	int g = 0;
+	bool hascar = type == cop_car;
 	while(!pq.empty()){
 		node = pq.top();
 		pq.pop();
@@ -285,9 +261,23 @@ std::list<std::string> Bot::shortestPath(const std::string& from, PlayerType typ
 		for (hash_map<string,StreetType>::const_iterator street = inter.connections.begin();
 				street != inter.connections.end(); ++street){
 			hash_map<string,SPInfo>::iterator newNode = nodes.find(street->first);
-			bool hascar = type == cop_car;
-			if ( (hascar &&  (street->second == car || street->second == both)) ||
-					(!hascar && (street->second == foot || street->second == both))){
+			bool travelStreet = false;
+			if (hascar){
+				if (reverse){
+					if (street->second != foot){
+						hash_map<string,StreetType>::const_iterator st = _intersections[street->first].connections.find(node->name);
+						if (st != _intersections[street->first].connections.end())
+							travelStreet = st->second != foot;
+						else
+							travelStreet = false;
+					}else
+						travelStreet = true;
+				}else
+					travelStreet = street->second != foot;
+			}else{
+				travelStreet = street->second != car;
+			}
+			if (travelStreet){
 				//cerr << "Adding street: " << street->first << endl;
 				SPInfo* n = 0;
 				if (newNode == nodes.end()){
@@ -314,3 +304,27 @@ std::list<std::string> Bot::shortestPath(const std::string& from, PlayerType typ
 	
 	return list<string>();
 }
+
+SimpleSPGoal::SimpleSPGoal(std::string to):_to(to){
+}
+
+int SimpleSPGoal::operator()(const SPInfo* node) const{
+	if (node->name == _to)
+		return 1;
+	return 0;
+}
+
+FindPlayer::FindPlayer(const hash_map<string, Player>& players, PlayerType type, int limit) : _players(players), _type(type), _limit(limit){
+}
+
+int FindPlayer::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 == _type && player->second.location == node->name){
+			return 1;
+		}
+	}
+	return 0;
+}