Skip to content
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.

Sign up for GitHub

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

Added missing 'override' keywords #535

Merged
merged 1 commit into from
Oct 23, 2015
+17 −17
Merged

Added missing 'override' keywords #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions dart/dynamics/InverseKinematics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,10 +315,10 @@ class InverseKinematics : public common::Subject
virtual ~TaskSpaceRegion() = default;

// Documentation inherited
virtual std::unique_ptr<ErrorMethod> clone(InverseKinematics* _newIK) const;
std::unique_ptr<ErrorMethod> clone(InverseKinematics* _newIK) const override;

// Documentation inherited
virtual Eigen::Vector6d computeError() override;
Eigen::Vector6d computeError() override;

/// Setting this to true (which is default) will tell it to compute the
/// error based on the center of the Task Space Region instead of the edge
Expand Down Expand Up @@ -446,12 +446,12 @@ class InverseKinematics : public common::Subject
virtual ~JacobianDLS() = default;

// Documentation inherited
virtual std::unique_ptr<GradientMethod> clone(
InverseKinematics* _newIK) const;
std::unique_ptr<GradientMethod> clone(
InverseKinematics* _newIK) const override;

// Documentation inherited
virtual void computeGradient(const Eigen::Vector6d& _error,
Eigen::VectorXd& _grad) override;
void computeGradient(const Eigen::Vector6d& _error,
Eigen::VectorXd& _grad) override;

/// Set the damping coefficient. A higher damping coefficient will smooth
/// out behavior around singularities but will also result in less precision
Expand Down Expand Up @@ -484,12 +484,12 @@ class InverseKinematics : public common::Subject
virtual ~JacobianTranspose() = default;

// Documentation inherited
virtual std::unique_ptr<GradientMethod> clone(
InverseKinematics* _newIK) const;
std::unique_ptr<GradientMethod> clone(
InverseKinematics* _newIK) const override;

// Documentation inherited
virtual void computeGradient(const Eigen::Vector6d& _error,
Eigen::VectorXd& _grad) override;
void computeGradient(const Eigen::Vector6d& _error,
Eigen::VectorXd& _grad) override;
};

/// If this IK module is set to active, then it will be utilized by any
Expand Down
8 changes: 4 additions & 4 deletions dart/dynamics/MeshShape.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class MeshShape : public Shape {
virtual void update();

// Documentation inherited
virtual void setAlpha(double _alpha) override;
void setAlpha(double _alpha) override;

/// \brief
void setMesh(
Expand Down Expand Up @@ -129,7 +129,7 @@ class MeshShape : public Shape {
// Documentation inherited.
void draw(renderer::RenderInterface* _ri = nullptr,
const Eigen::Vector4d& _col = Eigen::Vector4d::Ones(),
bool _default = true) const;
bool _default = true) const override;

/// \brief
static const aiScene* loadMesh(const std::string& _fileName);
Expand All @@ -139,11 +139,11 @@ class MeshShape : public Shape {
const std::string& _uri, const common::ResourceRetrieverPtr& _retriever);

// Documentation inherited.
virtual Eigen::Matrix3d computeInertia(double _mass) const;
Eigen::Matrix3d computeInertia(double _mass) const override;

protected:
// Documentation inherited.
virtual void computeVolume();
void computeVolume() override;

private:
/// \brief
Expand Down
6 changes: 3 additions & 3 deletions dart/optimizer/nlopt/NloptSolver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,16 @@ class NloptSolver : public Solver
virtual ~NloptSolver();

// Documentation inherited
virtual bool solve();
bool solve() override;

// Documentation inherited
Eigen::VectorXd getLastConfiguration() const;

// Documentation inherited
virtual std::string getType() const override;
std::string getType() const override;

// Documentation inherited
virtual std::shared_ptr<Solver> clone() const override;
std::shared_ptr<Solver> clone() const override;

/// Copy the Properties of another NloptSolver
void copy(const NloptSolver& _other);
Expand Down