Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Florian Leander Singer
RobotAPI
Commits
195727a9
Commit
195727a9
authored
6 years ago
by
Raphael Grimm
Browse files
Options
Downloads
Patches
Plain Diff
Add override to overriding functions
parent
8ae2349a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualForceMPController.h
+10
-10
10 additions, 10 deletions
...ntrollers/DMPController/NJointBimanualForceMPController.h
with
10 additions
and
10 deletions
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualForceMPController.h
+
10
−
10
View file @
195727a9
...
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment