From 8c55ca08881b59943bc9dda193107cc8a117cf69 Mon Sep 17 00:00:00 2001
From: Jacob Palecki <JacobPalecki@gmail.com>
Date: Mon, 18 Jan 2021 17:39:10 -0800
Subject: Refactor for new graph calculation method

---
 grapher/Models/Charts/ChartState/CombinedState.cs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'grapher/Models/Charts/ChartState/CombinedState.cs')

diff --git a/grapher/Models/Charts/ChartState/CombinedState.cs b/grapher/Models/Charts/ChartState/CombinedState.cs
index 9eadb87..7275d16 100644
--- a/grapher/Models/Charts/ChartState/CombinedState.cs
+++ b/grapher/Models/Charts/ChartState/CombinedState.cs
@@ -1,4 +1,5 @@
 using grapher.Models.Calculations;
+using grapher.Models.Calculations.Data;
 using grapher.Models.Serialized;
 
 namespace grapher.Models.Charts.ChartState
@@ -9,15 +10,16 @@ namespace grapher.Models.Charts.ChartState
             ChartXY sensitivityChart,
             ChartXY velocityChart,
             ChartXY gainChart,
-            AccelData accelData,
+            EstimatedPoints points,
             AccelCalculator accelCalculator)
             : base(
                   sensitivityChart,
                   velocityChart,
                   gainChart,
-                  accelData,
                   accelCalculator)
-        { }
+        {
+            Data = new AccelDataCombined(points, accelCalculator);
+        }
 
         public override void Activate()
         {
@@ -37,16 +39,16 @@ namespace grapher.Models.Charts.ChartState
 
         public override void Bind()
         {
-            SensitivityChart.Bind(Data.Combined.AccelPoints);
-            VelocityChart.Bind(Data.Combined.VelocityPoints);
-            GainChart.Bind(Data.Combined.GainPoints);
-            SensitivityChart.SetMinMax(Data.Combined.MinAccel, Data.Combined.MaxAccel);
-            GainChart.SetMinMax(Data.Combined.MinGain, Data.Combined.MaxGain);
+            SensitivityChart.Bind(Data.X.AccelPoints);
+            VelocityChart.Bind(Data.X.VelocityPoints);
+            GainChart.Bind(Data.X.GainPoints);
+            SensitivityChart.SetMinMax(Data.X.MinAccel, Data.X.MaxAccel);
+            GainChart.SetMinMax(Data.X.MinGain, Data.X.MaxGain);
         }
 
         public override void Calculate(ManagedAccel accel, DriverSettings settings)
         {
-            Calculator.Calculate(Data.Combined, accel, settings.sensitivity.x, Calculator.SimulatedInputCombined);
+            Calculator.Calculate(Data.X, accel, settings.sensitivity.x, Calculator.SimulatedInputCombined);
         }
     }
 }
-- 
cgit v1.2.3


From 4faf0007c7c551fae8fd25fc7a98767070cb9244 Mon Sep 17 00:00:00 2001
From: Jacob Palecki <JacobPalecki@gmail.com>
Date: Mon, 18 Jan 2021 22:02:29 -0800
Subject: Directional works

---
 grapher/Models/Charts/ChartState/CombinedState.cs | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'grapher/Models/Charts/ChartState/CombinedState.cs')

diff --git a/grapher/Models/Charts/ChartState/CombinedState.cs b/grapher/Models/Charts/ChartState/CombinedState.cs
index 7275d16..3511cec 100644
--- a/grapher/Models/Charts/ChartState/CombinedState.cs
+++ b/grapher/Models/Charts/ChartState/CombinedState.cs
@@ -32,11 +32,6 @@ namespace grapher.Models.Charts.ChartState
             GainChart.ClearSecondDots();
         }
 
-        public override void MakeDots(double x, double y, double timeInMs)
-        {
-            Data.CalculateDots(x, y, timeInMs);
-        }
-
         public override void Bind()
         {
             SensitivityChart.Bind(Data.X.AccelPoints);
@@ -45,10 +40,5 @@ namespace grapher.Models.Charts.ChartState
             SensitivityChart.SetMinMax(Data.X.MinAccel, Data.X.MaxAccel);
             GainChart.SetMinMax(Data.X.MinGain, Data.X.MaxGain);
         }
-
-        public override void Calculate(ManagedAccel accel, DriverSettings settings)
-        {
-            Calculator.Calculate(Data.X, accel, settings.sensitivity.x, Calculator.SimulatedInputCombined);
-        }
     }
 }
-- 
cgit v1.2.3