Log calibration to file

Author: bruno-f-cruz

src/Extensions.csproj

@@ -1,13 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Bonsai.Core" Version="2.8.5" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="MathNet.Numerics" Version="4.15.0" />
-  </ItemGroup>
-
+    <PropertyGroup>
+        <TargetFramework>net472</TargetFramework>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Bonsai.Core" Version="2.8.5" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="MathNet.Numerics" Version="4.15.0" />
+    </ItemGroup>
 </Project>

src/Extensions/Logging.bonsai

@@ -11,6 +11,8 @@
                  xmlns:p5="clr-namespace:AindBehaviorWaterTuner.TaskLogic;assembly=Extensions"
                  xmlns:p6="clr-namespace:AindBehaviorWaterTuner.Rig;assembly=Extensions"
                  xmlns:p7="clr-namespace:AllenNeuralDynamics.AindBehaviorServices.DataTypes;assembly=AllenNeuralDynamics.AindBehaviorServices"
+                 xmlns:p8="clr-namespace:AindBehaviorWaterTuner.DataTypes;assembly=Extensions"
+                 xmlns:io="clr-namespace:Bonsai.IO;assembly=Bonsai.System"
                  xmlns="https://bonsai-rx.org/2018/workflow">
   <Workflow>
     <Nodes>
@@ -623,11 +625,48 @@
                       </Edges>
                     </Workflow>
                   </Expression>
+                  <Expression xsi:type="SubscribeSubject">
+                    <Name>CalibrationModel</Name>
+                  </Expression>
+                  <Expression xsi:type="Combinator">
+                    <Combinator xsi:type="p8:SerializeToJson" />
+                  </Expression>
+                  <Expression xsi:type="Combinator">
+                    <Combinator xsi:type="io:WriteLine" />
+                  </Expression>
+                  <Expression xsi:type="ExternalizedMapping">
+                    <Property Name="Name" DisplayName="SubjectName" />
+                  </Expression>
+                  <Expression xsi:type="SubscribeSubject">
+                    <Name>LoggingRootPath</Name>
+                  </Expression>
+                  <Expression xsi:type="Format">
+                    <Format>{0}/water_calibration.json</Format>
+                    <Selector />
+                  </Expression>
+                  <Expression xsi:type="PropertyMapping">
+                    <PropertyMappings>
+                      <Property Name="Path" />
+                    </PropertyMappings>
+                  </Expression>
+                  <Expression xsi:type="Combinator">
+                    <Combinator xsi:type="io:WriteAllText">
+                      <io:Overwrite>false</io:Overwrite>
+                      <io:Append>false</io:Append>
+                    </Combinator>
+                  </Expression>
                 </Nodes>
                 <Edges>
                   <Edge From="0" To="1" Label="Source1" />
                   <Edge From="1" To="2" Label="Source1" />
                   <Edge From="2" To="3" Label="Source1" />
+                  <Edge From="8" To="9" Label="Source1" />
+                  <Edge From="9" To="10" Label="Source1" />
+                  <Edge From="10" To="15" Label="Source1" />
+                  <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="Source2" />
                 </Edges>
               </Workflow>
             </Expression>

src/Extensions/WaterCalibrationModel.cs

@@ -4,22 +4,39 @@
 using System.Linq;
 using System.Reactive.Linq;
 using MathNet.Numerics;
+using AindBehaviorWaterTuner.DataTypes;
+using System.Collections.Generic;
 
 [Combinator]
-[Description("")]
+[Description("Computes a water calibration model from a sequence of measurements.")]
 [WorkflowElementCategory(ElementCategory.Transform)]
 public class WaterCalibrationModel
 {
-    public IObservable<LinearRegressionFit> Process(IObservable<Tuple<double, ScaleMessage, ScaleMessage>[]> source)
+    public IObservable<WaterValveCalibration> Process(IObservable<IEnumerable<Measurement>> source)
     {
         return source.Select(value => {
-            var delays = value.Select(x => x.Item1).ToArray();
-            var weights = value.Select(x => x.Item3.DataFrame.Weight - x.Item2.DataFrame.Weight).ToArray();
-            Tuple<double, double> p = Fit.Line(delays, weights);
-            return new LinearRegressionFit(){
-                Intercept = p.Item1,
+
+            var input = new WaterValveCalibrationInput(){
+                Measurements = value.ToList()
+            };
+
+
+            var delays = value.Select(x => x.ValveOpenTime).ToArray();
+            var weights = value.Select(x => x.WaterWeight.Average()).ToArray();
+            var p = Fit.Line(delays, weights);
+
+            var output = new WaterValveCalibrationOutput(){
+                Offset = p.Item1,
                 Slope = p.Item2,
-                R2 = GoodnessOfFit.RSquared(delays.Select(x => p.Item1+p.Item2*x), weights)
+                R2 = GoodnessOfFit.RSquared(delays.Select(x => p.Item1+p.Item2*x), weights),
+                IntervalAverage = value.ToDictionary(k => k.ValveOpenTime.ToString("0.0000"), v => v.WaterWeight.Average()),
+                ValidDomain = delays.ToList()
+            };
+
+            return new WaterValveCalibration(){
+                Input = input,
+                Output = output,
+                Date = DateTimeOffset.Now,
             };
         });
     }