-
Notifications
You must be signed in to change notification settings - Fork 77
Add speed limiter class #194
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
a513d2b
Add SpeedLimiter class
chapulina ac4dc2e
use chrono
chapulina a77208c
Ignite the API
chapulina a3ccb7c
docs
chapulina e8e3d3d
Merge branch 'ign-math6' into chapulina/6/speed_limiter
chapulina a581a15
codecheck
chapulina b0c0db1
Merge branch 'chapulina/6/speed_limiter' of ssh://github.com/ignition…
chapulina 8f724fd
Merge branch 'ign-math6' into chapulina/6/speed_limiter
chapulina 7a97a73
documentation and more tests
chapulina File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| /* | ||
| * Copyright (C) 2021 Open Source Robotics Foundation | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| #ifndef IGNITION_MATH_SYSTEMS_SPEEDLIMITER_HH_ | ||
| #define IGNITION_MATH_SYSTEMS_SPEEDLIMITER_HH_ | ||
|
|
||
| #include <chrono> | ||
| #include <memory> | ||
| #include <ignition/math/config.hh> | ||
| #include "ignition/math/Helpers.hh" | ||
|
|
||
| namespace ignition | ||
| { | ||
| namespace math | ||
| { | ||
| // Inline bracket to help doxygen filtering. | ||
| inline namespace IGNITION_MATH_VERSION_NAMESPACE { | ||
| // Forward declaration. | ||
| class SpeedLimiterPrivate; | ||
|
|
||
| /// \brief Class to limit velocity, acceleration and jerk. | ||
| class IGNITION_MATH_VISIBLE SpeedLimiter | ||
| { | ||
| /// \brief Constructor. | ||
| /// There are no limits by default. | ||
| public: SpeedLimiter(); | ||
|
|
||
| /// \brief Destructor. | ||
| public: ~SpeedLimiter(); | ||
|
|
||
| /// \brief Set minimum velocity limit in m/s, usually <= 0. | ||
| /// \param[in] _lim Minimum velocity. | ||
| public: void SetMinVelocity(double _lim); | ||
|
|
||
| /// \brief Get minimum velocity limit, defaults to negative infinity. | ||
| /// \return Minimum velocity. | ||
| public: double MinVelocity() const; | ||
|
|
||
| /// \brief Set maximum velocity limit in m/s, usually >= 0. | ||
| /// \param[in] _lim Maximum velocity. | ||
| public: void SetMaxVelocity(double _lim); | ||
|
|
||
| /// \brief Get maximum velocity limit, defaults to positive infinity. | ||
| /// \return Maximum velocity. | ||
| public: double MaxVelocity() const; | ||
|
|
||
| /// \brief Set minimum acceleration limit in m/s^2, usually <= 0. | ||
| /// \param[in] _lim Minimum acceleration. | ||
| public: void SetMinAcceleration(double _lim); | ||
|
|
||
| /// \brief Get minimum acceleration limit, defaults to negative infinity. | ||
| /// \return Minimum acceleration. | ||
| public: double MinAcceleration() const; | ||
|
|
||
| /// \brief Set maximum acceleration limit in m/s^2, usually >= 0. | ||
| /// \param[in] _lim Maximum acceleration. | ||
| public: void SetMaxAcceleration(double _lim); | ||
|
|
||
| /// \brief Get maximum acceleration limit, defaults to positive infinity. | ||
| /// \return Maximum acceleration. | ||
| public: double MaxAcceleration() const; | ||
|
|
||
| /// \brief Set minimum jerk limit in m/s^3, usually <= 0. | ||
| /// \param[in] _lim Minimum jerk. | ||
| public: void SetMinJerk(double _lim); | ||
|
|
||
| /// \brief Get minimum jerk limit, defaults to negative infinity. | ||
| /// \return Minimum jerk. | ||
| public: double MinJerk() const; | ||
|
|
||
| /// \brief Set maximum jerk limit in m/s^3, usually >= 0. | ||
| /// \param[in] _lim Maximum jerk. | ||
| public: void SetMaxJerk(double _lim); | ||
|
|
||
| /// \brief Get maximum jerk limit, defaults to positive infinity. | ||
| /// \return Maximum jerk. | ||
| public: double MaxJerk() const; | ||
|
|
||
| /// \brief Limit velocity, acceleration and jerk. | ||
| /// \param [in, out] _vel Velocity to limit [m/s]. | ||
| /// \param [in] _prevVel Previous velocity to _vel [m/s]. | ||
| /// \param [in] _prevPrevVel Previous velocity to _prevVel [m/s]. | ||
| /// \param [in] _dt Time step. | ||
| /// \return Limiting difference, which is (out _vel - in _vel). | ||
| public: double Limit(double &_vel, | ||
| double _prevVel, | ||
| double _prevPrevVel, | ||
| std::chrono::steady_clock::duration _dt) const; | ||
|
|
||
| /// \brief Limit the velocity. | ||
| /// \param [in, out] _vel Velocity to limit [m/s]. | ||
| /// \return Limiting difference, which is (out _vel - in _vel). | ||
| public: double LimitVelocity(double &_vel) const; | ||
|
|
||
| /// \brief Limit the acceleration using a first-order backward difference | ||
| /// method. | ||
| /// \param [in, out] _vel Velocity [m/s]. | ||
| /// \param [in] _prevVel Previous velocity [m/s]. | ||
| /// \param [in] _dt Time step. | ||
| /// \return Limiting difference, which is (out _vel - in _vel). | ||
| public: double LimitAcceleration( | ||
| double &_vel, | ||
| double _prevVel, | ||
| std::chrono::steady_clock::duration _dt) const; | ||
|
|
||
| /// \brief Limit the jerk using a second-order backward difference method. | ||
| /// \param [in, out] _vel Velocity to limit [m/s]. | ||
| /// \param [in] _prevVel Previous velocity to v [m/s]. | ||
| /// \param [in] _prevPrevVel Previous velocity to prevVel [m/s]. | ||
| /// \param [in] _dt Time step. | ||
| /// \return Limiting difference, which is (out _vel - in _vel). | ||
| /// \see http://en.wikipedia.org/wiki/Jerk_%28physics%29#Motion_control. | ||
| public: double LimitJerk( | ||
| double &_vel, | ||
| double _prevVel, | ||
| double _prevPrevVel, | ||
| std::chrono::steady_clock::duration _dt) const; | ||
|
|
||
| #ifdef _WIN32 | ||
| // Disable warning C4251 which is triggered by | ||
| // std::unique_ptr | ||
| #pragma warning(push) | ||
| #pragma warning(disable: 4251) | ||
| #endif | ||
| /// \brief Private data pointer. | ||
| private: std::unique_ptr<SpeedLimiterPrivate> dataPtr; | ||
| #ifdef _WIN32 | ||
| #pragma warning(pop) | ||
| #endif | ||
| }; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #endif |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,195 @@ | ||
| /* | ||
| * Copyright (C) 2021 Open Source Robotics Foundation | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| #include "ignition/math/Helpers.hh" | ||
| #include "ignition/math/SpeedLimiter.hh" | ||
|
|
||
| using namespace ignition; | ||
| using namespace math; | ||
|
|
||
| /// \brief Private SpeedLimiter data class. | ||
| class ignition::math::SpeedLimiterPrivate | ||
| { | ||
| /// \brief Minimum velocity limit. | ||
| public: double minVelocity{-std::numeric_limits<double>::infinity()}; | ||
|
|
||
| /// \brief Maximum velocity limit. | ||
| public: double maxVelocity{std::numeric_limits<double>::infinity()}; | ||
|
|
||
| /// \brief Minimum acceleration limit. | ||
| public: double minAcceleration{-std::numeric_limits<double>::infinity()}; | ||
|
|
||
| /// \brief Maximum acceleration limit. | ||
| public: double maxAcceleration{std::numeric_limits<double>::infinity()}; | ||
|
|
||
| /// \brief Minimum jerk limit. | ||
| public: double minJerk{-std::numeric_limits<double>::infinity()}; | ||
|
|
||
| /// \brief Maximum jerk limit. | ||
| public: double maxJerk{std::numeric_limits<double>::infinity()}; | ||
| }; | ||
|
|
||
| ////////////////////////////////////////////////// | ||
| SpeedLimiter::SpeedLimiter() | ||
| : dataPtr(std::make_unique<SpeedLimiterPrivate>()) | ||
| { | ||
| } | ||
|
|
||
| ////////////////////////////////////////////////// | ||
| SpeedLimiter::~SpeedLimiter() = default; | ||
|
|
||
| ////////////////////////////////////////////////// | ||
| void SpeedLimiter::SetMinVelocity(double _lim) | ||
| { | ||
| this->dataPtr->minVelocity = _lim; | ||
| } | ||
|
|
||
| ////////////////////////////////////////////////// | ||
| double SpeedLimiter::MinVelocity() const | ||
| { | ||
| return this->dataPtr->minVelocity; | ||
| } | ||
|
|
||
| ////////////////////////////////////////////////// | ||
| void SpeedLimiter::SetMaxVelocity(double _lim) | ||
| { | ||
| this->dataPtr->maxVelocity = _lim; | ||
| } | ||
|
|
||
| ////////////////////////////////////////////////// | ||
| double SpeedLimiter::MaxVelocity() const | ||
| { | ||
| return this->dataPtr->maxVelocity; | ||
| } | ||
|
|
||
| ////////////////////////////////////////////////// | ||
| void SpeedLimiter::SetMinAcceleration(double _lim) | ||
| { | ||
| this->dataPtr->minAcceleration = _lim; | ||
| } | ||
|
|
||
| ////////////////////////////////////////////////// | ||
| double SpeedLimiter::MinAcceleration() const | ||
| { | ||
| return this->dataPtr->minAcceleration; | ||
| } | ||
|
|
||
| ////////////////////////////////////////////////// | ||
| void SpeedLimiter::SetMaxAcceleration(double _lim) | ||
| { | ||
| this->dataPtr->maxAcceleration = _lim; | ||
| } | ||
|
|
||
| ////////////////////////////////////////////////// | ||
| double SpeedLimiter::MaxAcceleration() const | ||
| { | ||
| return this->dataPtr->maxAcceleration; | ||
| } | ||
|
|
||
| ////////////////////////////////////////////////// | ||
| void SpeedLimiter::SetMinJerk(double _lim) | ||
| { | ||
| this->dataPtr->minJerk = _lim; | ||
| } | ||
|
|
||
| ////////////////////////////////////////////////// | ||
| double SpeedLimiter::MinJerk() const | ||
| { | ||
| return this->dataPtr->minJerk; | ||
| } | ||
|
|
||
| ////////////////////////////////////////////////// | ||
| void SpeedLimiter::SetMaxJerk(double _lim) | ||
| { | ||
| this->dataPtr->maxJerk = _lim; | ||
| } | ||
|
|
||
| ////////////////////////////////////////////////// | ||
| double SpeedLimiter::MaxJerk() const | ||
| { | ||
| return this->dataPtr->maxJerk; | ||
| } | ||
|
|
||
| ////////////////////////////////////////////////// | ||
| double SpeedLimiter::Limit(double &_vel, double _prevVel, double _prevPrevVel, | ||
| std::chrono::steady_clock::duration _dt) const | ||
| { | ||
| const double vUnclamped = _vel; | ||
|
|
||
| this->LimitJerk(_vel, _prevVel, _prevPrevVel, _dt); | ||
| this->LimitAcceleration(_vel, _prevVel, _dt); | ||
| this->LimitVelocity(_vel); | ||
|
|
||
| return _vel - vUnclamped; | ||
| } | ||
|
|
||
| ////////////////////////////////////////////////// | ||
| double SpeedLimiter::LimitVelocity(double &_vel) const | ||
| { | ||
| const double vUnclamped = _vel; | ||
|
|
||
| _vel = ignition::math::clamp( | ||
| _vel, this->dataPtr->minVelocity, this->dataPtr->maxVelocity); | ||
|
|
||
| return _vel - vUnclamped; | ||
| } | ||
|
|
||
| ////////////////////////////////////////////////// | ||
| double SpeedLimiter::LimitAcceleration(double &_vel, double _prevVel, | ||
| std::chrono::steady_clock::duration _dt) const | ||
| { | ||
| const double vUnclamped = _vel; | ||
|
|
||
| const double dtSec = std::chrono::duration<double>(_dt).count(); | ||
|
|
||
| if (equal(dtSec, 0.0)) | ||
| return 0.0; | ||
|
|
||
| const double accUnclamped = (_vel - _prevVel) / dtSec; | ||
|
|
||
| const double accClamped = ignition::math::clamp(accUnclamped, | ||
| this->dataPtr->minAcceleration, this->dataPtr->maxAcceleration); | ||
|
|
||
| _vel = _prevVel + accClamped * dtSec; | ||
|
|
||
| return _vel - vUnclamped; | ||
| } | ||
|
|
||
| ////////////////////////////////////////////////// | ||
| double SpeedLimiter::LimitJerk(double &_vel, double _prevVel, | ||
| double _prevPrevVel, std::chrono::steady_clock::duration _dt) const | ||
| { | ||
| const double vUnclamped = _vel; | ||
|
|
||
| const double dtSec = std::chrono::duration<double>(_dt).count(); | ||
|
|
||
| if (equal(dtSec, 0.0)) | ||
| return 0.0; | ||
|
|
||
| const double accUnclamped = (_vel - _prevVel) / dtSec; | ||
| const double accPrev = (_prevVel - _prevPrevVel) / dtSec; | ||
| const double jerkUnclamped = (accUnclamped - accPrev) / dtSec; | ||
|
|
||
| const double jerkClamped = ignition::math::clamp(jerkUnclamped, | ||
| this->dataPtr->minJerk, this->dataPtr->maxJerk); | ||
|
|
||
| const double accClamped = accPrev + jerkClamped * dtSec; | ||
|
|
||
| _vel = _prevVel + accClamped * dtSec; | ||
|
|
||
| return _vel - vUnclamped; | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.