[Freeorion-programmers] SF.net SVN: freeorion:[5904] trunk/FreeOrion/default/AI

[<dil...@us...>]

Revision: 5904
          http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=5904&view=rev
Author:   dilvish-fo
Date:     2013-03-24 23:04:55 +0000 (Sun, 24 Mar 2013)
Log Message:
-----------
a couple additional tweaks to the charting script & to AI

Modified Paths:
--------------
    trunk/FreeOrion/default/AI/MilitaryAI.py
    trunk/FreeOrion/default/AI/TechsListsAI.py
    trunk/FreeOrion/default/AI/charting/charts.py

Modified: trunk/FreeOrion/default/AI/MilitaryAI.py
===================================================================
--- trunk/FreeOrion/default/AI/MilitaryAI.py	2013-03-24 20:47:54 UTC (rev 5903)
+++ trunk/FreeOrion/default/AI/MilitaryAI.py	2013-03-24 23:04:55 UTC (rev 5904)
@@ -109,6 +109,7 @@
     if  capitalPlanet:  
         capitalSysID = capitalPlanet.systemID
     else: # should be rare, but so as to not break code below, pick a randomish  mil-centroid  system
+        capitalSysID=None #unless we can find one to use
         systemDict = {}
         for fleetID in allMilitaryFleetIDs:
             status = foAI.foAIstate.fleetStatus.get(fleetID,  None)
@@ -121,7 +122,10 @@
         if rankedSystems:
             capitalSysID = rankedSystems[-1][-1]
         else:
-            capitalSysID = foAI.foAIstate.fleetStatus.items()[0]['sysID']
+            try:
+                capitalSysID = foAI.foAIstate.fleetStatus.items()[0][1]['sysID']
+            except:
+                pass
 
     if False:
         if fo.currentTurn() < 20:

Modified: trunk/FreeOrion/default/AI/TechsListsAI.py
===================================================================
--- trunk/FreeOrion/default/AI/TechsListsAI.py	2013-03-24 20:47:54 UTC (rev 5903)
+++ trunk/FreeOrion/default/AI/TechsListsAI.py	2013-03-24 23:04:55 UTC (rev 5904)
@@ -262,10 +262,12 @@
             "PRO_SOL_ORB_GEN",
             "DEF_DEFENSE_NET_2",
             "PRO_INDUSTRY_CENTER_I", 
+            "DEF_GARRISON_2", 
             "CON_METRO_INFRA", 
             "DEF_DEFENSE_NET_REGEN_1",
             "DEF_PLAN_BARRIER_SHLD_1",
             "PRO_INDUSTRY_CENTER_II", 
+            "SPY_DETECT_3",
             "GRO_LIFECYCLE_MAN", 
             "SHP_MULTICELL_CAST", 
             "SHP_ENDOCRINE_SYSTEMS", 
@@ -280,10 +282,8 @@
             "DEF_SYST_DEF_MINE_1",
             "DEF_PLAN_BARRIER_SHLD_3",
             "CON_ORBITAL_HAB",
-            "DEF_GARRISON_2", 
             "DEF_GARRISON_3", 
             "SHP_WEAPON_8",
-            "SPY_DETECT_3",
             "SHP_CONT_SYMB",
             "SHP_MONOCELL_EXP",
             "SHP_ENDOSYMB_HULL",

Modified: trunk/FreeOrion/default/AI/charting/charts.py
===================================================================
--- trunk/FreeOrion/default/AI/charting/charts.py	2013-03-24 20:47:54 UTC (rev 5903)
+++ trunk/FreeOrion/default/AI/charting/charts.py	2013-03-24 23:04:55 UTC (rev 5904)
@@ -82,10 +82,12 @@
     A1log = glob(dataDir+os.sep+"AI_1.log")
     if A1log and A1log[0] in logfiles:
         A1Time = os.path.getmtime(A1log[0])
-        for path in logfiles:
+        for path in logfiles[::-1]:
             logtime = os.path.getmtime(path)
+            print "path ",  path,  "logtime diff: %.1f"%(A1Time -logtime)
             if logtime < A1Time  - 300:
                 del logfiles[ logfiles.index(path)]
+                print "skipping stale logfile ",  path
     empire=0
     for lfile in logfiles:
         with open(lfile, 'r') as lf: