Skip to content

Commit

Permalink
Merge pull request #218 from SainsburyWellcomeCentre/aeon-foraging
Browse files Browse the repository at this point in the history 
Avoid race conditions on patch replenishment
  • Loading branch information
@glopesdev
glopesdev authored Jun 12, 2024
2 parents bc533fd + 3c54287 commit 63a4c0e
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 55 deletions.
2 changes: 1 addition & 1 deletion src/Aeon.Foraging/Aeon.Foraging.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Description>Provides acquisition and control modules for Project Aeon foraging experiments.</Description>
<PackageTags>Bonsai Rx Project Aeon Foraging</PackageTags>
<TargetFramework>net472</TargetFramework>
<VersionPrefix>0.1.1</VersionPrefix>
<VersionPrefix>0.1.2</VersionPrefix>
<VersionSuffix></VersionSuffix>
</PropertyGroup>

Expand Down
101 changes: 47 additions & 54 deletions src/Aeon.Foraging/RandomDepletion.bonsai
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,20 +127,11 @@
<Expression xsi:type="SubscribeSubject">
<Name>PatchState</Name>
</Expression>
<Expression xsi:type="scr:ExpressionCondition">
<scr:Expression>!double.IsNaN(Item1)</scr:Expression>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="rx:SubscribeWhen" />
</Expression>
<Expression xsi:type="SubscribeSubject">
<Name>PatchState</Name>
</Expression>
<Expression xsi:type="MemberSelector">
<Selector>Item1</Selector>
</Expression>
<Expression xsi:type="Combinator">
<Combinator xsi:type="rx:WithLatestFrom" />
<Combinator xsi:type="rx:CombineLatest" />
</Expression>
<Expression xsi:type="scr:ExpressionCondition">
<scr:Expression>double.IsNaN(Item2) || Item1 &gt; Item2</scr:Expression>
Expand Down Expand Up @@ -189,10 +180,12 @@
</Combinator>
</Expression>
<Expression xsi:type="scr:ExpressionTransform">
<scr:Expression>new(
Item1.Item2 as D0,
Item1.Item3 as Rate,
Item2 as Random)</scr:Expression>
<scr:Expression>
new(
Item1.Item2 as D0,
Item1.Item3 as Rate,
Item2 as Random)
</scr:Expression>
</Expression>
<Expression xsi:type="InputMapping">
<PropertyMappings>
Expand All @@ -209,10 +202,12 @@ Item2 as Random)</scr:Expression>
<Combinator xsi:type="rx:Zip" />
</Expression>
<Expression xsi:type="scr:ExpressionTransform">
<scr:Expression>new(
Item2.Sample() + Item1.D0 as Threshold,
Item1.D0 as D0,
Item1.Rate as Rate)</scr:Expression>
<scr:Expression>
new(
Item2.Sample() + Item1.D0 as Threshold,
Item1.D0 as D0,
Item1.Rate as Rate)
</scr:Expression>
</Expression>
<Expression xsi:type="MemberSelector">
<Selector>Threshold,D0,Rate</Selector>
Expand Down Expand Up @@ -368,10 +363,12 @@ Item1.Rate as Rate)</scr:Expression>
<Combinator xsi:type="rx:WithLatestFrom" />
</Expression>
<Expression xsi:type="scr:ExpressionTransform">
<scr:Expression>new(
Item2.Item1 as Threshold,
Item1.Item1 as D0,
Item1.Item2 as Rate)</scr:Expression>
<scr:Expression>
new(
Item2.Item1 as Threshold,
Item1.Item1 as D0,
Item1.Item2 as Rate)
</scr:Expression>
</Expression>
<Expression xsi:type="MemberSelector">
<Selector>Threshold,D0,Rate</Selector>
Expand All @@ -386,48 +383,44 @@ Item1.Item2 as Rate)</scr:Expression>
<Edge From="1" To="2" Label="Source1" />
<Edge From="2" To="4" Label="Source1" />
<Edge From="3" To="4" Label="Source2" />
<Edge From="3" To="17" Label="Source1" />
<Edge From="3" To="21" Label="Source2" />
<Edge From="3" To="14" Label="Source1" />
<Edge From="3" To="18" Label="Source2" />
<Edge From="5" To="9" Label="Source1" />
<Edge From="6" To="7" Label="Source1" />
<Edge From="6" To="10" Label="Source1" />
<Edge From="6" To="15" Label="Source2" />
<Edge From="6" To="24" Label="Source1" />
<Edge From="6" To="30" Label="Source1" />
<Edge From="6" To="36" Label="Source1" />
<Edge From="6" To="40" Label="Source2" />
<Edge From="6" To="12" Label="Source2" />
<Edge From="6" To="21" Label="Source1" />
<Edge From="6" To="27" Label="Source1" />
<Edge From="6" To="33" Label="Source1" />
<Edge From="6" To="37" Label="Source2" />
<Edge From="7" To="8" Label="Source1" />
<Edge From="8" To="9" Label="Source2" />
<Edge From="9" To="12" Label="Source1" />
<Edge From="9" To="10" Label="Source1" />
<Edge From="10" To="11" Label="Source1" />
<Edge From="11" To="12" Label="Source2" />
<Edge From="11" To="12" Label="Source1" />
<Edge From="12" To="13" Label="Source1" />
<Edge From="13" To="14" Label="Source1" />
<Edge From="14" To="15" Label="Source1" />
<Edge From="13" To="15" Label="Source1" />
<Edge From="14" To="15" Label="Source2" />
<Edge From="15" To="16" Label="Source1" />
<Edge From="16" To="18" Label="Source1" />
<Edge From="17" To="18" Label="Source2" />
<Edge From="16" To="17" Label="Source1" />
<Edge From="17" To="18" Label="Source1" />
<Edge From="18" To="19" Label="Source1" />
<Edge From="19" To="20" Label="Source1" />
<Edge From="20" To="21" Label="Source1" />
<Edge From="20" To="25" Label="Source1" />
<Edge From="21" To="22" Label="Source1" />
<Edge From="23" To="28" Label="Source1" />
<Edge From="24" To="25" Label="Source1" />
<Edge From="25" To="26" Label="Source1" />
<Edge From="26" To="27" Label="Source1" />
<Edge From="27" To="28" Label="Source2" />
<Edge From="28" To="35" Label="Source1" />
<Edge From="29" To="34" Label="Source1" />
<Edge From="30" To="31" Label="Source1" />
<Edge From="31" To="32" Label="Source1" />
<Edge From="32" To="33" Label="Source1" />
<Edge From="22" To="23" Label="Source1" />
<Edge From="23" To="24" Label="Source1" />
<Edge From="24" To="25" Label="Source2" />
<Edge From="25" To="32" Label="Source1" />
<Edge From="26" To="31" Label="Source1" />
<Edge From="27" To="28" Label="Source1" />
<Edge From="28" To="29" Label="Source1" />
<Edge From="29" To="30" Label="Source1" />
<Edge From="30" To="31" Label="Source2" />
<Edge From="31" To="32" Label="Source2" />
<Edge From="32" To="34" Label="Source1" />
<Edge From="33" To="34" Label="Source2" />
<Edge From="34" To="35" Label="Source2" />
<Edge From="35" To="37" Label="Source1" />
<Edge From="36" To="37" Label="Source2" />
<Edge From="37" To="38" Label="Source1" />
<Edge From="38" To="39" Label="Source1" />
<Edge From="39" To="40" Label="Source1" />
<Edge From="34" To="35" Label="Source1" />
<Edge From="35" To="36" Label="Source1" />
<Edge From="36" To="37" Label="Source1" />
</Edges>
</Workflow>
</Expression>
Expand Down

0 comments on commit 63a4c0e

Please sign in to comment.