Skip to content

Commit

Permalink
Merge branch 'ign-math6' into ahcorde/pybind11/vector3Stats
Browse files Browse the repository at this point in the history
  • Loading branch information
chapulina authored Dec 30, 2021
2 parents e0d98bb + 5e25570 commit 0dbae0b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions include/ignition/math/PID.hh
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ namespace ignition
/// \param[in] _i integral gain value
public: void SetIGain(const double _i);

/// \brief Set the derivtive Gain.
/// \brief Set the derivative Gain.
/// \param[in] _d derivative gain value
public: void SetDGain(const double _d);

Expand Down Expand Up @@ -149,7 +149,7 @@ namespace ignition
/// \return The maximum value
public: double CmdMax() const;

/// \brief Get the maximum value for the command.
/// \brief Get the minimun value for the command.
/// \return The maximum value
public: double CmdMin() const;

Expand Down
6 changes: 3 additions & 3 deletions include/ignition/math/Quaternion.hh
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,8 @@ namespace ignition
}

/// \brief Return rotation as axis and angle
/// \param[in] _axis rotation axis
/// \param[in] _angle ccw angle in radians
/// \param[out] _axis rotation axis
/// \param[out] _angle ccw angle in radians
public: void ToAxis(Vector3<T> &_axis, T &_angle) const
{
T len = this->qx*this->qx + this->qy*this->qy + this->qz*this->qz;
Expand Down Expand Up @@ -590,7 +590,7 @@ namespace ignition
}
}

/// \brief Scale a Quaternion<T>ion
/// \brief Scale a Quaternion<T>
/// \param[in] _scale Amount to scale this rotation
public: void Scale(T _scale)
{
Expand Down
4 changes: 2 additions & 2 deletions include/ignition/math/Spline.hh
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ namespace ignition
/// \return arc length or INF on error.
public: double ArcLength() const;

/// \brief Gets spline arc length up to
/// \brief Sets spline arc length up to
/// a given parameter value \p _t.
/// \param[in] _t parameter value (range 0 to 1).
/// \return arc length up to \p _t or INF on error.
public: double ArcLength(const double _t) const;

/// \brief Gets a spline segment arc length.
/// \brief Sets a spline segment arc length.
/// \param[in] _index of the spline segment.
/// \param[in] _t parameter value (range 0 to 1).
/// \return arc length of a given segment up to
Expand Down

0 comments on commit 0dbae0b

Please sign in to comment.