diff options
| author | a1xd <[email protected]> | 2020-10-19 01:59:35 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-10-19 01:59:35 -0400 |
| commit | 7d02822d232db9cf835e5a0b2c09a273b90ea4f3 (patch) | |
| tree | 2a993b89e271e13741370e0fcc70a3c6e1c610dd | |
| parent | Merge pull request #36 from a1xd/gain-conv-fix (diff) | |
| parent | Fix output velocity calculation (diff) | |
| download | rawaccel-7d02822d232db9cf835e5a0b2c09a273b90ea4f3.tar.xz rawaccel-7d02822d232db9cf835e5a0b2c09a273b90ea4f3.zip | |
Merge pull request #37 from JacobPalecki/GUIv1.1.2
Fix output velocity calculation
| -rw-r--r-- | grapher/Models/Calculations/AccelCalculator.cs | 4 |
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; |