Fix natural legacy algorithm, rename accelNatural to decayRate

3 files changed, 4 insertions, 4 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");
 			}