Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
hpp-manipulation
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Humanoid Path Planner
hpp-manipulation
Commits
172cc6fe
Commit
172cc6fe
authored
9 years ago
by
Joseph Mirabel
Committed by
Joseph Mirabel
9 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Cosmetic changes
parent
1845551a
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/hpp/manipulation/graph/graph-component.hh
+4
-1
4 additions, 1 deletion
include/hpp/manipulation/graph/graph-component.hh
src/graph/graph-component.cc
+0
-5
0 additions, 5 deletions
src/graph/graph-component.cc
src/handle.cc
+3
-3
3 additions, 3 deletions
src/handle.cc
with
7 additions
and
9 deletions
include/hpp/manipulation/graph/graph-component.hh
+
4
−
1
View file @
172cc6fe
...
@@ -56,7 +56,10 @@ namespace hpp {
...
@@ -56,7 +56,10 @@ namespace hpp {
void
name
(
const
std
::
string
&
name
)
HPP_MANIPULATION_DEPRECATED
;
void
name
(
const
std
::
string
&
name
)
HPP_MANIPULATION_DEPRECATED
;
/// Return the component id.
/// Return the component id.
std
::
size_t
id
()
const
;
const
std
::
size_t
&
id
()
const
{
return
id_
;
}
/// Add core::NumericalConstraint to the component.
/// Add core::NumericalConstraint to the component.
/// \param passiveDofs see ConfigProjector::addNumericalConstraint
/// \param passiveDofs see ConfigProjector::addNumericalConstraint
...
...
This diff is collapsed.
Click to expand it.
src/graph/graph-component.cc
+
0
−
5
View file @
172cc6fe
...
@@ -51,11 +51,6 @@ namespace hpp {
...
@@ -51,11 +51,6 @@ namespace hpp {
return
components_
;
return
components_
;
}
}
std
::
size_t
GraphComponent
::
id
()
const
{
return
id_
;
}
std
::
ostream
&
GraphComponent
::
print
(
std
::
ostream
&
os
)
const
std
::
ostream
&
GraphComponent
::
print
(
std
::
ostream
&
os
)
const
{
{
os
<<
id
()
<<
" : "
<<
name
();
os
<<
id
()
<<
" : "
<<
name
();
...
...
This diff is collapsed.
Click to expand it.
src/handle.cc
+
3
−
3
View file @
172cc6fe
...
@@ -82,7 +82,7 @@ namespace hpp {
...
@@ -82,7 +82,7 @@ namespace hpp {
std
::
vector
<
bool
>
mask
=
list_of
(
true
)(
true
)(
true
)(
true
)(
true
)(
true
);
std
::
vector
<
bool
>
mask
=
list_of
(
true
)(
true
)(
true
)(
true
)(
true
)(
true
);
return
NumericalConstraintPtr_t
return
NumericalConstraintPtr_t
(
NumericalConstraint
::
create
(
RelativeTransformation
::
create
(
NumericalConstraint
::
create
(
RelativeTransformation
::
create
(
"
T
ra
nsformation
_(1,1,1,1,1,1)_"
+
name
()
(
"
G
ra
sp
_(1,1,1,1,1,1)_"
+
name
()
+
"_"
+
gripper
->
name
(),
+
"_"
+
gripper
->
name
(),
gripper
->
joint
()
->
robot
(),
gripper
->
joint
()
->
robot
(),
gripper
->
joint
(),
joint
(),
gripper
->
joint
(),
joint
(),
...
@@ -97,7 +97,7 @@ namespace hpp {
...
@@ -97,7 +97,7 @@ namespace hpp {
return
NumericalConstraint
::
create
(
return
NumericalConstraint
::
create
(
boost
::
shared_ptr
<
ZeroDiffFunc
>
(
new
ZeroDiffFunc
(
boost
::
shared_ptr
<
ZeroDiffFunc
>
(
new
ZeroDiffFunc
(
robot
->
configSize
(),
robot
->
numberDof
(),
robot
->
configSize
(),
robot
->
numberDof
(),
"
T
ra
nsformation
_(0,0,0,0,0,0)_"
+
name
()
+
"_"
+
gripper
->
name
()
"
G
ra
spComp
_(0,0,0,0,0,0)_"
+
name
()
+
"_"
+
gripper
->
name
()
))
))
);
);
}
}
...
@@ -111,7 +111,7 @@ namespace hpp {
...
@@ -111,7 +111,7 @@ namespace hpp {
*
Transform3f
(
fcl
::
Vec3f
(
shift
,
0
,
0
));
*
Transform3f
(
fcl
::
Vec3f
(
shift
,
0
,
0
));
return
NumericalConstraintPtr_t
return
NumericalConstraintPtr_t
(
NumericalConstraint
::
create
(
RelativeTransformation
::
create
(
NumericalConstraint
::
create
(
RelativeTransformation
::
create
(
"
Transformation
_(1,1,1,1,1,1)_"
+
name
()
(
"
Pregrasp
_(1,1,1,1,1,1)_"
+
name
()
+
"_"
+
gripper
->
name
(),
+
"_"
+
gripper
->
name
(),
gripper
->
joint
()
->
robot
(),
gripper
->
joint
()
->
robot
(),
gripper
->
joint
(),
joint
(),
gripper
->
joint
(),
joint
(),
...
...
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