From: <dil...@us...> - 2015-02-15 19:07:26
|
Revision: 7944 http://sourceforge.net/p/freeorion/code/7944 Author: dilvish-fo Date: 2015-02-15 19:07:24 +0000 (Sun, 15 Feb 2015) Log Message: ----------- patch with some further AI visibility cleanup, including visibility related adjustments to the python universe wrapper Modified Paths: -------------- trunk/FreeOrion/default/AI/ExplorationAI.py trunk/FreeOrion/python/PythonUniverseWrapper.cpp Modified: trunk/FreeOrion/default/AI/ExplorationAI.py =================================================================== --- trunk/FreeOrion/default/AI/ExplorationAI.py 2015-02-15 19:03:37 UTC (rev 7943) +++ trunk/FreeOrion/default/AI/ExplorationAI.py 2015-02-15 19:07:24 UTC (rev 7944) @@ -140,13 +140,11 @@ visibility_info = ['%s: %s' % (vis.name, turn) for vis, turn in visibility_turn_list] print "*** system ID %d ( %s ) ; previously %s, new visibility turns info: %s " % (cur_system_id, sys_name, pre_vis, visibility_info) status_str = "*** system ID %d ( %s ) ; " % (cur_system_id, sys_name) - have_been_visible = dict_from_map(universe.getVisibilityTurnsMap(cur_system_id, empire_id)).get(fo.visibility.partial, 0) > 0 - #print "previous visTurns result: %s"% ([val for val in universe.getVisibilityTurns(cur_system_id, empire_id)], ) - #print "new visTurns result: %s"% (dictFromMap( universe.getVisibilityTurnsMap(cur_system_id, empire_id)), ) + has_been_visible = dict_from_map(universe.getVisibilityTurnsMap(cur_system_id, empire_id)).get(fo.visibility.partial, 0) > 0 is_connected = universe.systemsConnected(cur_system_id, home_system_id, -1) # self.empire_id) - status_str += " -- is %s partially visible " % (["not", ""][have_been_visible]) + status_str += " -- is %s partially visible " % (["not", ""][has_been_visible]) status_str += " -- is %s visibly connected to homesystem " % (["not", ""][is_connected]) - if have_been_visible: + if has_been_visible: sys_status = foAI.foAIstate.systemStatus.setdefault(cur_system_id, {}) foAI.foAIstate.visInteriorSystemIDs[cur_system_id] = 1 if cur_system_id in foAI.foAIstate.visBorderSystemIDs: Modified: trunk/FreeOrion/python/PythonUniverseWrapper.cpp =================================================================== --- trunk/FreeOrion/python/PythonUniverseWrapper.cpp 2015-02-15 19:03:37 UTC (rev 7943) +++ trunk/FreeOrion/python/PythonUniverseWrapper.cpp 2015-02-15 19:07:24 UTC (rev 7944) @@ -155,35 +155,6 @@ } boost::function<std::map<int,double> (const Universe&, int, int)> SystemNeighborsMapFunc = &SystemNeighborsMapP; - int VisibilityP(const Universe& universe, int object_id, int empire_id = ALL_EMPIRES) { - int retval; - //std::vector<int> retval; - try { - retval = universe.GetObjectVisibilityByEmpire(object_id, empire_id); - return retval; - } catch (...) { - } - return INVALID_VISIBILITY; - } - boost::function<int (const Universe&, int, int)> VisibilityFunc = &VisibilityP; - - std::vector<int> VisibilityTurnsP(const Universe& universe, int object_id, int empire_id = ALL_EMPIRES) { - Universe::VisibilityTurnMap vismap; - std::vector<int> retval; - //std::vector<int> retval; - try { - vismap = universe.GetObjectVisibilityTurnMapByEmpire(object_id, empire_id); - retval.push_back(vismap[VIS_NO_VISIBILITY]); - retval.push_back(vismap[VIS_BASIC_VISIBILITY]); - retval.push_back(vismap[VIS_PARTIAL_VISIBILITY]); - retval.push_back(vismap[VIS_FULL_VISIBILITY]); - return retval; - } catch (...) { - } - return retval; - } - boost::function<std::vector<int> (const Universe&, int, int)> VisibilityTurnsFunc = &VisibilityTurnsP; - const Meter* (UniverseObject::*ObjectGetMeter)(MeterType) const = &UniverseObject::GetMeter; const std::map<MeterType, Meter>& (UniverseObject::*ObjectMeters)(void) const = &UniverseObject::Meters; @@ -277,9 +248,6 @@ class_<std::map<int, double> >("IntDblMap") .def(boost::python::map_indexing_suite<std::map<int, double>,true >()) ; - class_<std::map<int, Visibility> >("IntVisibilityMap") - .def(boost::python::map_indexing_suite<std::map<int, Visibility>,true >()) - ; class_<std::map<Visibility,int> >("VisibilityIntMap") .def(boost::python::map_indexing_suite<std::map<Visibility, int>, true>()) ; @@ -354,28 +322,13 @@ return_value_policy<return_by_value>(), boost::mpl::vector<std::map<int, double>, const Universe&, int, int>() )) - .def("getVisibilityMap", make_function( - &Universe::GetObjectVisibilityByEmpire, - return_value_policy<return_by_value>() - )) .def("getVisibilityTurnsMap", make_function( &Universe::GetObjectVisibilityTurnMapByEmpire, return_value_policy<return_by_value>() )) - .def("getVisibilityTurns", make_function( - VisibilityTurnsFunc, - return_value_policy<return_by_value>(), - boost::mpl::vector<std::vector<int>, const Universe&, int, int>() - )) - .def("getVisibility", make_function( - VisibilityFunc, - return_value_policy<return_by_value>(), - boost::mpl::vector<int, const Universe&, int, int>() - )) - .def("getVisibilityMap", make_function( &Universe::GetObjectVisibilityByEmpire, return_value_policy<return_by_value>() )) |