Author: crab
Date: Fri Apr 24 20:38:47 2009
New Revision: 35167
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35167&view=rev
Log:
Added ai_testing logs to log information about the winner, including
information about AI indentifier
Modified:
trunk/src/actions.cpp
trunk/src/actions.hpp
trunk/src/ai/ai.cpp
trunk/src/mouse_events.cpp
trunk/src/playsingle_controller.cpp
trunk/src/replay.cpp
trunk/src/team.cpp
trunk/src/team.hpp
Modified: trunk/src/actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/actions.cpp?rev=35167&r1=35166&r2=35167&view=diff
==============================================================================
--- trunk/src/actions.cpp (original)
+++ trunk/src/actions.cpp Fri Apr 24 20:38:47 2009
@@ -41,6 +41,7 @@
#define LOG_NG LOG_STREAM(info, engine)
#define ERR_NG LOG_STREAM(err, engine)
+#define LOG_AI_TESTING LOG_STREAM(info, ai_testing)
struct castle_cost_calculator : cost_calculator
{
castle_cost_calculator(const gamemap& map) : map_(map)
@@ -1903,7 +1904,7 @@
game_events::fire("post_advance",loc);
}
-void check_victory(unit_map& units, std::vector<team>& teams, display& disp)
+void check_victory(const gamestatus& status, unit_map& units,
std::vector<team>& teams, display& disp)
{
std::vector<int> seen_leaders;
for(unit_map::const_iterator i = units.begin();
@@ -1962,6 +1963,16 @@
std::cout << *i << " (using " << ai << ") ";
}
std::cout << "\n";
+ for(std::vector<int>::const_iterator i =
seen_leaders.begin(); i != seen_leaders.end(); ++i) {
+ LOG_AI_TESTING << "WINNER: "<< *i <<std::endl;
+ }
+ LOG_AI_TESTING << "VICTORY_TURN: "<< status.turn()
<<std::endl;
+ for (std::vector<team>::const_iterator tm =
teams.begin(); tm != teams.end(); ++tm) {
+ int side = tm-teams.begin()+1;
+ LOG_AI_TESTING << "AI_IDENTIFIER"<<side<<": "
<< tm->ai_algorithm_identifier() <<std::endl;
+ }
+ LOG_AI_TESTING << "VERSION: " << game_config::revision
<< std::endl;
+
}
LOG_NG << "throwing end level exception...\n";
Modified: trunk/src/actions.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/actions.hpp?rev=35167&r1=35166&r2=35167&view=diff
==============================================================================
--- trunk/src/actions.hpp (original)
+++ trunk/src/actions.hpp Fri Apr 24 20:38:47 2009
@@ -297,7 +297,7 @@
* an end_level_exception if one has.
* Will also remove control of villages from sides with dead leaders.
*/
-void check_victory(unit_map& units, std::vector<team>& teams, display& disp);
+void check_victory(const gamestatus& status, unit_map& units,
std::vector<team>& teams, display& disp);
/**
* Gets the time of day at a certain tile.
Modified: trunk/src/ai/ai.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/ai.cpp?rev=35167&r1=35166&r2=35167&view=diff
==============================================================================
--- trunk/src/ai/ai.cpp (original)
+++ trunk/src/ai/ai.cpp Fri Apr 24 20:38:47 2009
@@ -1273,7 +1273,7 @@
}
}
- check_victory(get_info().units,get_info().teams, get_info().disp);
+ check_victory(get_info().state,get_info().units,get_info().teams,
get_info().disp);
raise_enemy_attacked();
}
Modified: trunk/src/mouse_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/mouse_events.cpp?rev=35167&r1=35166&r2=35167&view=diff
==============================================================================
--- trunk/src/mouse_events.cpp (original)
+++ trunk/src/mouse_events.cpp Fri Apr 24 20:38:47 2009
@@ -680,7 +680,7 @@
dialogs::advance_unit(map_,units_,defender_loc,gui(),!defender_human);
}
- check_victory(units_, teams_, gui());
+ check_victory(status_, units_, teams_, gui());
gui().draw();
Modified: trunk/src/playsingle_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/playsingle_controller.cpp?rev=35167&r1=35166&r2=35167&view=diff
==============================================================================
--- trunk/src/playsingle_controller.cpp (original)
+++ trunk/src/playsingle_controller.cpp Fri Apr 24 20:38:47 2009
@@ -581,7 +581,7 @@
std::endl;
}
- check_victory(units_, teams_, *gui_);
+ check_victory(status_, units_, teams_, *gui_);
}
// Time has run out
Modified: trunk/src/replay.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/replay.cpp?rev=35167&r1=35166&r2=35167&view=diff
==============================================================================
--- trunk/src/replay.cpp (original)
+++ trunk/src/replay.cpp Fri Apr 24 20:38:47 2009
@@ -796,7 +796,7 @@
//if there are no more advancing units, then we
check for victory,
//in case the battle that led to advancement
caused the end of scenario
if(advancing_units.empty()) {
- check_victory(units, teams, disp);
+ check_victory(state, units, teams,
disp);
}
continue;
@@ -1174,7 +1174,7 @@
//check victory now if we don't have any advancements.
If we do have advancements,
//we don't check until the advancements are processed.
if(advancing_units.empty()) {
- check_victory(units, teams, disp);
+ check_victory(state, units, teams, disp);
}
fix_shroud = !get_replay_source().is_skipping();
}
Modified: trunk/src/team.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/team.cpp?rev=35167&r1=35166&r2=35167&view=diff
==============================================================================
--- trunk/src/team.cpp (original)
+++ trunk/src/team.cpp Fri Apr 24 20:38:47 2009
@@ -627,6 +627,11 @@
return ai_manager::get_active_ai_algorithm_type_for_side(info_.side);
}
+const std::string& team::ai_algorithm_identifier() const
+{
+ return
ai_manager::get_active_ai_global_parameters_for_side(info_.side)["ai_identifier"];
+}
+
const config& team::ai_parameters() const
{
return
ai_manager::get_active_ai_effective_parameters_for_side(info_.side);
Modified: trunk/src/team.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/team.hpp?rev=35167&r1=35166&r2=35167&view=diff
==============================================================================
--- trunk/src/team.hpp (original)
+++ trunk/src/team.hpp Fri Apr 24 20:38:47 2009
@@ -246,6 +246,7 @@
const std::string& flag_icon() const { return info_.flag_icon; }
const std::string& ai_algorithm() const;
+ const std::string& ai_algorithm_identifier() const;
const config& ai_parameters() const;
const config& ai_memory() const;
void set_ai_memory(const config& ai_mem);
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
