Fix natural legacy algorithm, rename accelNatural to decayRate

8 files changed, 10 insertions, 9 deletions

diff --git a/common/accel-natural.hpp b/common/accel-natural.hpp
index 31ed190..1f18e0d 100644
--- a/common/accel-natural.hpp
+++ b/common/accel-natural.hpp
@@ -16,7 +16,7 @@ namespace rawaccel {
 			offset(args.offset),
 			limit(args.limit - 1)
 		{
-			accel = args.accel_natural / fabs(limit);
+			accel = args.decay_rate / fabs(limit);
 		}
 	};
 
@@ -28,7 +28,7 @@ namespace rawaccel {
 
 			double offset_x = x - offset;
 			double decay = exp(-accel * offset_x);
-			return limit * (1 - (decay * offset_x + offset) / x) + 1;
+			return limit * (1 - (decay))  + 1;
 		}
 
 		using natural_base::natural_base;
diff --git a/common/rawaccel-base.hpp b/common/rawaccel-base.hpp
index fc49a62..7dc1b96 100644
--- a/common/rawaccel-base.hpp
+++ b/common/rawaccel-base.hpp
@@ -51,7 +51,7 @@ namespace rawaccel {
         double offset = 0;
         double cap = 1.5;
         double accel_classic = 0.005;
-        double accel_natural = 0.1;
+        double decay_rate = 0.1;
         double growth_rate = 1;
         double motivity = 1.5;
         double power = 2;
diff --git a/common/rawaccel-validate.hpp b/common/rawaccel-validate.hpp
index 338fbdc..230ddac 100644
--- a/common/rawaccel-validate.hpp
+++ b/common/rawaccel-validate.hpp
@@ -83,7 +83,7 @@ namespace rawaccel {
 			}
 
 			if (args.growth_rate <= 0 ||
-				args.accel_natural <= 0 ||
+				args.decay_rate <= 0 ||
 				args.accel_classic <= 0) {
 				error("acceleration"" must be positive");
 			}
diff --git a/converter/converter.cpp b/converter/converter.cpp
index b1761b0..70593a7 100644
--- a/converter/converter.cpp
+++ b/converter/converter.cpp
@@ -120,7 +120,7 @@ ra::accel_args convert_natural(const ia_settings_t& ia_settings, bool legacy) {
     ra::accel_args args;
 
     args.limit = 1 + std::abs(cap - sens) / sens;
-    args.accel_natural = accel * prescale / sens;
+    args.decay_rate = accel * prescale / sens;
     args.offset = get("Offset").value_or(0);
     args.mode = ra::accel_mode::natural;
     args.legacy = legacy;
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
             {
diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp
index 7136fc9..a28e199 100644
--- a/wrapper/wrapper.cpp
+++ b/wrapper/wrapper.cpp
@@ -69,7 +69,7 @@ public value struct AccelArgs
     double offset;
     double cap;
     double accelClassic;
-    double accelNatural;
+    double decayRate;
     double growthRate;
     double motivity;
     double power;