summaryrefslogtreecommitdiff
path: root/grapher/Models/Calculations
diff options
context:
space:
mode:
authora1xd <[email protected]>2020-10-19 01:59:35 -0400
committerGitHub <[email protected]>2020-10-19 01:59:35 -0400
commit7d02822d232db9cf835e5a0b2c09a273b90ea4f3 (patch)
tree2a993b89e271e13741370e0fcc70a3c6e1c610dd /grapher/Models/Calculations
parentMerge pull request #36 from a1xd/gain-conv-fix (diff)
parentFix output velocity calculation (diff)
downloadrawaccel-1.1.2.tar.xz
rawaccel-1.1.2.zip
Merge pull request #37 from JacobPalecki/GUIv1.1.2
Fix output velocity calculation
Diffstat (limited to 'grapher/Models/Calculations')
-rw-r--r--grapher/Models/Calculations/AccelCalculator.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/grapher/Models/Calculations/AccelCalculator.cs b/grapher/Models/Calculations/AccelCalculator.cs
index f864fad..2c32753 100644
--- a/grapher/Models/Calculations/AccelCalculator.cs
+++ b/grapher/Models/Calculations/AccelCalculator.cs
@@ -80,7 +80,7 @@ namespace grapher.Models.Calculations
}
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 @@ namespace grapher.Models.Calculations
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;