diff options
| author | Jacob Palecki <[email protected]> | 2020-09-22 15:26:08 -0700 |
|---|---|---|
| committer | Jacob Palecki <[email protected]> | 2020-09-22 15:26:08 -0700 |
| commit | f4ff6334df8a3fd66d13082606b69a78fa592237 (patch) | |
| tree | 6db3b486a4c19ed02d5c4368fd18d29b2abec78d /common | |
| parent | Save option to show velocity and gain on gui startup (diff) | |
| download | rawaccel-f4ff6334df8a3fd66d13082606b69a78fa592237.tar.xz rawaccel-f4ff6334df8a3fd66d13082606b69a78fa592237.zip | |
Remove sigmoidgain, only allow one instance of grapher to run at a time
Diffstat (limited to 'common')
| -rw-r--r-- | common/accel-sigmoidgain.hpp | 34 | ||||
| -rw-r--r-- | common/common.vcxitems | 1 | ||||
| -rw-r--r-- | common/rawaccel-settings.h | 2 | ||||
| -rw-r--r-- | common/rawaccel.hpp | 5 |
4 files changed, 2 insertions, 40 deletions
diff --git a/common/accel-sigmoidgain.hpp b/common/accel-sigmoidgain.hpp deleted file mode 100644 index bed2f16..0000000 --- a/common/accel-sigmoidgain.hpp +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once - -#include <math.h> - -#include "accel-base.hpp" - -namespace rawaccel { - - /// <summary> Struct to hold sigmoid (s-shaped) gain implementation. </summary> - struct sigmoidgain_impl { - double rate; - double limit; - double additive_constant; - double integration_constant; - - sigmoidgain_impl(const accel_args& args) : - rate(args.rate), limit(args.limit - 1) - { - additive_constant = exp(rate * args.midpoint); - integration_constant = log(1 + additive_constant); - } - - inline double operator()(double speed) const { - //f(x) = k/(1+e^(-m(c-x))) - double scaled_speed = rate * speed; - return limit * ((log(additive_constant+exp(scaled_speed)) - integration_constant)/scaled_speed); - } - - inline double legacy_offset(double speed) const { return operator()(speed); } - }; - - using accel_sigmoidgain = additive_accel<sigmoidgain_impl>; - -} diff --git a/common/common.vcxitems b/common/common.vcxitems index fdf5cf4..3407cf2 100644 --- a/common/common.vcxitems +++ b/common/common.vcxitems @@ -24,7 +24,6 @@ <ClInclude Include="$(MSBuildThisFileDirectory)accel-naturalgain.hpp" /> <ClInclude Include="$(MSBuildThisFileDirectory)accel-noaccel.hpp" /> <ClInclude Include="$(MSBuildThisFileDirectory)accel-power.hpp" /> - <ClInclude Include="$(MSBuildThisFileDirectory)accel-sigmoidgain.hpp" /> <ClInclude Include="$(MSBuildThisFileDirectory)rawaccel-error.hpp" /> <ClInclude Include="$(MSBuildThisFileDirectory)rawaccel-io.hpp" /> <ClInclude Include="$(MSBuildThisFileDirectory)rawaccel-settings.h" /> diff --git a/common/rawaccel-settings.h b/common/rawaccel-settings.h index 00289b6..2ba6a98 100644 --- a/common/rawaccel-settings.h +++ b/common/rawaccel-settings.h @@ -6,7 +6,7 @@ namespace rawaccel { enum class accel_mode { - linear, classic, natural, naturalgain, sigmoidgain, power, logarithm, motivity, noaccel + linear, classic, natural, naturalgain, power, logarithm, motivity, noaccel }; struct settings { diff --git a/common/rawaccel.hpp b/common/rawaccel.hpp index 3eb9181..2e627c9 100644 --- a/common/rawaccel.hpp +++ b/common/rawaccel.hpp @@ -12,7 +12,6 @@ #include "accel-natural.hpp" #include "accel-naturalgain.hpp" #include "accel-power.hpp" -#include "accel-sigmoidgain.hpp" #include "accel-motivity.hpp" #include "accel-noaccel.hpp" @@ -84,10 +83,9 @@ namespace rawaccel { case accel_mode::classic: return vis(var.u.classic); case accel_mode::natural: return vis(var.u.natural); case accel_mode::naturalgain: return vis(var.u.naturalgain); - case accel_mode::sigmoidgain: return vis(var.u.sigmoidgain); case accel_mode::power: return vis(var.u.power); case accel_mode::logarithm: return vis(var.u.logarithm); - case accel_mode::motivity: return vis(var.u.motivity); + case accel_mode::motivity: return vis(var.u.motivity); default: return vis(var.u.noaccel); } } @@ -102,7 +100,6 @@ namespace rawaccel { accel_classic classic; accel_natural natural; accel_naturalgain naturalgain; - accel_sigmoidgain sigmoidgain; accel_power power; accel_logarithm logarithm; accel_motivity motivity; |