X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=picoclvr.py;h=8201f5d8a19eff414db48bf88d6285a1b5a5fc8d;hb=b6a9cc237cdadac2351814f92c20607d46b0f583;hp=80e5fd0773ba8d9bf1410c004b68d305e80abaab;hpb=f1c65ae12bdeaf76aad04ebf132742ca9a19cf0e;p=mygpt.git

diff --git a/picoclvr.py b/picoclvr.py
index 80e5fd0..8201f5d 100755
--- a/picoclvr.py
+++ b/picoclvr.py
@@ -93,11 +93,11 @@ def all_properties(height, width, nb_squares, square_i, square_j, square_c):
 
 ######################################################################
 
-def generate(nb, height = 6, width = 8,
+def generate(nb, height, width,
              max_nb_squares = 5, max_nb_properties = 10,
-             many_colors = False):
+             nb_colors = 5):
 
-    nb_colors =  len(color_tokens) - 1 if many_colors else max_nb_squares
+    assert nb_colors >= max_nb_squares and nb_colors <= len(color_tokens) - 1
 
     descr = [ ]
 
@@ -129,7 +129,7 @@ def generate(nb, height = 6, width = 8,
 
 ######################################################################
 
-def descr2img(descr, height = 6, width = 8):
+def descr2img(descr, height, width):
 
     if type(descr) == list:
         return torch.cat([ descr2img(d, height, width) for d in descr ], 0)
@@ -152,7 +152,7 @@ def descr2img(descr, height = 6, width = 8):
 
 ######################################################################
 
-def descr2properties(descr, height = 6, width = 8):
+def descr2properties(descr, height, width):
 
     if type(descr) == list:
         return [ descr2properties(d, height, width) for d in descr ]
@@ -163,6 +163,7 @@ def descr2properties(descr, height = 6, width = 8):
 
     seen = {}
     if len(d) != height * width: return []
+
     for k, x in enumerate(d):
         if x != color_names[0]:
             if x in color_tokens:
@@ -171,9 +172,10 @@ def descr2properties(descr, height = 6, width = 8):
                 return []
             seen[x] = (color_id[x], k // width, k % width)
 
-    square_c = torch.tensor( [ x[0] for x in seen.values() ] )
-    square_i = torch.tensor( [ x[1] for x in seen.values() ] )
-    square_j = torch.tensor( [ x[2] for x in seen.values() ] )
+    square_infos = tuple(zip(*seen.values()))
+    square_c = torch.tensor(square_infos[0])
+    square_i = torch.tensor(square_infos[1])
+    square_j = torch.tensor(square_infos[2])
 
     s = all_properties(height, width, len(seen), square_i, square_j, square_c)
 
@@ -181,9 +183,9 @@ def descr2properties(descr, height = 6, width = 8):
 
 ######################################################################
 
-def nb_missing_properties(descr, height = 6, width = 8):
+def nb_properties(descr, height, width):
     if type(descr) == list:
-        return [ nb_missing_properties(d, height, width) for d in descr ]
+        return [ nb_properties(d, height, width) for d in descr ]
 
     d = descr.split('<img>', 1)
     if len(d) == 0: return 0
@@ -202,7 +204,7 @@ if __name__ == '__main__':
     descr = generate(nb = 5)
 
     #print(descr2properties(descr))
-    print(nb_missing_properties(descr))
+    print(nb_properties(descr))
 
     with open('picoclvr_example.txt', 'w') as f:
         for d in descr: