Skip to content

first draft of race2 #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anvo2 wants to merge 11 commits into
base: main
Choose a base branch
from
Open

first draft of race2 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
36178bf
first draft of race2
Dec 11, 2024
a411542
neg bound addressed
Dec 14, 2024
a0513e2
blacked
Jan 3, 2025
b855dbb
fixed default thetas
Jan 3, 2025
7dc6ed4
wip
AlexanderFengler Jan 7, 2025
62bc700
merging
AlexanderFengler Jan 7, 2025
c011f87
fix test failure
AlexanderFengler Jan 7, 2025
d4e054f
debug seq2
Apr 19, 2025
a825b2b
debug race 2
Jun 11, 2025
3dc4bc2
blacked
Jun 11, 2025
45633ef
fixed dimensions race2seq2
Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion docs/basic_tutorial/basic_tutorial.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,9 @@
"from ssms.basic_simulators.simulator import simulator\n",
"\n",
"sim_out = simulator(\n",
" model=\"ddm\", theta={\"v\": 0, \"a\": 1, \"z\": 0.5, \"t\": 0.5}, n_samples=1000,\n",
" model=\"ddm\",\n",
" theta={\"v\": 0, \"a\": 1, \"z\": 0.5, \"t\": 0.5},\n",
" n_samples=1000,\n",
")"
]
},
Expand Down
8 changes: 6 additions & 2 deletions notebooks/basic_tutorial copy.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,10 +361,14 @@
],
"source": [
"from ssms.basic_simulators.simulator import simulator\n",
"\n",
"out_list = []\n",
"for i in range(100):\n",
" sim_out = simulator(\n",
" model=\"ddm\", theta={\"v\": 0, \"a\": 1, \"z\": 0.5, \"t\": 0.5}, n_samples=1, random_state = 100,\n",
" model=\"ddm\",\n",
" theta={\"v\": 0, \"a\": 1, \"z\": 0.5, \"t\": 0.5},\n",
" n_samples=1,\n",
" random_state=100,\n",
" )\n",
" out_list.append(sim_out)"
]
Expand Down Expand Up @@ -485,7 +489,7 @@
}
],
"source": [
"[out_list[i]['rts'][0][0] for i in range(100)]"
"[out_list[i][\"rts\"][0][0] for i in range(100)]"
]
},
{
Expand Down
20 changes: 12 additions & 8 deletions notebooks/basic_tutorial.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1163,7 +1163,7 @@
}
],
"source": [
"type(model_config['param_bounds'])"
"type(model_config[\"param_bounds\"])"
]
},
{
Expand Down Expand Up @@ -1427,7 +1427,9 @@
}
],
"source": [
"training_data['thetas'][:, model_config[\"params\"].index(\"st\")] < training_data['thetas'][:, model_config[\"params\"].index(\"t\")]"
"training_data[\"thetas\"][:, model_config[\"params\"].index(\"st\")] < training_data[\n",
" \"thetas\"\n",
"][:, model_config[\"params\"].index(\"t\")]"
]
},
{
Expand Down Expand Up @@ -1464,11 +1466,13 @@
"metadata": {},
"outputs": [],
"source": [
"my_dict = {'v': np.array([-1.022687], dtype=np.float32), \n",
"\t\t 't': np.array([1.2465975], dtype=np.float32), \n",
"\t\t 'a': np.array([1.472519], dtype=np.float32), \n",
"\t\t 'z': np.array([0.2667516], dtype=np.float32),\n",
"\t\t'deadline': np.array([2.0713003], dtype=np.float32)}"
"my_dict = {\n",
" \"v\": np.array([-1.022687], dtype=np.float32),\n",
" \"t\": np.array([1.2465975], dtype=np.float32),\n",
" \"a\": np.array([1.472519], dtype=np.float32),\n",
" \"z\": np.array([0.2667516], dtype=np.float32),\n",
" \"deadline\": np.array([2.0713003], dtype=np.float32),\n",
"}"
]
},
{
Expand All @@ -1489,7 +1493,7 @@
],
"source": [
"names = [key_ for key_ in my_dict.keys()]\n",
"np.tile(np.stack([my_dict[key_] for key_ in names], axis = 1), (200, 1)).shape"
"np.tile(np.stack([my_dict[key_] for key_ in names], axis=1), (200, 1)).shape"
]
},
{
Expand Down
7 changes: 5 additions & 2 deletions notebooks/basic_tutorial_12122024.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,11 @@
],
"source": [
"from matplotlib import pyplot as plt\n",
"plt.hist(sim_out[\"rts\"] * sim_out['choices'], histtype = 'step', bins = 40, label='sim_out')\n",
"plt.hist(sim_out2[\"rts\"] * sim_out2['choices'], histtype = 'step', bins = 40, label='sim_out2')\n",
"\n",
"plt.hist(sim_out[\"rts\"] * sim_out[\"choices\"], histtype=\"step\", bins=40, label=\"sim_out\")\n",
"plt.hist(\n",
" sim_out2[\"rts\"] * sim_out2[\"choices\"], histtype=\"step\", bins=40, label=\"sim_out2\"\n",
")\n",
"plt.legend()"
]
},
Expand Down
8 changes: 4 additions & 4 deletions notebooks/basic_tutorial_old.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,10 @@
],
"source": [
"def myfun(a, b, c):\n",
"\tprint(a, b, c)\n",
" print(a, b, c)\n",
"\n",
"myfun(**{'c': 1, 'b': 2, 'a': 3})"
"\n",
"myfun(**{\"c\": 1, \"b\": 2, \"a\": 3})"
]
},
{
Expand Down Expand Up @@ -270,8 +271,7 @@
"from ssms.basic_simulators.simulator import simulator\n",
"\n",
"sim_out = simulator(\n",
"\tmodel=\"lba2\", theta={'A': 0.3, 'b': 0.5, 'v0': 0.5, 'v1': 0.5},\n",
"\t\t\t\t\t\t n_samples=10\n",
" model=\"lba2\", theta={\"A\": 0.3, \"b\": 0.5, \"v0\": 0.5, \"v1\": 0.5}, n_samples=10\n",
")"
]
},
Expand Down
Loading
Loading