0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AI: simplify some typedefs with template aliases

Browse source
This commit is contained in:
Charles Dang 2018-04-29 05:53:41 +11:00
parent 78e8ac51d7
commit 1b8bfa6ab4
4 changed files with 42 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/ai/composite/aspect.hpp
View file

@ -268,7 +268,7 @@ public:
std::vector< aspect_ptr > default_aspects;
engine::parse_aspect_from_config(*this,_default,parent_id_,std::back_inserter(default_aspects));
if (!default_aspects.empty()) {
typename aspect_type<T>::typesafe_ptr b = std::dynamic_pointer_cast< typesafe_aspect<T>>(default_aspects.front());
typesafe_aspect_ptr<T> b = std::dynamic_pointer_cast< typesafe_aspect<T>>(default_aspects.front());
if (composite_aspect<T>* c = dynamic_cast<composite_aspect<T>*>(b.get())) {
c->parent_id_ = parent_id_;
}
@ -276,7 +276,7 @@ public:
}
}
std::function<void(typename aspect_type<T>::typesafe_ptr_vector&, const config&)> factory_facets =
std::function<void(typesafe_aspect_vector<T>&, const config&)> factory_facets =
std::bind(&ai::composite_aspect<T>::create_facet,*this,_1,_2);
register_facets_property(this->property_handlers(),"facet",facets_,default_, factory_facets);
@ -284,12 +284,12 @@ public:
}
void create_facet( typename aspect_type<T>::typesafe_ptr_vector &facets, const config &cfg)
void create_facet(typesafe_aspect_vector<T>& facets, const config &cfg)
{
std::vector<aspect_ptr> facets_base;
engine::parse_aspect_from_config(*this,cfg,parent_id_,std::back_inserter(facets_base));
for (aspect_ptr a : facets_base) {
typename aspect_type<T>::typesafe_ptr b = std::dynamic_pointer_cast< typesafe_aspect<T>> (a);
typesafe_aspect_ptr<T> b = std::dynamic_pointer_cast< typesafe_aspect<T>> (a);
if (composite_aspect<T>* c = dynamic_cast<composite_aspect<T>*>(b.get())) {
c->parent_id_ = parent_id_;
}
@ -318,7 +318,7 @@ public:
virtual config to_config() const
{
config cfg = aspect::to_config();
for (const typename aspect_type<T>::typesafe_ptr f : facets_) {
for (const typesafe_aspect_ptr<T> f : facets_) {
cfg.add_child("facet",f->to_config());
}
if (default_) {
@ -338,7 +338,7 @@ public:
engine::parse_aspect_from_config(*this,cfg,parent_id_,std::back_inserter(facets));
int j=0;
for (aspect_ptr a : facets) {
typename aspect_type<T>::typesafe_ptr b = std::dynamic_pointer_cast< typesafe_aspect<T>> (a);
typesafe_aspect_ptr<T> b = std::dynamic_pointer_cast< typesafe_aspect<T>> (a);
if (composite_aspect<T>* c = dynamic_cast<composite_aspect<T>*>(b.get())) {
c->parent_id_ = parent_id_;
}
@ -367,8 +367,8 @@ public:
}
protected:
typename aspect_type<T>::typesafe_ptr_vector facets_;
typename aspect_type<T>::typesafe_ptr default_;
typesafe_aspect_vector<T> facets_;
typesafe_aspect_ptr<T> default_;
std::string parent_id_;
};

2
src/ai/contexts.cpp
View file

@ -27,7 +27,7 @@
#include "ai/composite/engine.hpp" // for engine, engine_factory, etc
#include "ai/composite/goal.hpp" // for goal
#include "ai/composite/stage.hpp" // for ministage
#include "ai/game_info.hpp" // for aspect_type<>::typesafe_ptr, etc
#include "ai/game_info.hpp" // for typesafe_aspect_ptr, etc
#include "ai/lua/aspect_advancements.hpp"
#include "ai/manager.hpp" // for manager

52
src/ai/contexts.hpp
View file

@ -20,7 +20,7 @@
#pragma once
#include "ai/game_info.hpp" // for move_map, aspect_type, etc
#include "ai/game_info.hpp" // for move_map, typesafe_aspect_ptr, etc
#include "config.hpp" // for config
#include "game_errors.hpp"
@ -1500,50 +1500,48 @@ private:
known_aspect_map known_aspects_;
aspect_type< unit_advancements_aspect >::typesafe_ptr advancements_;
aspect_type<double>::typesafe_ptr aggression_;
aspect_type<int>::typesafe_ptr attack_depth_;
typesafe_aspect_ptr<unit_advancements_aspect> advancements_;
typesafe_aspect_ptr<double> aggression_;
typesafe_aspect_ptr<int> attack_depth_;
aspect_map aspects_;
aspect_type< attacks_vector >::typesafe_ptr attacks_;
mutable aspect_type<terrain_filter>::typesafe_ptr avoid_;
aspect_type<double>::typesafe_ptr caution_;
typesafe_aspect_ptr<attacks_vector> attacks_;
mutable typesafe_aspect_ptr<terrain_filter> avoid_;
typesafe_aspect_ptr<double> caution_;
mutable std::map<map_location,defensive_position> defensive_position_cache_;
mutable move_map dstsrc_;
mutable move_map enemy_dstsrc_;
mutable moves_map enemy_possible_moves_;
mutable move_map enemy_srcdst_;
aspect_type< std::string >::typesafe_ptr grouping_;
typesafe_aspect_ptr<std::string> grouping_;
std::vector< goal_ptr > goals_;
mutable keeps_cache keeps_;
aspect_type<double>::typesafe_ptr leader_aggression_;
aspect_type< config >::typesafe_ptr leader_goal_;
aspect_type<bool>::typesafe_ptr leader_ignores_keep_;
aspect_type< double >::typesafe_ptr leader_value_;
typesafe_aspect_ptr<double> leader_aggression_;
typesafe_aspect_ptr<config> leader_goal_;
typesafe_aspect_ptr<bool> leader_ignores_keep_;
typesafe_aspect_ptr<double> leader_value_;
mutable bool move_maps_enemy_valid_;
mutable bool move_maps_valid_;
mutable bool dst_src_valid_lua_;
mutable bool dst_src_enemy_valid_lua_;
mutable bool src_dst_valid_lua_;
mutable bool src_dst_enemy_valid_lua_;
aspect_type<bool>::typesafe_ptr passive_leader_;
aspect_type<bool>::typesafe_ptr passive_leader_shares_keep_;
typesafe_aspect_ptr<bool> passive_leader_;
typesafe_aspect_ptr<bool> passive_leader_shares_keep_;
mutable moves_map possible_moves_;
aspect_type< double >::typesafe_ptr recruitment_diversity_;
aspect_type< config >::typesafe_ptr recruitment_instructions_;
aspect_type< std::vector<std::string>>::typesafe_ptr recruitment_more_;
aspect_type< std::vector<std::string>>::typesafe_ptr recruitment_pattern_;
aspect_type< int >::typesafe_ptr recruitment_randomness_;
aspect_type< config >::typesafe_ptr recruitment_save_gold_;
typesafe_aspect_ptr<double> recruitment_diversity_;
typesafe_aspect_ptr<config> recruitment_instructions_;
typesafe_aspect_ptr<std::vector<std::string>> recruitment_more_;
typesafe_aspect_ptr<std::vector<std::string>> recruitment_pattern_;
typesafe_aspect_ptr<int> recruitment_randomness_;
typesafe_aspect_ptr<config> recruitment_save_gold_;
recursion_counter recursion_counter_;
aspect_type< double >::typesafe_ptr scout_village_targeting_;
aspect_type< bool >::typesafe_ptr simple_targeting_;
typesafe_aspect_ptr<double> scout_village_targeting_;
typesafe_aspect_ptr<bool> simple_targeting_;
mutable move_map srcdst_;
aspect_type< bool >::typesafe_ptr support_villages_;
typesafe_aspect_ptr<bool> support_villages_;
mutable unit_stats_cache_t unit_stats_cache_;
aspect_type< double >::typesafe_ptr village_value_;
aspect_type< int >::typesafe_ptr villages_per_scout_;
typesafe_aspect_ptr<double> village_value_;
typesafe_aspect_ptr<int> villages_per_scout_;
};
class readwrite_context_impl : public virtual readonly_context_proxy, public readwrite_context {

18
src/ai/game_info.hpp
View file

@ -54,21 +54,19 @@ template<typename T>
class typesafe_aspect;
template<typename T>
struct aspect_type
{
typedef std::shared_ptr<typesafe_aspect<T>> typesafe_ptr;
typedef std::vector<typesafe_ptr> typesafe_ptr_vector;
};
using typesafe_aspect_ptr = std::shared_ptr<typesafe_aspect<T>>;
template<typename T>
using typesafe_aspect_vector = std::vector<typesafe_aspect_ptr<T>>;
template<typename T>
class typesafe_known_aspect;
template<typename T>
struct known_aspect_type
{
typedef std::shared_ptr<typesafe_known_aspect<T>> typesafe_ptr;
typedef std::vector<typesafe_ptr> typesafe_ptr_vector;
};
using typesafe_known_aspect_ptr = std::shared_ptr<typesafe_known_aspect<T>>;
template<typename T>
using typesafe_known_aspect_vector = std::vector<typesafe_known_aspect_ptr<T>>;
class action_result;
class attack_result;