upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-05 09:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

new type of candidate move:

Browse Source 
...strategic, only called once with no parameter. Also initialize
name_ and type_ correctly
This commit is contained in:
Jérémy Rosen 2009-04-13 14:46:34 +00:00
parent f8ce5aef8b
commit 7e8ec5f191
2 changed files with 55 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/formula_candidates.cpp
View File

@ -39,11 +39,13 @@ void candidate_action_manager::load_config(const config& cfg, formula_ai* ai, fu
candidate_action_ptr new_ca;
if( type == "movement") {
new_ca = candidate_action_ptr(new move_candidate_action(rc_action, function_table ));
new_ca = candidate_action_ptr(new move_candidate_action(name, type, rc_action, function_table ));
} else if( type == "attack") {
new_ca = candidate_action_ptr(new attack_candidate_action(rc_action, function_table ));
new_ca = candidate_action_ptr(new attack_candidate_action(name, type, rc_action, function_table ));
} else if( type == "support") {
new_ca = candidate_action_ptr(new support_candidate_action(rc_action, function_table ));
new_ca = candidate_action_ptr(new support_candidate_action(name, type, rc_action, function_table ));
} else if( type == "strategic") {
new_ca = candidate_action_ptr(new strategic_candidate_action(name, type, rc_action, function_table ));
} else {
ERR_AI << "Unknown candidate action type: " << type << "\n";
continue;
@ -76,7 +78,9 @@ bool candidate_action_manager::evaluate_candidate_actions(formula_ai* ai, unit_m
return true;
}
base_candidate_action::base_candidate_action(const config& cfg, function_symbol_table* function_table) :
base_candidate_action::base_candidate_action(const std::string& name,const std::string& type,const config& cfg, function_symbol_table* function_table) :
name_(name),
type_(type),
eval_(new game_logic::formula(cfg["evaluation"], function_table)),
action_(new game_logic::formula(cfg["action"], function_table))
{}
@ -98,8 +102,8 @@ int base_candidate_action::execute_formula(const const_formula_ptr& formula,
return res;
}
candidate_action_with_filters::candidate_action_with_filters(const config& cfg, function_symbol_table* function_table) :
base_candidate_action(cfg, function_table)
candidate_action_with_filters::candidate_action_with_filters(const std::string& name, const std::string& type,const config& cfg, function_symbol_table* function_table) :
base_candidate_action(name, type, cfg, function_table)
{
const config & filter_params = cfg.child("filter");
@ -114,8 +118,8 @@ candidate_action_with_filters::candidate_action_with_filters(const config& cfg,
}
}
move_candidate_action::move_candidate_action(const config& cfg, function_symbol_table* function_table) :
candidate_action_with_filters(cfg, function_table)
move_candidate_action::move_candidate_action(const std::string& name, const std::string& type,const config& cfg, function_symbol_table* function_table) :
candidate_action_with_filters(name, type, cfg, function_table)
{}
void move_candidate_action::evaluate(formula_ai* ai, unit_map& units)
@ -154,8 +158,8 @@ void move_candidate_action::update_callable_map(game_logic::map_formula_callable
callable.add("me", my_unit_callable);
}
attack_candidate_action::attack_candidate_action(const config& cfg, function_symbol_table* function_table) :
candidate_action_with_filters(cfg, function_table)
attack_candidate_action::attack_candidate_action(const std::string& name, const std::string& type,const config& cfg, function_symbol_table* function_table) :
candidate_action_with_filters(name, type, cfg, function_table)
{}
void attack_candidate_action::evaluate(formula_ai* ai, unit_map& units)
@ -229,8 +233,33 @@ void attack_candidate_action::update_callable_map(game_logic::map_formula_callab
callable.add("target", enemy_unit_callable);
}
support_candidate_action::support_candidate_action(const config& cfg, function_symbol_table* function_table) :
candidate_action_with_filters(cfg, function_table)
strategic_candidate_action::strategic_candidate_action(const std::string& name, const std::string& type,const config& cfg, function_symbol_table* function_table) :
base_candidate_action(name, type, cfg, function_table)
{}
void strategic_candidate_action::evaluate(formula_ai* ai, unit_map& units)
{
score_ = 0;
for(unit_map::unit_iterator i = units.begin() ; i != units.end() ; ++i)
{
if( (i->second.side() == ai->get_side() ) &&
(i->second.has_moved() == false) ) {
game_logic::map_formula_callable callable(static_cast<const formula_callable*>(ai));
callable.add_ref();
int res = execute_formula(eval_, callable, ai);
if(res > score_) {
score_ = res;
}
}
}
}
support_candidate_action::support_candidate_action(const std::string& name, const std::string& type,const config& cfg, function_symbol_table* function_table) :
candidate_action_with_filters(name, type, cfg, function_table)
{}
}

20
src/formula_candidates.hpp
View File

@ -30,7 +30,7 @@ typedef boost::shared_ptr<game_logic::base_candidate_action> candidate_action_pt
//and should complete evaluate and update_callable_map methods
class base_candidate_action {
public:
base_candidate_action(const config& cfg, function_symbol_table* function_table);
base_candidate_action(const std::string& name, const std::string& type,const config& cfg, function_symbol_table* function_table);
virtual ~base_candidate_action() {}
@ -45,6 +45,9 @@ public:
int get_score() const {return score_;}
const_formula_ptr& get_action() {return action_;}
const std::string& get_name() { return name_;}
const std::string& get_type() { return type_;}
protected:
int execute_formula(const const_formula_ptr& formula,
@ -110,7 +113,7 @@ private:
class candidate_action_with_filters : public base_candidate_action {
public:
candidate_action_with_filters(const config& cfg, function_symbol_table* function_table);
candidate_action_with_filters(const std::string& name, const std::string& type,const config& cfg, function_symbol_table* function_table);
protected:
game_logic::candidate_action_filters filter_map_;
@ -118,7 +121,7 @@ protected:
class move_candidate_action : public candidate_action_with_filters {
public:
move_candidate_action(const config& cfg, function_symbol_table* function_table);
move_candidate_action(const std::string& name, const std::string& type,const config& cfg, function_symbol_table* function_table);
virtual void evaluate(formula_ai* ai, unit_map& units);
@ -130,7 +133,7 @@ protected:
class attack_candidate_action : public candidate_action_with_filters {
public:
attack_candidate_action(const config& cfg, function_symbol_table* function_table);
attack_candidate_action(const std::string& name, const std::string& type,const config& cfg, function_symbol_table* function_table);
virtual void evaluate(formula_ai* ai, unit_map& units);
@ -140,11 +143,16 @@ protected:
unit_map::const_unit_iterator enemy_unit_;
};
class support_candidate_action : public candidate_action_with_filters {
class strategic_candidate_action : public base_candidate_action {
public:
support_candidate_action(const config& cfg, function_symbol_table* function_table);
strategic_candidate_action(const std::string& name, const std::string& type,const config& cfg, function_symbol_table* function_table);
virtual void evaluate(formula_ai* ai, unit_map& units);
};
class support_candidate_action : public candidate_action_with_filters {
public:
support_candidate_action(const std::string& name, const std::string& type,const config& cfg, function_symbol_table* function_table);
};
}
#endif /* _FORMULA_CANDIDATES_HPP */