projects
/
mygpt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OCD cosmetics.
[mygpt.git]
/
picoclvr.py
diff --git
a/picoclvr.py
b/picoclvr.py
index
8771e21
..
c455072
100755
(executable)
--- 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,
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 = [ ]
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)
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 ]
if type(descr) == list:
return [ descr2properties(d, height, width) for d in descr ]
@@
-181,18
+181,20
@@
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:
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
d = d[0].strip().split('<sep>')
d = [ x.strip() for x in d ]
d = descr.split('<img>', 1)
if len(d) == 0: return 0
d = d[0].strip().split('<sep>')
d = [ x.strip() for x in d ]
- missing_properties = set(d) - set(descr2properties(descr, height, width))
+ requested_properties = set(d)
+ all_properties = set(descr2properties(descr, height, width))
+ missing_properties = requested_properties - all_properties
- return
len(missing_properties
)
+ return
(len(requested_properties), len(all_properties), len(missing_properties)
)
######################################################################
######################################################################
@@
-200,7
+202,7
@@
if __name__ == '__main__':
descr = generate(nb = 5)
#print(descr2properties(descr))
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:
with open('picoclvr_example.txt', 'w') as f:
for d in descr: