Add some options and a disabled diagonals mode

gte/__main__.py

@@ -46,6 +46,10 @@ parser_evolve.add_argument('--pool-div', '-D', type=int, metavar='N',
                            default=2,
                            help='Each generation keep 1/N of the pool')
 
+parser_evolve.add_argument('--max', '-m', action='store_const',
+                           default=False, const=True,
+                           help="Keep maximum score instead of average")
+
 parser_evolve.add_argument('--prog-size', type=int, metavar='SIZE',
                            default=5)
 
@@ -72,6 +76,12 @@ parser_evolve.add_argument('--mod-steps', '-M', action='store_const',
 parser_evolve.add_argument('--quiet', '-q', action='store_const',
                            default=False, const=True)
 
+parser_evolve.add_argument('--no-diagonals', '-d', action='store_const',
+                           default=False, const=True)
+
+parser_evolve.add_argument('--target', '-t', type=float, metavar="FLOAT",
+                           default=None,
+                           help="0 < Float <= 2.0 for targeted score")
 
 parser_gen = subparsers.add_parser('generate', help='evolving help')
 
@@ -87,6 +97,8 @@ parser_gen.add_argument('--steps', '-s', type=int, metavar='N',
                         default=30000)
 parser_gen.add_argument('--gray', '-G', action='store_const',
                         default=False, const=True)
+parser_gen.add_argument('--no-diagonals', '-d', action='store_const',
+                        default=False, const=True)
 
 
 args = parser.parse_args()
@@ -133,17 +145,26 @@ if 'pool_size' in args:
         # running jobs
         res = pool.imap(eval_prog, works)
         # Processing results
-        scores = [0 for _ in range(len(progs))]
-        for pid, score in res:
-            scores[pid] += score
-        scores = [(scores[i] / args.repeat_eval, progs[i])
-                  for i in range(len(progs))]
+        if args.max:
+            scores = [ [] for _ in range(len(progs))]
+            for pid, score in res:
+                scores[pid].append(score)
+            scores = [(max(scores[i]), progs[i]) for i in range(len(progs))]
+        else:
+            scores = [0 for _ in range(len(progs))]
+            for pid, score in res:
+                scores[pid] += score
+            scores = [(scores[i] / args.repeat_eval, progs[i])
+                      for i in range(len(progs))]
 
         genstop = time.time()
         # Displaying eval results
         logger.info('Generation evaluating ended in %.2fs' % (genstop - genstart))
 
-        scores = sorted(scores, key=lambda x: x[0], reverse=True)
+        if args.target is None:
+            scores = sorted(scores, key=lambda x: x[0], reverse=True)
+        else:
+            scores = sorted(scores, key=lambda x: abs(x[0] - args.target),)
         for i, (score, prog) in enumerate(scores):
             logger.info('P%d %.3f : "%s"' % (i, score, str(prog)))
         if args.log_progs is not None:
@@ -176,7 +197,7 @@ else:
     # Generate
     w = World(args.world_height, args.world_width, gray=args.gray)
     prog = rpnlib.RpnExpr.from_string(args.prog)
-    turmits = [LivingTurmit(world=w, prog=prog)
+    turmits = [LivingTurmit(world=w, prog=prog, diag=not args.no_diagonals)
                for _ in range(args.turmit_count)]
     msg = 'Generating image for program %s with %d steps and %d turmits'
     logger.info(msg % (str(prog), args.steps, args.turmit_count))
@@ -190,6 +211,9 @@ else:
             logger.info(msg)
         for turmit in turmits:
             turmit()
+        #if step % 2 == 0:
+        #    #w.save('/tmp/anim/GTE_ANIM_%d.png' % (step/10))
+        #    w.save('/tmp/anim/GTE_ANIM_%d.png' % (step/2))
     stop = time.time()
 
     msg = 'Fractdim %.3f after %d steps in %.2fs (%dus per step)'

gte/world.py

@@ -19,7 +19,7 @@ def eval_prog(args):
     w = World(args.world_height, args.world_width, gray=True)
     logger.debug('Running P%d run#%d %s' % (progid, trynum, prog))
     w.raz()
-    turmits = [LivingTurmit(world=w, prog=prog)
+    turmits = [LivingTurmit(world=w, prog=prog, diag=not args.no_diagonals)
                for _ in range(args.turmit_count)]
 
     start = time.time()
@@ -150,7 +150,7 @@ class World(object):
 class LivingTurmit(Turmit):
     ''' @brief Represent a Turmit with coordinates in a world '''
 
-    def __init__(self, world, color = None, x=None, y=None, **kwargs):
+    def __init__(self, world, color = None, x=None, y=None, diag=True, **kwargs):
         super().__init__(**kwargs)
         
         if not isinstance(world, World):
@@ -159,6 +159,8 @@ class LivingTurmit(Turmit):
         if color is not None and len(color) != 3:
             msg = 'Color expected to be a tuple(R,G,B) but %s found'
             raise TypeError(msg % color)
+        ## @brief If true direction contains diagonals
+        self._diag = bool(diag)
         ## @brief Stores Turmit color
         rand_hue = randint(0,255) / 255
         rand_lvl = randint(127,255) / 255
@@ -210,11 +212,12 @@ class LivingTurmit(Turmit):
         if setcol:
             self._world[self._y][self._x] = self._col
 
-        tdir %= 8
+        tdir %= 8 if self._diag else 4
+
         if tdir == 0 or tdir == 4 or tdir == 5:
             self._x += 1
             self._x %= self._world.width
-        elif tdir == 2 or tdir == 6 or tdir == 7:
+        elif tdir == 2 or tdir == 7 or tdir == 6:
             if self._x == 0:
                 self._x = self._world.width -1
             else:
@@ -222,7 +225,7 @@ class LivingTurmit(Turmit):
         if tdir == 1 or tdir == 4 or tdir == 6:
             self._y += 1
             self._y %= self._world.height
-        elif tdir == 3 or tdir == 5 or tdir == 7:
+        elif tdir == 3 or tdir == 7 or tdir == 5:
             if self._y == 0:
                 self._y = self._world.height - 1
             else: