Enhancement in random value generators

gte/mutator.py

@@ -66,5 +66,8 @@ def mutupdtype(expr):
 
 def mutupdval(expr):
     pos = randint(0, len(expr) - 1)
-    expr[pos] = RpnSymbol(randint(0, 0xFFFF), expr[pos].optype)
+    if expr[pos].optype == RpnSymbol.VALUE:
+        expr[pos] = RpnSymbol.rand_value()
+    else:
+        expr[pos] = RpnSymbol(randint(0, 0xFFFF), expr[pos].optype)
     return expr

gte/rpnlib.py

@@ -192,7 +192,11 @@ class RpnSymbol(object):
         if optype is None:
             optype = [cls.OPERATION, cls.VALUE, cls.VARIABLE]
             optype = optype[random.randint(0,2)]
-        return cls(random.randint(0, 0xFFFF), optype)
+        if optype == cls.VALUE:
+            vals = [(0,0xF), (0, 0xFF), (0,0xFFFF)]
+            return cls(random.randint(*vals[random.randint(0,2)]), optype)
+        else:
+            return cls(random.randint(0, 0xFFFF), optype)
 
     @classmethod
     def rand_op(cls):