X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=expr.py;h=818360b16f4ac008b15dd9db049981f7f9f7c677;hb=07ce0d849569e234f2d7714d7438dfab29542610;hp=ca33daf9a6473468030e45c08d33bfe644aff451;hpb=02c4828834319a5b7818bafb8821fce66b3a1bb1;p=picoclvr.git

diff --git a/expr.py b/expr.py
index ca33daf..818360b 100755
--- a/expr.py
+++ b/expr.py
@@ -63,6 +63,7 @@ def extract_results(seq):
 
 
 def generate_sequences(nb, nb_variables=5, length=20, randomize_length=False):
+    assert nb_variables <= 26
     sequences = []
     for n in range(nb):
         result = None
@@ -78,7 +79,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
 
@@ -87,7 +88,7 @@ if __name__ == "__main__":
     import time
 
     start_time = time.perf_counter()
-    sequences = generate_sequences(1000)
+    sequences = generate_sequences(1000, length=30)
     end_time = time.perf_counter()
     for s in sequences[:10]:
         print(s)