X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=grid.py;h=5b289146395d12dbf2dc7eb668835eeab154eadb;hb=5332c56acd44d7049f3fbb33a8643482e0c71f4d;hp=70f77396f33af428c9ee8f7c1f140a895c474de9;hpb=6f61f9438799d65c980726e28546f8775bf83a60;p=picoclvr.git diff --git a/grid.py b/grid.py index 70f7739..5b28914 100755 --- a/grid.py +++ b/grid.py @@ -19,56 +19,78 @@ name_colors = ["red", "yellow", "blue", "green", "white", "purple"] class GridFactory: def __init__( self, - height=4, - width=4, + size=6, max_nb_items=4, - max_nb_transformations=4, + max_nb_transformations=3, nb_questions=4, ): - self.height = height - self.width = width + self.size = size self.max_nb_items = max_nb_items + self.max_nb_transformations = max_nb_transformations self.nb_questions = nb_questions def generate_scene(self): nb_items = torch.randint(self.max_nb_items - 1, (1,)).item() + 2 - col = torch.full((self.height * self.width,), -1) - shp = torch.full((self.height * self.width,), -1) + col = torch.full((self.size * self.size,), -1) + shp = torch.full((self.size * self.size,), -1) a = torch.randperm(len(name_colors) * len(name_shapes))[:nb_items] col[:nb_items] = a % len(name_colors) shp[:nb_items] = a // len(name_colors) - i = torch.randperm(self.height * self.width) + i = torch.randperm(self.size * self.size) col = col[i] shp = shp[i] - return col.reshape(self.height, self.width), shp.reshape( - self.height, self.width - ) + return col.reshape(self.size, self.size), shp.reshape(self.size, self.size) + + def random_transformations(self, scene): + col, shp = scene - def random_transformations(self): + descriptions = [] nb_transformations = torch.randint(self.max_nb_transformations + 1, (1,)).item() + transformations = torch.randint(5, (nb_transformations,)) + + for t in transformations: + if t == 0: + col, shp = col.flip(0), shp.flip(0) + descriptions += [" vertical flip"] + elif t == 1: + col, shp = col.flip(1), shp.flip(1) + descriptions += [" horizontal flip"] + elif t == 2: + col, shp = col.flip(0).t(), shp.flip(0).t() + descriptions += [" rotate 90 degrees"] + elif t == 3: + col, shp = col.flip(0).flip(1), shp.flip(0).flip(1) + descriptions += [" rotate 180 degrees"] + elif t == 4: + col, shp = col.flip(1).t(), shp.flip(1).t() + descriptions += [" rotate 270 degrees"] + + col, shp = col.contiguous(), shp.contiguous() + + return (col, shp), descriptions def print_scene(self, scene): col, shp = scene - # for i in range(self.height): - # for j in range(self.width): + # for i in range(self.size): + # for j in range(self.size): # if col[i,j] >= 0: # print(f"at ({i},{j}) {name_colors[col[i,j]]} {name_shapes[shp[i,j]]}") - for i in range(self.height): - for j in range(self.width): + for i in range(self.size): + for j in range(self.size): if col[i, j] >= 0: print(f"{name_colors[col[i,j]][0]}{name_shapes[shp[i,j]]}", end="") elif j == 0: print(" +", end="") else: print("-+", end="") - if j < self.width - 1: + if j < self.size - 1: print("--", end="") else: print("") - if i < self.height - 1: - for j in range(self.width - 1): + if i < self.size - 1: + for j in range(self.size - 1): print(" | ", end="") print(" |") @@ -77,8 +99,8 @@ class GridFactory: properties = [] - for i in range(self.height): - for j in range(self.width): + for i in range(self.size): + for j in range(self.size): if col[i, j] >= 0: n = f"{name_colors[col[i,j]]} {name_shapes[shp[i,j]]}" properties += [f"a {n} at {i} {j}"] @@ -90,21 +112,21 @@ class GridFactory: properties = [] - for i1 in range(self.height): - for j1 in range(self.width): + for i1 in range(self.size): + for j1 in range(self.size): if col[i1, j1] >= 0: n1 = f"{name_colors[col[i1,j1]]} {name_shapes[shp[i1,j1]]}" properties += [f"there is a {n1}"] - if i1 < self.height // 2: + if i1 < self.size // 2: properties += [f"a {n1} is in the top half"] - if i1 >= self.height // 2: + if i1 >= self.size // 2: properties += [f"a {n1} is in the bottom half"] - if j1 < self.width // 2: + if j1 < self.size // 2: properties += [f"a {n1} is in the left half"] - if j1 >= self.width // 2: + if j1 >= self.size // 2: properties += [f"a {n1} is in the right half"] - for i2 in range(self.height): - for j2 in range(self.width): + for i2 in range(self.size): + for j2 in range(self.size): if col[i2, j2] >= 0: n2 = f"{name_colors[col[i2,j2]]} {name_shapes[shp[i2,j2]]}" if i1 > i2: @@ -121,12 +143,16 @@ class GridFactory: def generate_scene_and_questions(self): while True: while True: - scene = self.generate_scene() - true = self.all_properties(scene) + start_scene = self.generate_scene() + true = self.all_properties(start_scene) if len(true) >= self.nb_questions: break - start = self.grid_positions(scene) + start = self.grid_positions(start_scene) + + scene, transformations = self.random_transformations(start_scene) + + # transformations=[] for a in range(10): col, shp = scene @@ -134,16 +160,14 @@ class GridFactory: p = torch.randperm(col.size(0)) col, shp = col[p], shp[p] other_scene = ( - col.view(self.height, self.width), - shp.view(self.height, self.width), + col.view(self.size, self.size), + shp.view(self.size, self.size), ) # other_scene = self.generate_scene() false = list(set(self.all_properties(other_scene)) - set(true)) if len(false) >= self.nb_questions: break - # print(f"{a=}") - if a < 10: break @@ -156,10 +180,12 @@ class GridFactory: questions = [union[k] for k in torch.randperm(len(union))[: self.nb_questions]] result = " ".join( - [" " + x for x in self.grid_positions(scene)] + questions + [" " + x for x in self.grid_positions(scene)] + + transformations + + questions ) - return scene, result + return start_scene, scene, result def generate_samples(self, nb, progress_bar=None): result = [] @@ -169,7 +195,7 @@ class GridFactory: 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 @@ -181,13 +207,17 @@ if __name__ == "__main__": 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) + print("-- Sequence -----------------------------------") print(questions) ######################################################################