Update.

[mygpt.git] / picoclvr.py

diff --git a/picoclvr.py b/picoclvr.py
index a194a1c..2342016 100755 (executable)
--- a/picoclvr.py
+++ b/picoclvr.py
@@ -1,5 +1,10 @@
 #!/usr/bin/env python
 
+# Any copyright is dedicated to the Public Domain.
+# https://creativecommons.org/publicdomain/zero/1.0/
+
+# Written by Francois Fleuret <francois@fleuret.org>
+
 import torch, torchvision
 
 colors = [
@@ -22,31 +27,33 @@ color_names = [
 
 color_tokens = dict( [ (n, c) for n, c in zip(color_names, colors) ] )
 
+######################################################################
+
 def generate(nb, height = 6, width = 8, max_nb_statements = 10):
 
     descr = [ ]
 
     for n in range(nb):
-        nb = torch.randint(5, (1,)) + 1
-        shape_position = torch.randperm(height * width)[:nb]
-        shape_c = torch.randperm(5)[:nb] + 1
+        nb_shapes = torch.randint(len(color_tokens) - 1, (1,)) + 1
+        shape_position = torch.randperm(height * width)[:nb_shapes]
+        shape_c = torch.randperm(len(color_tokens) - 1)[:nb_shapes] + 1
         shape_i = shape_position.div(width, rounding_mode = 'floor')
         shape_j = shape_position % width
 
         img = [ 0 ] * height * width
-        for k in range(nb): img[shape_position[k]] = shape_c[k]
+        for k in range(nb_shapes): img[shape_position[k]] = shape_c[k]
 
         s = [ ]
 
-        for r, c in [ (k, color_names[shape_c[k]]) for k in range(nb) ]:
+        for r, c in [ (k, color_names[shape_c[k]]) for k in range(nb_shapes) ]:
             s += [ f'there is {c}' ]
 
-            if shape_i[r] >= height - height/4: s += [ f'{c} bottom' ]
-            if shape_i[r] < height/4: s += [ f'{c} top' ]
-            if shape_j[r] >= width - width/4: s += [ f'{c} right' ]
-            if shape_j[r] < width/4: s += [ f'{c} left' ]
+            if shape_i[r] >= height - height//3: s += [ f'{c} bottom' ]
+            if shape_i[r] < height//3: s += [ f'{c} top' ]
+            if shape_j[r] >= width - width//3: s += [ f'{c} right' ]
+            if shape_j[r] < width//3: s += [ f'{c} left' ]
 
-            for t, d in [ (k, color_names[shape_c[k]]) for k in range(nb) ]:
+            for t, d in [ (k, color_names[shape_c[k]]) for k in range(nb_shapes) ]:
                 if shape_i[r] > shape_i[t]: s += [ f'{c} below {d}' ]
                 if shape_i[r] < shape_i[t]: s += [ f'{c} above {d}' ]
                 if shape_j[r] > shape_j[t]: s += [ f'{c} right of {d}' ]