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

diff --git a/picoclvr.py b/picoclvr.py
index 80e5fd0..2d57505 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 ]
@@ -181,7 +181,7 @@ def descr2properties(descr, height = 6, width = 8):
 
 ######################################################################
 
-def nb_missing_properties(descr, height = 6, width = 8):
+def nb_missing_properties(descr, height, width):
     if type(descr) == list:
         return [ nb_missing_properties(d, height, width) for d in descr ]