Merge pull request #37 from JacobPalecki/GUI

Fix output velocity calculation
a1xd · Oct 19, 2020 · 7d02822 · 7d02822
2 parents 4306e7e + 1488413
commit 7d02822
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/grapher/Models/Calculations/AccelCalculator.cs b/grapher/Models/Calculations/AccelCalculator.cs
@@ -80,7 +80,7 @@ public void Calculate(AccelChartData data, ManagedAccel accel, double starter, I
                 }
 
                 var output = accel.Accelerate(simulatedInputDatum.x, simulatedInputDatum.y, simulatedInputDatum.time);
-                var outMagnitude = Magnitude(output.Item1, output.Item2);
+                var outMagnitude = Velocity(output.Item1, output.Item2, simulatedInputDatum.time);
 
                 if (!data.VelocityPoints.ContainsKey(simulatedInputDatum.velocity))
                 {
@@ -181,7 +181,7 @@ public void CalculateCombinedDiffSens(AccelData data, ManagedAccel accel, Driver
 
                 var output = accel.Accelerate(simulatedInputDatum.x, simulatedInputDatum.y, simulatedInputDatum.time);
                 var outputWithoutSens = StripThisSens(output.Item1, output.Item2);
-                var magnitudeWithoutSens = Magnitude(outputWithoutSens.Item1, outputWithoutSens.Item2);
+                var magnitudeWithoutSens = Velocity(outputWithoutSens.Item1, outputWithoutSens.Item2, simulatedInputDatum.time);
 
                 var ratio = magnitudeWithoutSens / simulatedInputDatum.velocity;