diff options
Diffstat (limited to 'common/accel-jump.hpp')
| -rw-r--r-- | common/accel-jump.hpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/common/accel-jump.hpp b/common/accel-jump.hpp index 30f9a49..198891a 100644 --- a/common/accel-jump.hpp +++ b/common/accel-jump.hpp @@ -32,7 +32,7 @@ namespace rawaccel { double smooth(double x) const { - return step.y * 1 / (1 + decay(x)); + return step.y / (1 + decay(x)); } double smooth_antideriv(double x) const @@ -61,8 +61,11 @@ namespace rawaccel { double operator()(double x) const { + if (x <= 0) return 1; + if (is_smooth()) return 1 + (smooth_antideriv(x) + C) / x; - else if (x < step.x) return 1; + + if (x < step.x) return 1; else return 1 + step.y * (x - step.x) / x; } }; |