From 33317e79489848ae537ac78b9c9e70372857aee8 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 29 Jul 2020 00:35:39 -0700 Subject: Separate accel implementations into files --- common/accel_power.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 common/accel_power.cpp (limited to 'common/accel_power.cpp') diff --git a/common/accel_power.cpp b/common/accel_power.cpp new file mode 100644 index 0000000..26f800d --- /dev/null +++ b/common/accel_power.cpp @@ -0,0 +1,24 @@ +#pragma once + +#define _USE_MATH_DEFINES +#include + +#include "accel_types.hpp" + +namespace rawaccel { + accel_power::accel_power(accel_args args) + : accel_implentation(args) + { curve_constant_two++; } + + double accel_power::accelerate(double speed) { + // f(x) = (mx)^k - 1 + // The subtraction of 1 occurs with later addition of 1 in mind, + // so that the input vector is directly multiplied by (mx)^k (if unweighted) + return (offset > 0 && speed < 1) ? 0 : pow(speed * curve_constant_one, curve_constant_two) - 1; + } + + void accel_power::verify(accel_args args) { + accel_implentation::verify(args); + if (args.lim_exp <= 0) error("exponent must be greater than 0"); + } +} -- cgit v1.2.3 From 7963edee802d5a7b51f1867a5133857c403c8ef6 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Wed, 29 Jul 2020 01:10:29 -0700 Subject: Inline methods for linking, and fix sens application bug --- common/accel_power.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'common/accel_power.cpp') diff --git a/common/accel_power.cpp b/common/accel_power.cpp index 26f800d..f104554 100644 --- a/common/accel_power.cpp +++ b/common/accel_power.cpp @@ -6,18 +6,18 @@ #include "accel_types.hpp" namespace rawaccel { - accel_power::accel_power(accel_args args) + inline accel_power::accel_power(accel_args args) : accel_implentation(args) { curve_constant_two++; } - double accel_power::accelerate(double speed) { + inline double accel_power::accelerate(double speed) { // f(x) = (mx)^k - 1 // The subtraction of 1 occurs with later addition of 1 in mind, // so that the input vector is directly multiplied by (mx)^k (if unweighted) return (offset > 0 && speed < 1) ? 0 : pow(speed * curve_constant_one, curve_constant_two) - 1; } - void accel_power::verify(accel_args args) { + inline void accel_power::verify(accel_args args) { accel_implentation::verify(args); if (args.lim_exp <= 0) error("exponent must be greater than 0"); } -- cgit v1.2.3