Mondrians as toplevel stimulus

and collapsed `illusions/mondrians` with `components/mondrians`
computational-psychology · Mar 20, 2023 · c499a41 · c499a41
1 parent e6f0197
commit c499a41
Show file tree

Hide file tree

Showing 7 changed files with 356 additions and 396 deletions.
diff --git a/stimupy/__init__.py b/stimupy/__init__.py
@@ -1,3 +1,3 @@
 __version__ = "0.99.0"
 
-from . import components, gabors, illusions, noises, utils
+from . import components, gabors, illusions, mondrians, noises, utils
diff --git a/stimupy/components/__init__.py b/stimupy/components/__init__.py
@@ -21,7 +21,6 @@
     "gaussians",
     "gratings",
     "lines",
-    "mondrians",
     "shapes",
 ]
 
@@ -653,18 +652,7 @@ def draw_sine_wave(
     return stim
 
 
-from . import (
-    angulars,
-    checkerboards,
-    circulars,
-    edges,
-    frames,
-    gaussians,
-    gratings,
-    lines,
-    mondrians,
-    shapes,
-)
+from . import angulars, checkerboards, circulars, edges, frames, gaussians, gratings, lines, shapes
 
 
 def create_overview():
@@ -682,12 +670,6 @@ def create_overview():
         "ppd": 20,
     }
 
-    p_mondrians = {
-        "mondrian_positions": ((0, 0), (0, 5), (1, 3), (4, 6), (6, 1)),
-        "mondrian_sizes": 3,
-        "mondrian_intensities": np.random.rand(5),
-    }
-
     # fmt: off
     stims = {
         # angulars
@@ -729,8 +711,6 @@ def create_overview():
         "line": lines.line(**p, line_length=3),
         "dipole": lines.dipole(**p, line_length=3, line_gap=0.5),
         "line_circle": lines.circle(**p, radius=3),
-        # mondrians
-        "mondrians": mondrians.mondrians(**p, **p_mondrians),
         # shapes
         "rectangle": shapes.rectangle(**p, rectangle_size=3),
         "triangle": shapes.triangle(**p, triangle_size=3),

diff --git a/stimupy/components/mondrians.py b/stimupy/components/mondrians.py
diff --git a/stimupy/illusions/__init__.py b/stimupy/illusions/__init__.py
@@ -10,7 +10,6 @@
     frames,
     gratings,
     hermanns,
-    mondrians,
     mueller_lyers,
     ponzos,
     sbcs,
@@ -35,17 +34,6 @@ def create_overview():
         "ppd": 20,
     }
 
-    p_mondrians = {
-        "mondrian_depths": (0.0, 1.0, 0.0, -1.0),
-        "target_indices": ((1, 1), (3, 1)),
-        "mondrian_intensities": (
-            (0.4, 0.75, 0.4, 0.75),
-            (0.75, 0.4, 0.75, 1.0),
-            (0.4, 0.75, 0.4, 0.75),
-            (0.0, 0.4, 0.0, 0.4),
-        ),
-    }
-
     p_small_grating = {
         "ppd": 20,
         "frequency": 1,
@@ -105,8 +93,6 @@ def create_overview():
         "grating_induction_blur": gratings.induction_blur(**p, frequency=0.5, target_width=0.5, sigma=0.1),
         # Hermann´
         "hermann": hermanns.grid(**p, element_size=(1.5, 1.5, 0.2)),
-        # Mondrians
-        "mondrians": mondrians.corrugated_mondrians(**p, **p_mondrians),
         # Mueller-Lyer
         "mueller-lyer": mueller_lyers.mueller_lyer(**p, outer_lines_length=1.5, outer_lines_angle=45, target_length=6, line_width=0.1),
         "2sided_mueller-lyer": mueller_lyers.two_sided(**p, outer_lines_length=1.5, outer_lines_angle=45, target_length=2.5, line_width=0.1),