X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=expr.py;h=723022c16e062f34de50904ba2580abb90516113;hb=02b0a7bb770f07f2e91f1c77b899815516087b6a;hp=b453f235010a4c9a8f8e5ee1fd408da29db12c27;hpb=38d3035f027881bb2baffdaffc8cd666d3df5dba;p=picoclvr.git

diff --git a/expr.py b/expr.py
index b453f23..723022c 100755
--- a/expr.py
+++ b/expr.py
@@ -48,17 +48,20 @@ def generate_program(nb_variables, length):
     variables = set()
     while len(s) < length:
         v = random_var(nb_variables=nb_variables)
-        s += v + "=" + random_expr(variables, budget=min(20, length - 3 - len(s))) + ";"
+        s += v + "=" + random_expr(variables, budget=20) + ";"
         variables.add(v)
     return s, variables
 
 
-def generate_sequences(nb, nb_variables=5, length=20):
+def generate_sequences(nb, nb_variables=5, length=20, randomize_length=False):
     sequences = []
     for n in range(nb):
         result = None
         while result == None or max(result.values()) > 100:
-            p, v = generate_program(nb_variables, length)
+            l = length
+            if l > 5 and randomize_length:
+                l = 5 + torch.randint(l - 5, (1,)).item()
+            p, v = generate_program(nb_variables, l)
             v = ", ".join(['"' + v + '": ' + v for v in v])
             ldict = {}
             exec(p + "result={" + v + "}", globals(), ldict)
@@ -75,7 +78,7 @@ if __name__ == "__main__":
     import time
 
     start_time = time.perf_counter()
-    sequences = generate_sequences(1000)
+    sequences = generate_sequences(1000, randomize_length=True)
     end_time = time.perf_counter()
     for s in sequences[:10]:
         print(s)