diff options
| author | Jacob Palecki <[email protected]> | 2020-09-21 14:26:04 -0700 |
|---|---|---|
| committer | Jacob Palecki <[email protected]> | 2020-09-21 14:26:04 -0700 |
| commit | e1acbaa344c2c571a9f7730afba6cd4fbd36ecf6 (patch) | |
| tree | 6ffdee3a16c7b5c89b6f12117e8a9b78b1112e6f /grapher/Models | |
| parent | Merge pull request #21 from JacobPalecki/GUI (diff) | |
| parent | conditional around lookup map (diff) | |
| download | rawaccel-e1acbaa344c2c571a9f7730afba6cd4fbd36ecf6.tar.xz rawaccel-e1acbaa344c2c571a9f7730afba6cd4fbd36ecf6.zip | |
Merge remote-tracking branch 'downstream/experiment' into Experiment
Diffstat (limited to 'grapher/Models')
| -rw-r--r-- | grapher/Models/Calculations/AccelCalculator.cs | 1 | ||||
| -rw-r--r-- | grapher/Models/Options/AccelTypeOptions.cs | 1 | ||||
| -rw-r--r-- | grapher/Models/Serialized/DriverSettings.cs | 2 |
3 files changed, 3 insertions, 1 deletions
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 |