Bugfix in mutator + enhance __main__

gte/__main__.py

@@ -43,7 +43,7 @@ parser_evolve.add_argument('--pool-size', '-p', type=int, metavar='N',
                            default=10)
 
 parser_evolve.add_argument('--pool-div', '-D', type=int, metavar='N',
-                           default=5,
+                           default=2,
                            help='Each generation keep 1/N of the pool')
 
 parser_evolve.add_argument('--prog-size', type=int, metavar='SIZE',
@@ -112,12 +112,15 @@ if 'pool_size' in args:
         logger.info(msg % (generation, args.repeat_eval, args.turmit_count,
                            args.steps, args.pool_size))
         genstart = time.time()
-
+        
+        # Preparing work
         works = []
         for pid, prog in enumerate(progs):
             for i in range(args.repeat_eval):
                 works.append((generation, pid, prog, i, 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
@@ -125,6 +128,7 @@ if 'pool_size' in args:
                   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)
@@ -138,16 +142,19 @@ if 'pool_size' in args:
                     logprogs.flush()
                 logprogs.write('\n')
 
-        keep_div = 2
+        # Split pool & mutate the one we kept
+        keep_div = args.pool_div
         progs = []
         for prog in [ prog for _, prog in scores[:len(scores)//keep_div]]:
             progs.append(prog)
-            for _ in range(keep_div - 1):
-                progs.append(mutate(prog, force=True))
+            for cur_mut in range(keep_div - 1):
+                progs.append(mutate(prog, force=True, mutcount= 2**cur_mut))
                 if len(progs) >= args.pool_size:
                     break
             if len(progs) >= args.pool_size:
                 break
+        for pid, prog in enumerate(progs):
+            logger.debug('P%d : %s' % (pid, str(prog)))
         generation += 1
     exit(0)
 else:
@@ -173,7 +180,7 @@ else:
     msg = 'Fractdim %.3f after %d steps in %.2fs (%dus per step)'
     msg %= (w.fractdim(), args.steps,
             stop - start,
-            ((stop - start)*1000000)//args.steps)
+            ((stop - start)*1000000)//args.steps//args.turmit_count)
     logger.info(msg)
 
     w.save(args.output)

gte/mutator.py

@@ -15,10 +15,11 @@ def mutate(expr, force = True, mutcount = 1):
         @param mutcount int : count of time
         @return a muatated copy of expr
     '''
+    res = copy.copy(expr)
+
     if force:
-        return mutatef(expr, mutcount)
+        return mutatef(res, mutcount)
 
-    res = copy.copy(expr)
     for _ in range(mutcount):
         rep = randint(*ADD)
         if rep <= ADD[0]:

gte/rpnlib.py

@@ -171,6 +171,9 @@ class RpnSymbol(object):
             return False
         return b.optype == self.optype and b.value == self.value
 
+    def __copy__(self):
+        return self.__class__(self.value, self.optype)
+
     @classmethod
     def from_string(cls, val):
         try:
@@ -184,7 +187,6 @@ class RpnSymbol(object):
             return cls(val, cls.VARIABLE)
             
         raise ValueError('Unrecognized symbol "%s"' % val)
-            
 
     @classmethod
     def random(cls, optype=None):