Merge branch 'Experiment' into GUI

6 files changed, 31 insertions, 1 deletions

diff --git a/grapher/Layouts/ExperimentOneLayout.cs b/grapher/Layouts/ExperimentOneLayout.cs
new file mode 100644
index 0000000..1853fbc
--- /dev/null
+++ b/grapher/Layouts/ExperimentOneLayout.cs
@@ -0,0 +1,26 @@
+using grapher.Models.Serialized;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace grapher.Layouts
+{
+    public class ExperimentOneLayout : LayoutBase
+    {
+         public ExperimentOneLayout()
+            : base()
+        {
+            Name = "Experiment 1";
+            Index = (int)AccelMode.experimentone;
+
+            AccelLayout = new OptionLayout(true, Acceleration);
+            CapLayout = new OptionLayout(false, string.Empty);
+            WeightLayout = new OptionLayout(true, Weight);
+            OffsetLayout = new OptionLayout(false, string.Empty);
+            LimExpLayout = new OptionLayout(true, Motility);
+            MidpointLayout = new OptionLayout(true, Midpoint);
+        }
+    }
+}
diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs
index 9016940..10429fb 100644
--- a/grapher/Layouts/LayoutBase.cs
+++ b/grapher/Layouts/LayoutBase.cs
@@ -10,6 +10,7 @@ namespace grapher.Layouts
         public const string Exponent = "Exponent";
         public const string Limit = "Limit";
         public const string Midpoint = "Midpoint";
+        public const string Motility = "Motility";
         public const string Offset = "Offset";
         public const string Cap = "Cap";
         public const string Weight = "Weight";
diff --git a/grapher/Models/Calculations/AccelCalculator.cs b/grapher/Models/Calculations/AccelCalculator.cs
index a140c90..8865939 100644
--- a/grapher/Models/Calculations/AccelCalculator.cs
+++ b/grapher/Models/Calculations/AccelCalculator.cs
@@ -66,6 +66,7 @@ namespace grapher.Models.Calculations
             {
                 var output = accel.Accelerate(magnitudeDatum.x, magnitudeDatum.y, MeasurementTime);
                 var outMagnitude = Magnitude(output.Item1, output.Item2);
+
                 var ratio = magnitudeDatum.magnitude > 0 ? outMagnitude / magnitudeDatum.magnitude : starter;
 
                 var inDiff = magnitudeDatum.magnitude - lastInputMagnitude;
diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs
index 917ac5c..6f547cd 100644
--- a/grapher/Models/Options/AccelTypeOptions.cs
+++ b/grapher/Models/Options/AccelTypeOptions.cs
@@ -21,6 +21,7 @@ namespace grapher
             new LogarithmLayout(),
             new NaturalGainLayout(),
             new SigmoidGainLayout(),
+            new ExperimentOneLayout(),
             new OffLayout()
         }.ToDictionary(k => k.Name);
 
diff --git a/grapher/Models/Serialized/DriverSettings.cs b/grapher/Models/Serialized/DriverSettings.cs
index d42187c..03c5687 100644
--- a/grapher/Models/Serialized/DriverSettings.cs
+++ b/grapher/Models/Serialized/DriverSettings.cs
@@ -8,7 +8,7 @@ namespace grapher.Models.Serialized
 
     public enum AccelMode
     {
-        linear, classic, natural, naturalgain, sigmoidgain, power, logarithm, noaccel
+        linear, classic, natural, naturalgain, sigmoidgain, power, logarithm, experimentone, noaccel
     }
 
     #endregion Enumerations
diff --git a/grapher/grapher.csproj b/grapher/grapher.csproj
index d451a91..ebe224a 100644
--- a/grapher/grapher.csproj
+++ b/grapher/grapher.csproj
@@ -54,6 +54,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Constants\Constants.cs" />
+    <Compile Include="Layouts\ExperimentOneLayout.cs" />
     <Compile Include="Layouts\LogarithmLayout.cs" />
     <Compile Include="Layouts\NaturalGainLayout.cs" />
     <Compile Include="Layouts\SigmoidGainLayout.cs" />