From 258fcd3bd236a787f07d7dac2049be524d86cb75 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Tue, 6 Apr 2021 23:11:20 -0700 Subject: Fix natural legacy algorithm, rename accelNatural to decayRate --- grapher/Layouts/LayoutBase.cs | 1 + grapher/Layouts/NaturalLayout.cs | 2 +- grapher/Models/Options/AccelTypeOptions.cs | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'grapher') diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs index 7baf5ed..d9d85b1 100644 --- a/grapher/Layouts/LayoutBase.cs +++ b/grapher/Layouts/LayoutBase.cs @@ -17,6 +17,7 @@ namespace grapher.Layouts public const string Smooth = "Smooth"; public const string Gain = "Gain"; public const string GrowthRate = "Growth Rate"; + public const string DecayRate = "Decay Rate"; public LayoutBase() { diff --git a/grapher/Layouts/NaturalLayout.cs b/grapher/Layouts/NaturalLayout.cs index 9fc54fc..070a249 100644 --- a/grapher/Layouts/NaturalLayout.cs +++ b/grapher/Layouts/NaturalLayout.cs @@ -12,7 +12,7 @@ namespace grapher.Layouts LogarithmicCharts = false; GainSwitchOptionLayout = new OptionLayout(true, Gain); - AccelLayout = new OptionLayout(true, Acceleration); + AccelLayout = new OptionLayout(true, DecayRate); ScaleLayout = new OptionLayout(false, string.Empty); CapLayout = new OptionLayout(false, string.Empty); WeightLayout = new OptionLayout(true, Weight); diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs index 768d17d..a271ea4 100644 --- a/grapher/Models/Options/AccelTypeOptions.cs +++ b/grapher/Models/Options/AccelTypeOptions.cs @@ -246,7 +246,7 @@ namespace grapher { if (args.mode == AccelMode.natural) { - args.accelNatural = Acceleration.Field.Data; + args.decayRate = Acceleration.Field.Data; } else if (args.mode == AccelMode.motivity) { @@ -349,7 +349,7 @@ namespace grapher } else if (args.mode == AccelMode.natural) { - return args.accelNatural; + return args.decayRate; } else { -- cgit v1.2.3