|
@@ -23,16 +23,20 @@ def eval_prog(args):
|
23
|
23
|
for _ in range(args.turmit_count)]
|
24
|
24
|
|
25
|
25
|
start = time.time()
|
26
|
|
- for step in range(args.steps):
|
|
26
|
+ if trynum == 0:
|
|
27
|
+ steps = args.steps
|
|
28
|
+ else:
|
|
29
|
+ steps = args.steps - int((args.steps / 1.5) // (args.repeat_eval - trynum))
|
|
30
|
+ for step in range(steps):
|
27
|
31
|
for turmit in turmits:
|
28
|
32
|
turmit()
|
29
|
33
|
stop = time.time()
|
30
|
34
|
|
31
|
35
|
score = w.fractdim()
|
32
|
36
|
if not args.quiet:
|
33
|
|
- msg = 'G%d P%d run#%d scores %.3f in %.2fs (%dus per step)\t%s'
|
34
|
|
- msg %= (generation, progid, trynum, score, stop - start,
|
35
|
|
- ((stop - start)*1000000)//args.steps//len(turmits),
|
|
37
|
+ msg = 'G%d P%d run#%d %d steps scores %.3f in %.2fs (%dus per step)\t%s'
|
|
38
|
+ msg %= (generation, progid, trynum, steps, score, stop - start,
|
|
39
|
+ ((stop - start)*1000000)//steps//len(turmits),
|
36
|
40
|
str(prog))
|
37
|
41
|
logger.info(msg)
|
38
|
42
|
return progid, score
|