Skip to content

fixes autowater in warmup curriculum #126

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

Merged
micahwoodard merged 4 commits into from
Jul 9, 2026
Merged

fixes autowater in warmup curriculum #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b93349
fixes autowater in warmup curriculum
micahwoodard Jul 1, 2026
3d87449
adds stage_name to task_logic
micahwoodard Jul 1, 2026
3558053
Merge branch 'refactor-auto-response' into fix-warmup
micahwoodard Jul 6, 2026
b7345f9
adds minimum reward check
micahwoodard Jul 6, 2026
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
12 changes: 6 additions & 6 deletions schema/aind_behavior_dynamic_foraging.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1266,12 +1266,6 @@
"title": "Extend Block On No Response",
"type": "boolean"
},
"min_block_reward": {
"default": 1,
"minimum": 0,
"title": "Minimal rewards in a block to switch",
"type": "integer"
},
"kernel_size": {
"default": 2,
"description": "Kernel to evaluate choice fraction.",
Expand Down Expand Up @@ -1453,6 +1447,12 @@
"evaluation_window": 20
},
"description": "Conditions to end trial generation."
},
"min_block_reward": {
"default": 1,
"minimum": 0,
"title": "Minimal rewards in a block to switch",
"type": "integer"
}
},
"title": "CoupledWarmupTrialGeneratorSpec",
Expand Down
57 changes: 22 additions & 35 deletions schema/coupled_baiting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
"scaling_parameters": null
},
"autowater_parameters": {
"min_ignored_trials": 3,
"min_unrewarded_trials": 3,
"min_ignored_trials": 0,
"min_unrewarded_trials": 0,
"reward_fraction": 0.8
},
"bias_intervention_parameters": {
Expand Down Expand Up @@ -84,7 +84,8 @@
"max_choice_bias": 0.1,
"min_response_rate": 0.8,
"evaluation_window": 20
}
},
"min_block_reward": 1
},
{
"type": "CoupledTrialGenerator",
Expand Down Expand Up @@ -128,7 +129,7 @@
"autowater_parameters": {
"min_ignored_trials": 3,
"min_unrewarded_trials": 3,
"reward_fraction": 0.8
"reward_fraction": 0.5
},
"bias_intervention_parameters": {
"threshold": {
Expand Down Expand Up @@ -163,14 +164,13 @@
"min_consecutive_stable_trials": 5
},
"extend_block_on_no_response": true,
"min_block_reward": 0,
"kernel_size": 2
}
]
}
},
"version": "0.0.2",
"stage_name": null
"stage_name": "stage_1_warmup"
},
"graph": {
"nodes": {},
Expand Down Expand Up @@ -231,9 +231,9 @@
"scaling_parameters": null
},
"autowater_parameters": {
"min_ignored_trials": 3,
"min_unrewarded_trials": 3,
"reward_fraction": 0.8
"min_ignored_trials": 5,
"min_unrewarded_trials": 5,
"reward_fraction": 0.5
},
"bias_intervention_parameters": {
"threshold": {
Expand Down Expand Up @@ -268,12 +268,11 @@
"min_consecutive_stable_trials": 5
},
"extend_block_on_no_response": true,
"min_block_reward": 0,
"kernel_size": 2
}
},
"version": "0.0.2",
"stage_name": null
"stage_name": "stage_1"
},
"graph": {
"nodes": {},
Expand Down Expand Up @@ -334,9 +333,9 @@
"scaling_parameters": null
},
"autowater_parameters": {
"min_ignored_trials": 3,
"min_unrewarded_trials": 3,
"reward_fraction": 0.8
"min_ignored_trials": 7,
"min_unrewarded_trials": 7,
"reward_fraction": 0.5
},
"bias_intervention_parameters": {
"threshold": {
Expand Down Expand Up @@ -371,12 +370,11 @@
"min_consecutive_stable_trials": 5
},
"extend_block_on_no_response": true,
"min_block_reward": 0,
"kernel_size": 2
}
},
"version": "0.0.2",
"stage_name": null
"stage_name": "stage_2"
},
"graph": {
"nodes": {},
Expand Down Expand Up @@ -437,9 +435,9 @@
"scaling_parameters": null
},
"autowater_parameters": {
"min_ignored_trials": 3,
"min_unrewarded_trials": 3,
"reward_fraction": 0.8
"min_ignored_trials": 10,
"min_unrewarded_trials": 10,
"reward_fraction": 0.5
},
"bias_intervention_parameters": {
"threshold": {
Expand Down Expand Up @@ -474,12 +472,11 @@
"min_consecutive_stable_trials": 5
},
"extend_block_on_no_response": true,
"min_block_reward": 0,
"kernel_size": 2
}
},
"version": "0.0.2",
"stage_name": null
"stage_name": "stage_3"
},
"graph": {
"nodes": {},
Expand Down Expand Up @@ -539,11 +536,7 @@
},
"scaling_parameters": null
},
"autowater_parameters": {
"min_ignored_trials": 3,
"min_unrewarded_trials": 3,
"reward_fraction": 0.8
},
"autowater_parameters": null,
"bias_intervention_parameters": {
"threshold": {
"upper": 0.7,
Expand Down Expand Up @@ -585,12 +578,11 @@
},
"behavior_stability_parameters": null,
"extend_block_on_no_response": true,
"min_block_reward": 0,
"kernel_size": 2
}
},
"version": "0.0.2",
"stage_name": null
"stage_name": "final"
},
"graph": {
"nodes": {},
Expand Down Expand Up @@ -650,11 +642,7 @@
},
"scaling_parameters": null
},
"autowater_parameters": {
"min_ignored_trials": 3,
"min_unrewarded_trials": 3,
"reward_fraction": 0.8
},
"autowater_parameters": null,
"bias_intervention_parameters": {
"threshold": {
"upper": 0.7,
Expand Down Expand Up @@ -696,12 +684,11 @@
},
"behavior_stability_parameters": null,
"extend_block_on_no_response": true,
"min_block_reward": 0,
"kernel_size": 2
}
},
"version": "0.0.2",
"stage_name": null
"stage_name": "graduated"
},
"graph": {
"nodes": {},
Expand Down
24 changes: 11 additions & 13 deletions schema/uncoupled.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
"scaling_parameters": null
},
"autowater_parameters": {
"min_ignored_trials": 3,
"min_unrewarded_trials": 3,
"reward_fraction": 0.5
"min_ignored_trials": 0,
"min_unrewarded_trials": 0,
"reward_fraction": 0.8
},
"bias_intervention_parameters": {
"threshold": {
Expand All @@ -84,7 +84,8 @@
"max_choice_bias": 0.1,
"min_response_rate": 0.8,
"evaluation_window": 20
}
},
"min_block_reward": 1
},
{
"type": "CoupledTrialGenerator",
Expand Down Expand Up @@ -163,14 +164,13 @@
"min_consecutive_stable_trials": 5
},
"extend_block_on_no_response": true,
"min_block_reward": 0,
"kernel_size": 2
}
]
}
},
"version": "0.0.2",
"stage_name": null
"stage_name": "stage_1_warmup"
},
"graph": {
"nodes": {},
Expand Down Expand Up @@ -268,12 +268,11 @@
"min_consecutive_stable_trials": 5
},
"extend_block_on_no_response": true,
"min_block_reward": 0,
"kernel_size": 2
}
},
"version": "0.0.2",
"stage_name": null
"stage_name": "stage_1"
},
"graph": {
"nodes": {},
Expand Down Expand Up @@ -371,12 +370,11 @@
"min_consecutive_stable_trials": 5
},
"extend_block_on_no_response": true,
"min_block_reward": 0,
"kernel_size": 2
}
},
"version": "0.0.2",
"stage_name": null
"stage_name": "stage_2"
},
"graph": {
"nodes": {},
Expand Down Expand Up @@ -465,7 +463,7 @@
}
},
"version": "0.0.2",
"stage_name": null
"stage_name": "stage_3"
},
"graph": {
"nodes": {},
Expand Down Expand Up @@ -550,7 +548,7 @@
}
},
"version": "0.0.2",
"stage_name": null
"stage_name": "final"
},
"graph": {
"nodes": {},
Expand Down Expand Up @@ -635,7 +633,7 @@
}
},
"version": "0.0.2",
"stage_name": null
"stage_name": "graduated"
},
"graph": {
"nodes": {},
Expand Down
Loading