projects
/
picoclvr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update.
[picoclvr.git]
/
grid.py
diff --git
a/grid.py
b/grid.py
index
f72c8e3
..
5b28914
100755
(executable)
--- a/
grid.py
+++ b/
grid.py
@@
-19,7
+19,7
@@
name_colors = ["red", "yellow", "blue", "green", "white", "purple"]
class GridFactory:
def __init__(
self,
class GridFactory:
def __init__(
self,
- size=
4
,
+ size=
6
,
max_nb_items=4,
max_nb_transformations=3,
nb_questions=4,
max_nb_items=4,
max_nb_transformations=3,
nb_questions=4,
@@
-143,14
+143,14
@@
class GridFactory:
def generate_scene_and_questions(self):
while True:
while True:
def generate_scene_and_questions(self):
while True:
while True:
- scene = self.generate_scene()
- true = self.all_properties(scene)
+ s
tart_s
cene = self.generate_scene()
+ true = self.all_properties(s
tart_s
cene)
if len(true) >= self.nb_questions:
break
if len(true) >= self.nb_questions:
break
- start = self.grid_positions(scene)
+ start = self.grid_positions(s
tart_s
cene)
- scene, transformations = self.random_transformations(scene)
+ scene, transformations = self.random_transformations(s
tart_s
cene)
# transformations=[]
# transformations=[]
@@
-185,7
+185,7
@@
class GridFactory:
+ questions
)
+ questions
)
- return scene, result
+ return s
tart_scene, s
cene, result
def generate_samples(self, nb, progress_bar=None):
result = []
def generate_samples(self, nb, progress_bar=None):
result = []
@@
-195,7
+195,7
@@
class GridFactory:
r = progress_bar(r)
for _ in r:
r = progress_bar(r)
for _ in r:
- result.append(self.generate_scene_and_questions()[
1
])
+ result.append(self.generate_scene_and_questions()[
2
])
return result
return result
@@
-207,13
+207,17
@@
if __name__ == "__main__":
grid_factory = GridFactory()
grid_factory = GridFactory()
- start_time = time.perf_counter()
- samples = grid_factory.generate_samples(10000)
- end_time = time.perf_counter()
- print(f"{len(samples) / (end_time - start_time):.02f} samples per second")
+
#
start_time = time.perf_counter()
+
#
samples = grid_factory.generate_samples(10000)
+
#
end_time = time.perf_counter()
+
#
print(f"{len(samples) / (end_time - start_time):.02f} samples per second")
- scene, questions = grid_factory.generate_scene_and_questions()
+ start_scene, scene, questions = grid_factory.generate_scene_and_questions()
+ print("-- Original scene -----------------------------")
+ grid_factory.print_scene(start_scene)
+ print("-- Transformed scene --------------------------")
grid_factory.print_scene(scene)
grid_factory.print_scene(scene)
+ print("-- Sequence -----------------------------------")
print(questions)
######################################################################
print(questions)
######################################################################