Skip to content
Snippets Groups Projects
Commit 195727a9 authored by Raphael Grimm's avatar Raphael Grimm
Browse files

Add override to overriding functions

parent 8ae2349a
No related branches found
No related tags found
No related merge requests found
......@@ -43,33 +43,33 @@ namespace armarx
NJointBimanualForceMPController(const RobotUnitPtr&, const NJointControllerConfigPtr& config, const VirtualRobot::RobotPtr&);
// NJointControllerInterface interface
std::string getClassName(const Ice::Current&) const;
std::string getClassName(const Ice::Current&) const override;
// NJointController interface
void rtRun(const IceUtil::Time& sensorValuesTimestamp, const IceUtil::Time& timeSinceLastIteration);
void rtRun(const IceUtil::Time& sensorValuesTimestamp, const IceUtil::Time& timeSinceLastIteration) override;
// NJointBimanualForceMPControllerInterface interface
void learnDMPFromFiles(const string& whichMP, const Ice::StringSeq& fileNames, const Ice::Current&);
bool isFinished(const Ice::Current&)
void learnDMPFromFiles(const string& whichMP, const Ice::StringSeq& fileNames, const Ice::Current&) override;
bool isFinished(const Ice::Current&) override
{
return finished;
}
void runDMP(const Ice::DoubleSeq& leftGoals, const Ice::DoubleSeq& rightGoals, const Ice::Current&);
void runDMP(const Ice::DoubleSeq& leftGoals, const Ice::DoubleSeq& rightGoals, const Ice::Current&) override;
double getCanVal(const Ice::Current&)
double getCanVal(const Ice::Current&) override
{
return canVal;
}
void setViaPoints(const string& whichDMP, double canVal, const Ice::DoubleSeq& viaPoint, const Ice::Current&);
void setViaPoints(const string& whichDMP, double canVal, const Ice::DoubleSeq& viaPoint, const Ice::Current&) override;
protected:
virtual void onPublish(const SensorAndControl&, const DebugDrawerInterfacePrx&, const DebugObserverInterfacePrx&);
virtual void onPublish(const SensorAndControl&, const DebugDrawerInterfacePrx&, const DebugObserverInterfacePrx&) override;
void onInitComponent();
void onDisconnectComponent();
void onInitComponent() override;
void onDisconnectComponent() override;
void controllerRun();
private:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment