add shrink spot simple with restricted range on r parameters (#62)

* add shrink spot simple with restricted range on r parameters * bump version * add model to theta processor
lnccbrown · Dec 18, 2024 · 090fc5d · 090fc5d
1 parent cb32533
commit 090fc5d
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -7,7 +7,7 @@ requires = ["setuptools", "wheel", "Cython>=0.29.23", "numpy >= 1.20"]
 
 [project]
 name= "ssm-simulators"
-version= "0.8.1"
+version= "0.8.2"
 authors= [{name = "Alexander Fenger", email = "[email protected]"}]
 description= "SSMS is a package collecting simulators and training data generators for a bunch of generative models of interest in the cognitive science / neuroscience and approximate bayesian computation communities"
 readme = "README.md"

diff --git a/ssms/__init__.py b/ssms/__init__.py
@@ -4,6 +4,6 @@
 from . import config
 from . import support_utils
 
-__version__ = "0.8.1"  # importlib.metadata.version(__package__ or __name__)
+__version__ = "0.8.2"  # importlib.metadata.version(__package__ or __name__)
 
 __all__ = ["basic_simulators", "dataset_generators", "config", "support_utils"]
diff --git a/ssms/basic_simulators/theta_processor.py b/ssms/basic_simulators/theta_processor.py
@@ -122,6 +122,7 @@ def process_theta(
 
         if model in [
             "shrink_spot",
+            "shrink_spot_simple",
             "shrink_spot_extended",
             "shrink_spot_extended_angle",
             "shrink_spot_simple_extended",

diff --git a/ssms/config/config.py b/ssms/config/config.py
@@ -394,6 +394,31 @@ def boundary_config_to_function_params(boundary_config: dict) -> dict:
         "n_particles": 1,
         "simulator": cssm.ddm_flex,
     },
+    "shrink_spot_simple": {
+        "name": "shrink_spot_simple",
+        "params": [
+            "a",
+            "z",
+            "t",
+            "ptarget",
+            "pouter",
+            "r",
+            "sda",
+        ],
+        "param_bounds": [
+            [0.3, 0.1, 1e-3, 2.0, -5.5, 0.01, 1],
+            [3.0, 0.9, 2.0, 5.5, 5.5, 0.05, 3],
+        ],
+        "boundary_name": "constant",
+        "boundary": bf.constant,
+        "drift_name": "attend_drift_simple",
+        "drift_fun": df.attend_drift_simple,
+        "n_params": 7,
+        "default_params": [0.7, 0.5, 0.25, 2.0, -2.0, 0.01, 1],
+        "nchoices": 2,
+        "n_particles": 1,
+        "simulator": cssm.ddm_flex,
+    },
     "shrink_spot_simple_extended": {
         "name": "shrink_spot_simple_extended",
         "params": [