Update.

[mygpt.git] / picoclvr.py

diff --git a/picoclvr.py b/picoclvr.py
index f4d7a65..6dd8114 100755 (executable)
--- a/picoclvr.py
+++ b/picoclvr.py
@@ -71,7 +71,28 @@ color_tokens = dict( [ (n, c) for n, c in zip(color_names, colors) ] )
 
 ######################################################################
 
-def generate(nb, height = 6, width = 8, max_nb_squares = 5, max_nb_statements = 10, many_colors = False):
+def all_properties(height, width, nb_squares, square_i, square_j, square_c):
+    s = [ ]
+
+    for r, c in [ (k, color_names[square_c[k]]) for k in range(nb_squares) ]:
+        s += [ f'there is {c}' ]
+
+        if square_i[r] >= height - height//3: s += [ f'{c} bottom' ]
+        if square_i[r] < height//3: s += [ f'{c} top' ]
+        if square_j[r] >= width - width//3: s += [ f'{c} right' ]
+        if square_j[r] < width//3: s += [ f'{c} left' ]
+
+        for t, d in [ (k, color_names[square_c[k]]) for k in range(nb_squares) ]:
+            if square_i[r] > square_i[t]: s += [ f'{c} below {d}' ]
+            if square_i[r] < square_i[t]: s += [ f'{c} above {d}' ]
+            if square_j[r] > square_j[t]: s += [ f'{c} right of {d}' ]
+            if square_j[r] < square_j[t]: s += [ f'{c} left of {d}' ]
+
+    return s
+
+def generate(nb, height = 6, width = 8,
+             max_nb_squares = 5, max_nb_statements = 10,
+             many_colors = False):
 
     nb_colors =  len(color_tokens) - 1 if many_colors else max_nb_squares
 
@@ -81,6 +102,7 @@ def generate(nb, height = 6, width = 8, max_nb_squares = 5, max_nb_statements =
 
         nb_squares = torch.randint(max_nb_squares, (1,)) + 1
         square_position = torch.randperm(height * width)[:nb_squares]
+        # color 0 is white and reserved for the background
         square_c = torch.randperm(nb_colors)[:nb_squares] + 1
         square_i = square_position.div(width, rounding_mode = 'floor')
         square_j = square_position % width
@@ -90,21 +112,7 @@ def generate(nb, height = 6, width = 8, max_nb_squares = 5, max_nb_statements =
 
         # generates all the true relations
 
-        s = [ ]
-
-        for r, c in [ (k, color_names[square_c[k]]) for k in range(nb_squares) ]:
-            s += [ f'there is {c}' ]
-
-            if square_i[r] >= height - height//3: s += [ f'{c} bottom' ]
-            if square_i[r] < height//3: s += [ f'{c} top' ]
-            if square_j[r] >= width - width//3: s += [ f'{c} right' ]
-            if square_j[r] < width//3: s += [ f'{c} left' ]
-
-            for t, d in [ (k, color_names[square_c[k]]) for k in range(nb_squares) ]:
-                if square_i[r] > square_i[t]: s += [ f'{c} below {d}' ]
-                if square_i[r] < square_i[t]: s += [ f'{c} above {d}' ]
-                if square_j[r] > square_j[t]: s += [ f'{c} right of {d}' ]
-                if square_j[r] < square_j[t]: s += [ f'{c} left of {d}' ]
+        s = all_properties(height, width, nb_squares, square_i, square_j, square_c)
 
         # pick at most max_nb_statements at random