diff options
| -rw-r--r-- | common/accel-motivity.hpp | 2 | ||||
| -rw-r--r-- | common/rawaccel-base.hpp | 2 | ||||
| -rw-r--r-- | common/rawaccel-validate.hpp | 2 | ||||
| -rw-r--r-- | grapher/Layouts/LayoutBase.cs | 1 | ||||
| -rw-r--r-- | grapher/Layouts/MotivityLayout.cs | 2 | ||||
| -rw-r--r-- | grapher/Models/Options/AccelTypeOptions.cs | 4 | ||||
| -rw-r--r-- | wrapper/wrapper.cpp | 2 |
7 files changed, 8 insertions, 7 deletions
diff --git a/common/accel-motivity.hpp b/common/accel-motivity.hpp index 0c15598..c7ecb13 100644 --- a/common/accel-motivity.hpp +++ b/common/accel-motivity.hpp @@ -13,7 +13,7 @@ namespace rawaccel { double constant; sigmoid(const accel_args& args) : - accel(exp(args.accel_motivity)), + accel(exp(args.growth_rate)), motivity(2 * log(args.motivity)), midpoint(log(args.midpoint)), constant(-motivity / 2) {} diff --git a/common/rawaccel-base.hpp b/common/rawaccel-base.hpp index d318db5..fc49a62 100644 --- a/common/rawaccel-base.hpp +++ b/common/rawaccel-base.hpp @@ -52,7 +52,7 @@ namespace rawaccel { double cap = 1.5; double accel_classic = 0.005; double accel_natural = 0.1; - double accel_motivity = 1; + double growth_rate = 1; double motivity = 1.5; double power = 2; double scale = 1; diff --git a/common/rawaccel-validate.hpp b/common/rawaccel-validate.hpp index d625d20..338fbdc 100644 --- a/common/rawaccel-validate.hpp +++ b/common/rawaccel-validate.hpp @@ -82,7 +82,7 @@ namespace rawaccel { error("cap"" must be positive"); } - if (args.accel_motivity <= 0 || + if (args.growth_rate <= 0 || args.accel_natural <= 0 || args.accel_classic <= 0) { error("acceleration"" must be positive"); diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs index 6343ca2..7baf5ed 100644 --- a/grapher/Layouts/LayoutBase.cs +++ b/grapher/Layouts/LayoutBase.cs @@ -16,6 +16,7 @@ namespace grapher.Layouts public const string Weight = "Weight"; public const string Smooth = "Smooth"; public const string Gain = "Gain"; + public const string GrowthRate = "Growth Rate"; public LayoutBase() { diff --git a/grapher/Layouts/MotivityLayout.cs b/grapher/Layouts/MotivityLayout.cs index d108d16..e9c81f4 100644 --- a/grapher/Layouts/MotivityLayout.cs +++ b/grapher/Layouts/MotivityLayout.cs @@ -17,7 +17,7 @@ namespace grapher.Layouts LogarithmicCharts = true; GainSwitchOptionLayout = new OptionLayout(true, Gain); - AccelLayout = new OptionLayout(true, Acceleration); + AccelLayout = new OptionLayout(true, GrowthRate); ScaleLayout = new OptionLayout(false, string.Empty); CapLayout = new OptionLayout(false, string.Empty); WeightLayout = new OptionLayout(false, string.Empty); diff --git a/grapher/Models/Options/AccelTypeOptions.cs b/grapher/Models/Options/AccelTypeOptions.cs index 60bb53d..768d17d 100644 --- a/grapher/Models/Options/AccelTypeOptions.cs +++ b/grapher/Models/Options/AccelTypeOptions.cs @@ -250,7 +250,7 @@ namespace grapher } else if (args.mode == AccelMode.motivity) { - args.accelMotivity = Acceleration.Field.Data; + args.growthRate = Acceleration.Field.Data; } else { @@ -345,7 +345,7 @@ namespace grapher { if (args.mode == AccelMode.motivity) { - return args.accelMotivity; + return args.growthRate; } else if (args.mode == AccelMode.natural) { diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp index eb7d4d0..7136fc9 100644 --- a/wrapper/wrapper.cpp +++ b/wrapper/wrapper.cpp @@ -70,7 +70,7 @@ public value struct AccelArgs double cap; double accelClassic; double accelNatural; - double accelMotivity; + double growthRate; double motivity; double power; double scale; |