Optimisation in World init + update default args

gte/__main__.py

@@ -26,14 +26,15 @@ subparsers = parser.add_subparsers(help='sub-commands help')
 parser_evolve = subparsers.add_parser('evolve', help='evolving help')
 
 parser_evolve.add_argument('--steps', '-s', type=int, metavar='N',
-                           default=4000, help="Number of steps")
+                           default=30000, help="Number of steps")
 
-parser_evolve.add_argument('--repeat-eval', type=int, metavar='N', default=5)
+parser_evolve.add_argument('--repeat-eval', '-R', type=int, metavar='N',
+                           default=5)
 
 parser_evolve.add_argument('--world-height', '-y', type=int, metavar='HEIGHT',
-                           default=256)
+                           default=512)
 parser_evolve.add_argument('--world-width', '-x', type=int, metavar='WIDTH',
-                           default=256)
+                           default=512)
 
 parser_evolve.add_argument('--turmit-count', '-T', type=int, metavar='N',
                            default=3)
@@ -63,18 +64,20 @@ parser_evolve.add_argument('--log-progs', '-L', type=str, metavar='FILENAME',
 parser_evolve.add_argument('--quiet', '-q', action='store_const',
                            default=False, const=True)
 
+
+
 parser_gen = subparsers.add_parser('generate', help='evolving help')
 
 parser_gen.add_argument('--prog', '-P', type=str, default=None)
 parser_gen.add_argument('--output', '-o', type=str, default='gte.png')
 parser_gen.add_argument('--world-height', '-y', type=int, metavar='HEIGHT',
-                        default=256)
+                        default=512)
 parser_gen.add_argument('--world-width', '-x', type=int, metavar='WIDTH',
-                        default=256)
+                        default=512)
 parser_gen.add_argument('--turmit-count', '-T', type=int, metavar='N',
-                        default=10)
+                        default=3)
 parser_gen.add_argument('--steps', '-s', type=int, metavar='N',
-                        default=1024)
+                        default=30000)
 
 
 args = parser.parse_args()
@@ -113,7 +116,7 @@ if 'pool_size' in args:
         works = []
         for pid, prog in enumerate(progs):
             for i in range(args.repeat_eval):
-                works.append((pid, prog, i, args))
+                works.append((generation, pid, prog, i, args))
         res = pool.imap(eval_prog, works)
         scores = [0 for _ in range(len(progs))]
         for pid, score in res:
@@ -158,9 +161,10 @@ else:
     start = time.time()
     for step in range(args.steps):
         if step % 512 == 1:
-            msg = 'Step %d/%d %dus/step'
+            msg = 'Step %d/%d %dus/step fractdim=%.3f'
             msg %= (step, args.steps,
-                    ((time.time() - start)*1000000)//step//len(turmits))
+                    ((time.time() - start)*1000000)//step//len(turmits),
+                    w.fractdim())
             logger.info(msg)
         for turmit in turmits:
             turmit()

gte/world.py

@@ -15,7 +15,7 @@ def eval_prog(args):
     ''' @brief Return an array of fractdim
         @param args : dirty argparser returned arguments
     '''
-    progid, prog, trynum, args = args
+    generation, progid, prog, trynum, args = args
     w = World(args.world_height, args.world_width)
     logger.debug('Running P%d run#%d %s' % (progid, trynum, prog))
     w.raz()
@@ -30,9 +30,8 @@ def eval_prog(args):
 
     score = w.fractdim()
     if not args.quiet:
-        msg = 'P%d run#%d scores %.3f in %.2fs (%dus per step)\t%s'
-        msg %= (progid, trynum, score,
-                stop - start,
+        msg = 'G%d P%d run#%d scores %.3f in %.2fs (%dus per step)\t%s'
+        msg %= (generation, progid, trynum, score, stop - start,
                 ((stop - start)*1000000)//args.steps//len(turmits),
                 str(prog))
         logger.info(msg)
@@ -59,12 +58,15 @@ class World(object):
     def width(self):
         return self._x
 
-    def raz(self, color=(0,0,0)):
+    def raz(self, color=None):
         ''' @brief Set all value to color
             @param color tuple : tuple(R,G,B)
         '''
-        self._val = [[color for _ in range(self._x)] for _ in range(self._y)]
-        self._val = np.array(self._val)
+        if color is None:
+            self._val = np.zeros([self._y, self._x, 3])
+        else:
+            self._val = [[color for _ in range(self._x)] for _ in range(self._y)]
+            self._val = np.array(self._val)
 
     def save(self, filename):
         ''' @brief Save as an image '''