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

diff --git a/expr.py b/expr.py
index 723022c..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,6 +53,15 @@ def generate_program(nb_variables, length):
     return s, variables
 
 
+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):
@@ -69,7 +78,7 @@ def generate_sequences(nb, nb_variables=5, length=20, randomize_length=False):
 
         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
 
@@ -78,8 +87,10 @@ if __name__ == "__main__":
     import time
 
     start_time = time.perf_counter()
-    sequences = generate_sequences(1000, randomize_length=True)
+    sequences = generate_sequences(1000)
     end_time = time.perf_counter()
     for s in sequences[:10]:
         print(s)
     print(f"{len(sequences) / (end_time - start_time):.02f} samples per second")
+
+    print(extract_results(sequences[:10]))