X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=expr.py;h=e073dcae327368c1edcda745f712ce75a5113d8e;hb=046c2b8633a415e533ec14cb72d77845f0c3e85f;hp=d3883d58b55a435c98cd3c12a656d742ef43eb87;hpb=f29d0fa816414f74efed3b9ccdad56fdbd346298;p=picoclvr.git

diff --git a/expr.py b/expr.py
index d3883d5..e073dca 100755
--- a/expr.py
+++ b/expr.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import math
+import math, re
 
 import torch, torchvision
 
@@ -53,12 +53,24 @@ def generate_program(nb_variables, length):
     return s, variables
 
 
-def generate_sequences(nb, nb_variables=5, length=20):
+def extract_results(seq):
+    f = lambda a: (a[0], -1 if a[1] == "" else int(a[1]))
+    results = [
+        dict([f(tuple(x.split(":"))) for x in re.findall("[A-Z]:[0-9]*", s)])
+        for s in seq
+    ]
+    return results
+
+
+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)
@@ -66,7 +78,7 @@ def generate_sequences(nb, nb_variables=5, length=20):
 
         k = list(result.keys())
         k.sort()
-        sequences.append(p + " " + ";".join([v + ":" + str(result[v]) for v in k]))
+        sequences.append(p + " " + "".join([v + ":" + str(result[v]) + ";" for v in k]))
 
     return sequences
 
@@ -80,3 +92,5 @@ if __name__ == "__main__":
     for s in sequences[:10]:
         print(s)
     print(f"{len(sequences) / (end_time - start_time):.02f} samples per second")
+
+    print(extract_results(sequences[:10]))