From 742dad6aa8b09d8c5904e31924539fd678c7fb07 Mon Sep 17 00:00:00 2001 From: han-lab Date: Mon, 19 Feb 2024 21:49:09 -0800 Subject: [PATCH] update example curriculums --- ...on => DynamicForagingCurriculum_v1.0.json} | 123 ++++++------------ ...d Baiting_curriculum_v1.0_schema_v1.0.json | 12 +- ... Baiting_curriculum_v1.0_schema_v1.0_paras | 12 +- ...ting_curriculum_v1.0_schema_v1.0_paras.svg | 12 +- 4 files changed, 57 insertions(+), 102 deletions(-) rename code/aind_auto_train/curriculums/{DynamicForagingCurriculum_v0.3.json => DynamicForagingCurriculum_v1.0.json} (78%) diff --git a/code/aind_auto_train/curriculums/DynamicForagingCurriculum_v0.3.json b/code/aind_auto_train/curriculums/DynamicForagingCurriculum_v1.0.json similarity index 78% rename from code/aind_auto_train/curriculums/DynamicForagingCurriculum_v0.3.json rename to code/aind_auto_train/curriculums/DynamicForagingCurriculum_v1.0.json index 22b76b6..699dbc3 100644 --- a/code/aind_auto_train/curriculums/DynamicForagingCurriculum_v0.3.json +++ b/code/aind_auto_train/curriculums/DynamicForagingCurriculum_v1.0.json @@ -49,6 +49,11 @@ ], "title": "Task name" }, + "task_url": { + "default": "", + "title": "URL to the task description", + "type": "string" + }, "task_schema_version": { "title": "Schema version", "type": "string" @@ -75,6 +80,11 @@ "title": "Uncoupled reward", "type": "string" }, + "Randomness": { + "default": "Exponential", + "title": "Randomness mode", + "type": "string" + }, "BlockMin": { "title": "Block length (min)", "type": "integer" @@ -104,6 +114,10 @@ "title": "Delay period (beta)", "type": "number" }, + "RewardDelay": { + "title": "Reward delay (sec)", + "type": "number" + }, "AutoReward": { "title": "Auto reward switch", "type": "boolean" @@ -183,101 +197,40 @@ "title": "Maximal session time (min)", "type": "integer" }, - "RightValue": { - "default": 0.05, - "exclude_from_GUI": true, - "title": "Right reward size (valve open time in sec)", - "type": "number" - }, - "LeftValue": { - "default": 0.05, - "exclude_from_GUI": true, - "title": "Left reward size (valve open time in sec)", - "type": "number" - }, "RightValue_volume": { - "default": 5.0, - "exclude_from_GUI": true, - "title": "Right reward size (volume)", + "default": 3.0, + "title": "Right reward size (uL)", "type": "number" }, "LeftValue_volume": { - "default": 5.0, - "exclude_from_GUI": true, - "title": "Left reward size (volume)", + "default": 3.0, + "title": "Left reward size (uL)", "type": "number" }, - "NextBlock": { - "default": false, - "exclude_from_GUI": true, - "title": "(User clicks) Next block", - "type": "boolean" - }, - "GiveLeft": { - "default": false, - "exclude_from_GUI": true, - "title": "(User clicks) Give left", - "type": "boolean" - }, - "GiveRight": { - "default": false, - "exclude_from_GUI": true, - "title": "(User clicks) Give right", - "type": "boolean" - }, - "GiveWaterL": { - "default": 0.03, - "exclude_from_GUI": true, - "title": "(User clicks) Size of give water left", - "type": "number" + "warmup": { + "default": "off", + "title": "Warmup master switch", + "type": "string" }, - "GiveWaterR": { - "default": 0.03, - "exclude_from_GUI": true, - "title": "(User clicks) Size of give water right", - "type": "number" + "warm_min_trial": { + "default": 50, + "title": "Warmup finish criteria: minimal trials", + "type": "integer" }, - "GiveWaterL_volume": { - "default": 3.0, - "exclude_from_GUI": true, - "title": "(User clicks) Size of give water left (volume)", + "warm_max_choice_ratio_bias": { + "default": 0.1, + "title": "Warmup finish criteria: maximal choice ratio bias from 0.5", "type": "number" }, - "GiveWaterR_volume": { - "default": 3.0, - "exclude_from_GUI": true, - "title": "(User clicks) Size of give water right (volume)", + "warm_min_finish_ratio": { + "default": 0.8, + "title": "Warmup finish criteria: minimal finish ratio", "type": "number" }, - "IncludeAutoReward": { - "default": false, - "exclude_from_GUI": true, - "title": "(User clicks) Include auto reward", - "type": "boolean" - }, - "SaveTraining": { - "default": true, - "exclude_from_GUI": true, - "title": "(User clicks) Save training", - "type": "boolean" - }, - "InitiallyInactiveN": { - "default": 2, - "exclude_from_GUI": true, - "title": "Initially inactive trials", + "warm_windowsize": { + "default": 20, + "title": "Warmup finish criteria: window size to compute the bias and ratio", "type": "integer" - }, - "Randomness": { - "default": "Exponential", - "exclude_from_GUI": true, - "title": "Randomness mode", - "type": "string" - }, - "qt_spinbox_lineedit": { - "default": 5.0, - "exclude_from_GUI": true, - "title": "qt_spinbox_lineedit??", - "type": "number" } }, "required": [ @@ -293,6 +246,7 @@ "DelayMin", "DelayMax", "DelayBeta", + "RewardDelay", "AutoReward", "Multiplier", "Unrewarded", @@ -347,6 +301,7 @@ }, "TrainingStage": { "enum": [ + "Stage 1 w/warmup", "Stage 1", "Stage 2", "Stage 3", @@ -389,8 +344,8 @@ "description": "Task-specific curriculum for dynamic foraging task\nNote that the two generic types {taskparas_class} and {metrics_class} are specified here", "properties": { "curriculum_schema_version": { - "const": "0.3", - "default": "0.3", + "const": "1.0", + "default": "1.0", "title": "Curriculum schema version" }, "curriculum_name": { diff --git a/code/aind_auto_train/curriculums/Uncoupled Baiting_curriculum_v1.0_schema_v1.0.json b/code/aind_auto_train/curriculums/Uncoupled Baiting_curriculum_v1.0_schema_v1.0.json index 0e22387..5937ab9 100644 --- a/code/aind_auto_train/curriculums/Uncoupled Baiting_curriculum_v1.0_schema_v1.0.json +++ b/code/aind_auto_train/curriculums/Uncoupled Baiting_curriculum_v1.0_schema_v1.0.json @@ -43,7 +43,7 @@ "MaxTime": 90, "RightValue_volume": 5.0, "LeftValue_volume": 5.0, - "warmup": true, + "warmup": "on", "warm_min_trial": 50, "warm_max_choice_ratio_bias": 0.1, "warm_min_finish_ratio": 0.8, @@ -87,7 +87,7 @@ "MaxTime": 90, "RightValue_volume": 3.0, "LeftValue_volume": 3.0, - "warmup": false, + "warmup": "off", "warm_min_trial": 50, "warm_max_choice_ratio_bias": 0.1, "warm_min_finish_ratio": 0.8, @@ -131,7 +131,7 @@ "MaxTime": 90, "RightValue_volume": 3.0, "LeftValue_volume": 3.0, - "warmup": false, + "warmup": "off", "warm_min_trial": 50, "warm_max_choice_ratio_bias": 0.1, "warm_min_finish_ratio": 0.8, @@ -175,7 +175,7 @@ "MaxTime": 90, "RightValue_volume": 3.0, "LeftValue_volume": 3.0, - "warmup": false, + "warmup": "off", "warm_min_trial": 50, "warm_max_choice_ratio_bias": 0.1, "warm_min_finish_ratio": 0.8, @@ -219,7 +219,7 @@ "MaxTime": 90, "RightValue_volume": 3.0, "LeftValue_volume": 3.0, - "warmup": false, + "warmup": "off", "warm_min_trial": 50, "warm_max_choice_ratio_bias": 0.1, "warm_min_finish_ratio": 0.8, @@ -263,7 +263,7 @@ "MaxTime": 90, "RightValue_volume": 3.0, "LeftValue_volume": 3.0, - "warmup": false, + "warmup": "off", "warm_min_trial": 50, "warm_max_choice_ratio_bias": 0.1, "warm_min_finish_ratio": 0.8, diff --git a/code/aind_auto_train/curriculums/Uncoupled Baiting_curriculum_v1.0_schema_v1.0_paras b/code/aind_auto_train/curriculums/Uncoupled Baiting_curriculum_v1.0_schema_v1.0_paras index d1f9b67..ec4111c 100644 --- a/code/aind_auto_train/curriculums/Uncoupled Baiting_curriculum_v1.0_schema_v1.0_paras +++ b/code/aind_auto_train/curriculums/Uncoupled Baiting_curriculum_v1.0_schema_v1.0_paras @@ -34,7 +34,7 @@ digraph G { cell_30_1 [label=90 fillcolor=lightgrey tooltip="MaxTime @ STAGE_1_WARMUP" width=1] cell_31_1 [label=5.0 fillcolor=lightgrey tooltip="RightValue_volume @ STAGE_1_WARMUP" width=1] cell_32_1 [label=5.0 fillcolor=lightgrey tooltip="LeftValue_volume @ STAGE_1_WARMUP" width=1] - cell_33_1 [label=True fillcolor=lightgrey tooltip="warmup @ STAGE_1_WARMUP" width=1] + cell_33_1 [label=on fillcolor=lightgrey tooltip="warmup @ STAGE_1_WARMUP" width=1] cell_34_1 [label=50 fillcolor=lightgrey tooltip="warm_min_trial @ STAGE_1_WARMUP" width=1] cell_35_1 [label=0.1 fillcolor=lightgrey tooltip="warm_max_choice_ratio_bias @ STAGE_1_WARMUP" width=1] cell_36_1 [label=0.8 fillcolor=lightgrey tooltip="warm_min_finish_ratio @ STAGE_1_WARMUP" width=1] @@ -71,7 +71,7 @@ digraph G { cell_30_2 [label=90 fillcolor=lightgrey tooltip="MaxTime @ STAGE_1" width=1] cell_31_2 [label=3.0 fillcolor=darkseagreen tooltip="RightValue_volume @ STAGE_1" width=1] cell_32_2 [label=3.0 fillcolor=darkseagreen tooltip="LeftValue_volume @ STAGE_1" width=1] - cell_33_2 [label=False fillcolor=darkseagreen tooltip="warmup @ STAGE_1" width=1] + cell_33_2 [label=off fillcolor=darkseagreen tooltip="warmup @ STAGE_1" width=1] cell_34_2 [label=50 fillcolor=lightgrey tooltip="warm_min_trial @ STAGE_1" width=1] cell_35_2 [label=0.1 fillcolor=lightgrey tooltip="warm_max_choice_ratio_bias @ STAGE_1" width=1] cell_36_2 [label=0.8 fillcolor=lightgrey tooltip="warm_min_finish_ratio @ STAGE_1" width=1] @@ -108,7 +108,7 @@ digraph G { cell_30_3 [label=90 fillcolor=lightgrey tooltip="MaxTime @ STAGE_2" width=1] cell_31_3 [label=3.0 fillcolor=lightgrey tooltip="RightValue_volume @ STAGE_2" width=1] cell_32_3 [label=3.0 fillcolor=lightgrey tooltip="LeftValue_volume @ STAGE_2" width=1] - cell_33_3 [label=False fillcolor=lightgrey tooltip="warmup @ STAGE_2" width=1] + cell_33_3 [label=off fillcolor=lightgrey tooltip="warmup @ STAGE_2" width=1] cell_34_3 [label=50 fillcolor=lightgrey tooltip="warm_min_trial @ STAGE_2" width=1] cell_35_3 [label=0.1 fillcolor=lightgrey tooltip="warm_max_choice_ratio_bias @ STAGE_2" width=1] cell_36_3 [label=0.8 fillcolor=lightgrey tooltip="warm_min_finish_ratio @ STAGE_2" width=1] @@ -145,7 +145,7 @@ digraph G { cell_30_4 [label=90 fillcolor=lightgrey tooltip="MaxTime @ STAGE_3" width=1] cell_31_4 [label=3.0 fillcolor=lightgrey tooltip="RightValue_volume @ STAGE_3" width=1] cell_32_4 [label=3.0 fillcolor=lightgrey tooltip="LeftValue_volume @ STAGE_3" width=1] - cell_33_4 [label=False fillcolor=lightgrey tooltip="warmup @ STAGE_3" width=1] + cell_33_4 [label=off fillcolor=lightgrey tooltip="warmup @ STAGE_3" width=1] cell_34_4 [label=50 fillcolor=lightgrey tooltip="warm_min_trial @ STAGE_3" width=1] cell_35_4 [label=0.1 fillcolor=lightgrey tooltip="warm_max_choice_ratio_bias @ STAGE_3" width=1] cell_36_4 [label=0.8 fillcolor=lightgrey tooltip="warm_min_finish_ratio @ STAGE_3" width=1] @@ -182,7 +182,7 @@ digraph G { cell_30_5 [label=90 fillcolor=lightgrey tooltip="MaxTime @ STAGE_FINAL" width=1] cell_31_5 [label=3.0 fillcolor=lightgrey tooltip="RightValue_volume @ STAGE_FINAL" width=1] cell_32_5 [label=3.0 fillcolor=lightgrey tooltip="LeftValue_volume @ STAGE_FINAL" width=1] - cell_33_5 [label=False fillcolor=lightgrey tooltip="warmup @ STAGE_FINAL" width=1] + cell_33_5 [label=off fillcolor=lightgrey tooltip="warmup @ STAGE_FINAL" width=1] cell_34_5 [label=50 fillcolor=lightgrey tooltip="warm_min_trial @ STAGE_FINAL" width=1] cell_35_5 [label=0.1 fillcolor=lightgrey tooltip="warm_max_choice_ratio_bias @ STAGE_FINAL" width=1] cell_36_5 [label=0.8 fillcolor=lightgrey tooltip="warm_min_finish_ratio @ STAGE_FINAL" width=1] @@ -219,7 +219,7 @@ digraph G { cell_30_6 [label=90 fillcolor=lightgrey tooltip="MaxTime @ GRADUATED" width=1] cell_31_6 [label=3.0 fillcolor=lightgrey tooltip="RightValue_volume @ GRADUATED" width=1] cell_32_6 [label=3.0 fillcolor=lightgrey tooltip="LeftValue_volume @ GRADUATED" width=1] - cell_33_6 [label=False fillcolor=lightgrey tooltip="warmup @ GRADUATED" width=1] + cell_33_6 [label=off fillcolor=lightgrey tooltip="warmup @ GRADUATED" width=1] cell_34_6 [label=50 fillcolor=lightgrey tooltip="warm_min_trial @ GRADUATED" width=1] cell_35_6 [label=0.1 fillcolor=lightgrey tooltip="warm_max_choice_ratio_bias @ GRADUATED" width=1] cell_36_6 [label=0.8 fillcolor=lightgrey tooltip="warm_min_finish_ratio @ GRADUATED" width=1] diff --git a/code/aind_auto_train/curriculums/Uncoupled Baiting_curriculum_v1.0_schema_v1.0_paras.svg b/code/aind_auto_train/curriculums/Uncoupled Baiting_curriculum_v1.0_schema_v1.0_paras.svg index 9e36d5c..b4e0c5e 100644 --- a/code/aind_auto_train/curriculums/Uncoupled Baiting_curriculum_v1.0_schema_v1.0_paras.svg +++ b/code/aind_auto_train/curriculums/Uncoupled Baiting_curriculum_v1.0_schema_v1.0_paras.svg @@ -641,7 +641,7 @@ cell_33_1 -True +on @@ -671,7 +671,7 @@ cell_33_2 -False +off @@ -1103,7 +1103,7 @@ cell_33_3 -False +off @@ -1509,7 +1509,7 @@ cell_33_4 -False +off @@ -1915,7 +1915,7 @@ cell_33_5 -False +off @@ -2321,7 +2321,7 @@ cell_33_6 -False +off