Merge pull request #427 from AllenNeuralDynamics/fix-non-null-distribution

Ensure distribution is null when re-hydrating site

Author: bruno-f-cruz

src/Extensions/AddRewardSite.bonsai

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<WorkflowBuilder Version="2.8.2"
+<WorkflowBuilder Version="2.9.0"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                  xmlns:rx="clr-namespace:Bonsai.Reactive;assembly=Bonsai.Core"
                  xmlns:p1="clr-namespace:AindVrForagingDataSchema;assembly=Extensions"
                  xmlns:sys="clr-namespace:System;assembly=mscorlib"
                  xmlns:num="clr-namespace:Bonsai.Numerics;assembly=Bonsai.Numerics"
+                 xmlns:p2="clr-namespace:;assembly=Extensions"
                  xmlns="https://bonsai-rx.org/2018/workflow">
   <Workflow>
     <Nodes>
@@ -180,6 +181,16 @@
                       <Property Name="OperantLogic" />
                     </PropertyMappings>
                   </Expression>
+                  <Expression xsi:type="Combinator">
+                    <Combinator xsi:type="p2:NullDistribution" />
+                  </Expression>
+                  <Expression xsi:type="PropertyMapping">
+                    <PropertyMappings>
+                      <Property Name="Amount" />
+                      <Property Name="Probability" />
+                      <Property Name="Available" />
+                    </PropertyMappings>
+                  </Expression>
                   <Expression xsi:type="Combinator">
                     <Combinator xsi:type="p1:RewardSpecification" />
                   </Expression>
@@ -188,7 +199,7 @@
                 <Edges>
                   <Edge From="0" To="1" Label="Source1" />
                   <Edge From="1" To="2" Label="Source1" />
-                  <Edge From="2" To="16" Label="Source1" />
+                  <Edge From="2" To="18" Label="Source1" />
                   <Edge From="3" To="4" Label="Source1" />
                   <Edge From="4" To="5" Label="Source1" />
                   <Edge From="5" To="6" Label="Source1" />
@@ -201,8 +212,10 @@
                   <Edge From="12" To="13" Label="Source1" />
                   <Edge From="13" To="14" Label="Source2" />
                   <Edge From="14" To="15" Label="Source1" />
-                  <Edge From="15" To="16" Label="Source2" />
+                  <Edge From="15" To="18" Label="Source2" />
                   <Edge From="16" To="17" Label="Source1" />
+                  <Edge From="17" To="18" Label="Source3" />
+                  <Edge From="18" To="19" Label="Source1" />
                 </Edges>
               </Workflow>
             </Expression>

src/Extensions/NullDistribution.cs

@@ -0,0 +1,15 @@
+using Bonsai;
+using System;
+using System.ComponentModel;
+using System.Reactive.Linq;
+
+[Combinator]
+[Description("Returns a sequence containing a null Distribution.")]
+[WorkflowElementCategory(ElementCategory.Source)]
+public class NullDistribution
+{
+    public IObservable<AindVrForagingDataSchema.Distribution> Process()
+    {
+        return Observable.Return<AindVrForagingDataSchema.Distribution>(null);
+    }
+}