Update.

[picoclvr.git] / expr.py

diff --git a/expr.py b/expr.py
index baee502..e539fcb 100755 (executable)
--- a/expr.py
+++ b/expr.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import math
+import math, re
 
 import torch, torchvision
 
@@ -24,7 +24,7 @@ def random_expr(variables, budget):
         else:
             return str(torch.randint(10, (1,)).item())
     else:
-        op = torch.randint(4, (1,)).item()
+        op = torch.randint(3, (1,)).item()
         if op == 0:
             e = random_expr(variables, budget - 2)
             if ("+" in e or "-" in e or "*" in e) and (e[0] != "(" or e[-1] != ")"):
@@ -38,8 +38,6 @@ def random_expr(variables, budget):
             if op == 1:
                 return e1 + "+" + e2
             elif op == 2:
-                return e1 + "+" + e2
-            elif op == 3:
                 return e1 + "*" + e2
 
 
@@ -53,14 +51,24 @@ 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):
+    assert nb_variables <= 26
     sequences = []
     for n in range(nb):
         result = None
         while result == None or max(result.values()) > 100:
             l = length
             if l > 5 and randomize_length:
-                l = 5 + torch.randint(l-5, (1,)).item()
+                l = 5 + torch.randint(l - 5, (1,)).item()
             p, v = generate_program(nb_variables, l)
             v = ", ".join(['"' + v + '": ' + v for v in v])
             ldict = {}
@@ -69,7 +77,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 +86,10 @@ if __name__ == "__main__":
     import time
 
     start_time = time.perf_counter()
-    sequences = generate_sequences(1000, randomize_length=True)
+    sequences = generate_sequences(1000, length=30)
     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]))