Make the code more readable/pythonic.
This commit is contained in:
Thibault Févry
parent
d5f3b8c811
commit
b78f8310ab
1 changed files with 46 additions and 47 deletions
|
|
@ -24,7 +24,8 @@ class GameResult:
|
|||
version_string = ''
|
||||
winner_side = '0'
|
||||
|
||||
def __init__(self,_ai_config1,_ai_config2,_faction1,_faction2,_map,_test):
|
||||
def __init__(self, _ai_config1, _ai_config2, _faction1, _faction2, _map,
|
||||
_test):
|
||||
self.ai_config1 = _ai_config1
|
||||
self.ai_config2 = _ai_config2
|
||||
self.faction1 = _faction1
|
||||
|
|
@ -35,28 +36,26 @@ class GameResult:
|
|||
def filter_non_printable(str):
|
||||
return ''.join(c for c in str if ord(c) > 31 or ord(c) == 9)
|
||||
|
||||
def construct_command_line(cfg,ai1,ai2,f1,f2,map):
|
||||
wesnoth = cfg.get('default','path_to_wesnoth_binary')
|
||||
options= cfg.get('default','arguments_to_wesnoth_binary')
|
||||
ai_config1='--ai_config1='+ai1
|
||||
ai_config2='--ai_config2='+ai2
|
||||
if (map==''):
|
||||
optmap=''
|
||||
def construct_command_line(cfg, ai1, ai2, f1, f2,map):
|
||||
wesnoth = cfg.get('default', 'path_to_wesnoth_binary')
|
||||
options= cfg.get('default', 'arguments_to_wesnoth_binary')
|
||||
ai_config1= '--ai_config1=' + ai1
|
||||
ai_config2= '--ai_config2=' +ai2
|
||||
if not map:
|
||||
optmap = ''
|
||||
else:
|
||||
optmap='--scenario='+map
|
||||
optmap = '--scenario=' + map
|
||||
return '%s %s %s %s %s' % (wesnoth, options, optmap, ai_config1, ai_config2)
|
||||
|
||||
return wesnoth+' '+options+' '+optmap+' '+ai_config1+' '+ai_config2
|
||||
|
||||
def do_filter(str,substring):
|
||||
def do_filter(str, substring):
|
||||
n = str.find(substring)
|
||||
if (n>-1):
|
||||
return n,str[n+len(substring):].strip()
|
||||
return n,''
|
||||
if n > -1:
|
||||
return n, str[n + len(substring):].strip()
|
||||
return n, ''
|
||||
|
||||
def run_game(cfg,game_result):
|
||||
|
||||
command_line = construct_command_line(cfg,game_result.ai_config1,game_result.ai_config2, game_result.faction1, game_result.faction2, game_result.map)
|
||||
print 'Running: '+command_line
|
||||
command_line = construct_command_line(cfg, game_result.ai_config1, game_result.ai_config2, game_result.faction1, game_result.faction2, game_result.map)
|
||||
print 'Running: ' + command_line
|
||||
start = time()
|
||||
p = Popen(command_line, shell=True, bufsize=10000000, stdout=PIPE, stderr=PIPE)
|
||||
# outlines = p.stdout.readlines()
|
||||
|
|
@ -64,56 +63,56 @@ def run_game(cfg,game_result):
|
|||
print 'Finished'
|
||||
for line in outerrlines:
|
||||
str = filter_non_printable(line.strip())
|
||||
n,s = do_filter(str,'info ai/testing: WINNER:')
|
||||
if (n>-1):
|
||||
n,s = do_filter(str, 'info ai/testing: WINNER:')
|
||||
if n > -1:
|
||||
#print 'AND THE WINNER IS: '+s
|
||||
game_result.winner_side = s
|
||||
game_result.is_success = 'true'
|
||||
continue
|
||||
|
||||
n,s = do_filter(str,'info ai/testing: VERSION:')
|
||||
if (n>-1):
|
||||
n, s = do_filter(str, 'info ai/testing: VERSION:')
|
||||
if n > -1:
|
||||
#print 'AND THE VERSION IS: '+s
|
||||
game_result.version_string = s
|
||||
n1 = s.rfind('(')
|
||||
n2 = s.rfind(')')
|
||||
if ((n1>-1) and (n2>-1) and (n2>n1)):
|
||||
if -1 < n1 < n2:
|
||||
sz = s[n1+1:n2]
|
||||
#parse local_modifications
|
||||
n3 = sz.rfind('M')
|
||||
if (n3>-1):
|
||||
if n3 > -1:
|
||||
sz = sz[:n3]
|
||||
game_result.local_modifications = 1
|
||||
#parse repo_release
|
||||
game_result.repo_release = sz
|
||||
continue
|
||||
|
||||
n,s = do_filter(str,'info ai/testing: GAME_END_TURN:')
|
||||
if (n>-1):
|
||||
n,s = do_filter(str ,'info ai/testing: GAME_END_TURN:')
|
||||
if n > -1:
|
||||
#print 'AND THE VICTORY_TURN IS: '+s
|
||||
game_result.end_turn = s
|
||||
continue
|
||||
|
||||
n,s = do_filter(str,'info ai/testing: AI_IDENTIFIER1:')
|
||||
if (n>-1):
|
||||
n, s = do_filter(str, 'info ai/testing: AI_IDENTIFIER1:')
|
||||
if n > -1:
|
||||
#print 'AND THE AI_IDENTIFIER1 IS: '+s
|
||||
game_result.ai_ident1 = s.strip()
|
||||
continue
|
||||
|
||||
n,s = do_filter(str,'info ai/testing: AI_IDENTIFIER2:')
|
||||
if (n>-1):
|
||||
n, s = do_filter(str, 'info ai/testing: AI_IDENTIFIER2:')
|
||||
if n > -1:
|
||||
#print 'AND THE AI_IDENTIFIER2 IS: '+s
|
||||
game_result.ai_ident2 = s.strip()
|
||||
continue
|
||||
|
||||
n,s = do_filter(str,'info mp/connect: FACTION1:')
|
||||
if (n>-1):
|
||||
n, s = do_filter(str, 'info mp/connect: FACTION1:')
|
||||
if n > -1:
|
||||
#print 'AND THE FACTION1 IS: '+s
|
||||
game_result.faction1 = s
|
||||
continue
|
||||
|
||||
n,s = do_filter(str,'info mp/connect: FACTION2:')
|
||||
if (n>-1):
|
||||
n, s = do_filter(str, 'info mp/connect: FACTION2:')
|
||||
if n > -1:
|
||||
#print 'AND THE FACTION2 IS: '+s
|
||||
game_result.faction2 = s
|
||||
continue
|
||||
|
|
@ -149,29 +148,29 @@ def maps(cfg):
|
|||
mp = 1
|
||||
while 1:
|
||||
try:
|
||||
yield cfg.get('default','map'+repr(mp));
|
||||
mp= mp+1
|
||||
yield cfg.get('default', 'map' + repr(mp))
|
||||
mp += 1
|
||||
except:
|
||||
return
|
||||
|
||||
def tests(cfg):
|
||||
ai1=cfg.get('default','ai_config1').strip()
|
||||
ai2=cfg.get('default','ai_config2').strip()
|
||||
f1=cfg.get('default','faction1').strip()
|
||||
f2=cfg.get('default','faction2').strip()
|
||||
n=cfg.getint('default','number_of_tests')
|
||||
ai1 = cfg.get('default', 'ai_config1').strip()
|
||||
ai2 = cfg.get('default', 'ai_config2').strip()
|
||||
f1 = cfg.get('default', 'faction1').strip()
|
||||
f2 = cfg.get('default', 'faction2').strip()
|
||||
n = cfg.getint('default', 'number_of_tests')
|
||||
maplist = []
|
||||
for map in maps(cfg):
|
||||
maplist.append(map)
|
||||
random.seed()
|
||||
for i in range(0, n):
|
||||
for i in xrange(n):
|
||||
map = random.choice(maplist)
|
||||
d = random.randint(0,1)
|
||||
d = random.randint(0, 1)
|
||||
print 'TEST: map '+map+' i='+str(i)+' d='+str(d)
|
||||
if (d==0):
|
||||
game_result = GameResult(ai1,ai2,f1,f2,map,'default')
|
||||
if not d:
|
||||
game_result = GameResult(ai1, ai2, f1, f2, map, 'default')
|
||||
else:
|
||||
game_result = GameResult(ai2,ai1,f2,f1,map,'default')
|
||||
game_result = GameResult(ai2, ai1, f2, f1, map, 'default')
|
||||
yield game_result
|
||||
|
||||
# main
|
||||
|
|
@ -180,5 +179,5 @@ cfg = ConfigParser.ConfigParser()
|
|||
cfg.read('ai_test.cfg')
|
||||
|
||||
for test in tests(cfg):
|
||||
game_result = run_game(cfg,test)
|
||||
game_result = run_game(cfg, test)
|
||||
save_result(cfg,game_result)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue