Skip to content

Commit adcc87f

Browse files
svc-aind-behaviorsvc-aind-behavior
committed
working version
1 parent 1a08dee commit adcc87f

2 files changed

Lines changed: 81 additions & 1401 deletions

File tree

‎src/Extensions/TaskEngine.bonsai‎

Lines changed: 58 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
</Expression>
203203
<Expression xsi:type="Combinator">
204204
<Combinator xsi:type="rx:Timer">
205-
<rx:DueTime>PT0S</rx:DueTime>
205+
<rx:DueTime>PT0.5S</rx:DueTime>
206206
</Combinator>
207207
</Expression>
208208
<Expression xsi:type="Combinator">
@@ -318,7 +318,7 @@
318318
</Expression>
319319
<Expression xsi:type="Combinator">
320320
<Combinator xsi:type="rx:Timer">
321-
<rx:DueTime>PT0S</rx:DueTime>
321+
<rx:DueTime>PT5S</rx:DueTime>
322322
</Combinator>
323323
</Expression>
324324
<Expression xsi:type="Combinator">
@@ -472,21 +472,21 @@
472472
<Expression xsi:type="SubscribeSubject">
473473
<Name>ThisTrial</Name>
474474
</Expression>
475-
<Expression xsi:type="MemberSelector">
476-
<Selector>EnableFastRetract</Selector>
477-
</Expression>
478475
<Expression xsi:type="Combinator">
479476
<Combinator xsi:type="rx:WithLatestFrom" />
480477
</Expression>
481478
<Expression xsi:type="MemberSelector">
482479
<Selector>Item2</Selector>
483480
</Expression>
481+
<Expression xsi:type="MemberSelector">
482+
<Selector>EnableFastRetract</Selector>
483+
</Expression>
484484
<Expression xsi:type="WorkflowOutput" />
485485
</Nodes>
486486
<Edges>
487-
<Edge From="0" To="3" Label="Source1" />
488-
<Edge From="1" To="2" Label="Source1" />
489-
<Edge From="2" To="3" Label="Source2" />
487+
<Edge From="0" To="2" Label="Source1" />
488+
<Edge From="1" To="2" Label="Source2" />
489+
<Edge From="2" To="3" Label="Source1" />
490490
<Edge From="3" To="4" Label="Source1" />
491491
<Edge From="4" To="5" Label="Source1" />
492492
</Edges>
@@ -600,22 +600,22 @@
600600
<Expression xsi:type="SubscribeSubject">
601601
<Name>ThisTrial</Name>
602602
</Expression>
603-
<Expression xsi:type="MemberSelector">
604-
<Selector>EnableFastRetract</Selector>
605-
</Expression>
606603
<Expression xsi:type="Combinator">
607604
<Combinator xsi:type="rx:WithLatestFrom" />
608605
</Expression>
609606
<Expression xsi:type="MemberSelector">
610607
<Selector>Item2</Selector>
611608
</Expression>
609+
<Expression xsi:type="MemberSelector">
610+
<Selector>EnableFastRetract</Selector>
611+
</Expression>
612612
<Expression xsi:type="BitwiseNot" />
613613
<Expression xsi:type="WorkflowOutput" />
614614
</Nodes>
615615
<Edges>
616-
<Edge From="0" To="3" Label="Source1" />
617-
<Edge From="1" To="2" Label="Source1" />
618-
<Edge From="2" To="3" Label="Source2" />
616+
<Edge From="0" To="2" Label="Source1" />
617+
<Edge From="1" To="2" Label="Source2" />
618+
<Edge From="2" To="3" Label="Source1" />
619619
<Edge From="3" To="4" Label="Source1" />
620620
<Edge From="4" To="5" Label="Source1" />
621621
<Edge From="5" To="6" Label="Source1" />
@@ -693,25 +693,25 @@
693693
<Expression xsi:type="SubscribeSubject">
694694
<Name>ThisTrial</Name>
695695
</Expression>
696-
<Expression xsi:type="MemberSelector">
697-
<Selector>SecondaryReinforcer</Selector>
698-
</Expression>
699696
<Expression xsi:type="Combinator">
700697
<Combinator xsi:type="rx:WithLatestFrom" />
701698
</Expression>
702699
<Expression xsi:type="MemberSelector">
703700
<Selector>Item2</Selector>
704701
</Expression>
702+
<Expression xsi:type="MemberSelector">
703+
<Selector>SecondaryReinforcer</Selector>
704+
</Expression>
705705
<Expression xsi:type="scr:ExpressionTransform">
706706
<scr:Name>IsNotNull</scr:Name>
707707
<scr:Expression>it != null</scr:Expression>
708708
</Expression>
709709
<Expression xsi:type="WorkflowOutput" />
710710
</Nodes>
711711
<Edges>
712-
<Edge From="0" To="3" Label="Source1" />
713-
<Edge From="1" To="2" Label="Source1" />
714-
<Edge From="2" To="3" Label="Source2" />
712+
<Edge From="0" To="2" Label="Source1" />
713+
<Edge From="1" To="2" Label="Source2" />
714+
<Edge From="2" To="3" Label="Source1" />
715715
<Edge From="3" To="4" Label="Source1" />
716716
<Edge From="4" To="5" Label="Source1" />
717717
<Edge From="5" To="6" Label="Source1" />
@@ -787,25 +787,25 @@
787787
<Expression xsi:type="SubscribeSubject">
788788
<Name>ThisTrial</Name>
789789
</Expression>
790-
<Expression xsi:type="MemberSelector">
791-
<Selector>SecondaryReinforcer</Selector>
792-
</Expression>
793790
<Expression xsi:type="Combinator">
794791
<Combinator xsi:type="rx:WithLatestFrom" />
795792
</Expression>
796793
<Expression xsi:type="MemberSelector">
797794
<Selector>Item2</Selector>
798795
</Expression>
796+
<Expression xsi:type="MemberSelector">
797+
<Selector>SecondaryReinforcer</Selector>
798+
</Expression>
799799
<Expression xsi:type="scr:ExpressionTransform">
800800
<scr:Name>IsNull</scr:Name>
801801
<scr:Expression>it == null</scr:Expression>
802802
</Expression>
803803
<Expression xsi:type="WorkflowOutput" />
804804
</Nodes>
805805
<Edges>
806-
<Edge From="0" To="3" Label="Source1" />
807-
<Edge From="1" To="2" Label="Source1" />
808-
<Edge From="2" To="3" Label="Source2" />
806+
<Edge From="0" To="2" Label="Source1" />
807+
<Edge From="1" To="2" Label="Source2" />
808+
<Edge From="2" To="3" Label="Source1" />
809809
<Edge From="3" To="4" Label="Source1" />
810810
<Edge From="4" To="5" Label="Source1" />
811811
<Edge From="5" To="6" Label="Source1" />
@@ -917,7 +917,7 @@
917917
</Expression>
918918
<Expression xsi:type="Combinator">
919919
<Combinator xsi:type="rx:Delay">
920-
<rx:DueTime>PT0S</rx:DueTime>
920+
<rx:DueTime>PT5S</rx:DueTime>
921921
</Combinator>
922922
</Expression>
923923
<Expression xsi:type="SubscribeSubject">
@@ -984,6 +984,11 @@
984984
<Expression xsi:type="SubscribeSubject">
985985
<Name>ThisTrial</Name>
986986
</Expression>
987+
<Expression xsi:type="Combinator">
988+
<Combinator xsi:type="rx:Take">
989+
<rx:Count>1</rx:Count>
990+
</Combinator>
991+
</Expression>
987992
<Expression xsi:type="MemberSelector">
988993
<Selector>InterTrialIntervalDuration</Selector>
989994
</Expression>
@@ -997,7 +1002,7 @@
9971002
</Expression>
9981003
<Expression xsi:type="Combinator">
9991004
<Combinator xsi:type="rx:Timer">
1000-
<rx:DueTime>PT0S</rx:DueTime>
1005+
<rx:DueTime>PT5S</rx:DueTime>
10011006
</Combinator>
10021007
</Expression>
10031008
<Expression xsi:type="Combinator">
@@ -1154,9 +1159,6 @@
11541159
</Edges>
11551160
</Workflow>
11561161
</Expression>
1157-
<Expression xsi:type="MulticastSubject">
1158-
<Name>ThisTrial</Name>
1159-
</Expression>
11601162
<Expression xsi:type="rx:Sink">
11611163
<Name>MoveSpout</Name>
11621164
<Workflow>
@@ -1223,29 +1225,29 @@
12231225
<Edge From="3" To="4" Label="Source1" />
12241226
<Edge From="4" To="5" Label="Source1" />
12251227
<Edge From="5" To="6" Label="Source1" />
1226-
<Edge From="6" To="33" Label="Source1" />
1227-
<Edge From="7" To="8" Label="Source1" />
1228+
<Edge From="6" To="7" Label="Source1" />
1229+
<Edge From="7" To="33" Label="Source1" />
12281230
<Edge From="8" To="9" Label="Source1" />
1229-
<Edge From="9" To="22" Label="Source1" />
1230-
<Edge From="10" To="11" Label="Source1" />
1231-
<Edge From="11" To="19" Label="Source1" />
1232-
<Edge From="12" To="13" Label="Source1" />
1231+
<Edge From="9" To="10" Label="Source1" />
1232+
<Edge From="10" To="23" Label="Source1" />
1233+
<Edge From="11" To="12" Label="Source1" />
1234+
<Edge From="12" To="20" Label="Source1" />
12331235
<Edge From="13" To="14" Label="Source1" />
12341236
<Edge From="14" To="15" Label="Source1" />
1235-
<Edge From="15" To="19" Label="Source2" />
1236-
<Edge From="16" To="17" Label="Source1" />
1237+
<Edge From="15" To="16" Label="Source1" />
1238+
<Edge From="16" To="20" Label="Source2" />
12371239
<Edge From="17" To="18" Label="Source1" />
1238-
<Edge From="18" To="19" Label="Source3" />
1239-
<Edge From="19" To="20" Label="Source1" />
1240+
<Edge From="18" To="19" Label="Source1" />
1241+
<Edge From="19" To="20" Label="Source3" />
12401242
<Edge From="20" To="21" Label="Source1" />
1241-
<Edge From="21" To="22" Label="Source2" />
1242-
<Edge From="22" To="23" Label="Source1" />
1243+
<Edge From="21" To="22" Label="Source1" />
1244+
<Edge From="22" To="23" Label="Source2" />
12431245
<Edge From="23" To="24" Label="Source1" />
12441246
<Edge From="24" To="25" Label="Source1" />
1245-
<Edge From="25" To="28" Label="Source1" />
1246-
<Edge From="26" To="27" Label="Source1" />
1247-
<Edge From="27" To="28" Label="Source2" />
1248-
<Edge From="28" To="29" Label="Source1" />
1247+
<Edge From="25" To="26" Label="Source1" />
1248+
<Edge From="26" To="29" Label="Source1" />
1249+
<Edge From="27" To="28" Label="Source1" />
1250+
<Edge From="28" To="29" Label="Source2" />
12491251
<Edge From="29" To="30" Label="Source1" />
12501252
<Edge From="30" To="31" Label="Source1" />
12511253
<Edge From="31" To="32" Label="Source1" />
@@ -1267,6 +1269,12 @@
12671269
<rx:Count>1</rx:Count>
12681270
</Combinator>
12691271
</Expression>
1272+
<Expression xsi:type="MemberSelector">
1273+
<Selector>NextTrial</Selector>
1274+
</Expression>
1275+
<Expression xsi:type="MulticastSubject">
1276+
<Name>ThisTrial</Name>
1277+
</Expression>
12701278
<Expression xsi:type="WorkflowOutput" />
12711279
</Nodes>
12721280
<Edges>
@@ -1287,6 +1295,8 @@
12871295
<Edge From="12" To="13" Label="Source1" />
12881296
<Edge From="13" To="14" Label="Source1" />
12891297
<Edge From="14" To="15" Label="Source1" />
1298+
<Edge From="15" To="16" Label="Source1" />
1299+
<Edge From="16" To="17" Label="Source1" />
12901300
</Edges>
12911301
</Workflow>
12921302
</Expression>
@@ -1295,7 +1305,7 @@
12951305
</Expression>
12961306
<Expression xsi:type="scr:ExpressionCondition">
12971307
<scr:Name>EndOnNull</scr:Name>
1298-
<scr:Expression>it.NextTrial == null</scr:Expression>
1308+
<scr:Expression>it == null</scr:Expression>
12991309
</Expression>
13001310
<Expression xsi:type="Combinator">
13011311
<Combinator xsi:type="rx:Take">

0 commit comments

Comments
 (0)