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
Guilhem Saurel
hpp-manipulation
Commits
fb5743c5
Commit
fb5743c5
authored
4 years ago
by
Florent Lamiraux
Browse files
Options
Downloads
Patches
Plain Diff
Rename RelativeTransformationSE3 -> RelativeTransformationR3xSO3
to comply with modification in hpp-constraints.
parent
bd8e4a6b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/hpp/manipulation/fwd.hh
+2
-1
2 additions, 1 deletion
include/hpp/manipulation/fwd.hh
src/handle.cc
+4
-4
4 additions, 4 deletions
src/handle.cc
with
6 additions
and
5 deletions
include/hpp/manipulation/fwd.hh
+
2
−
1
View file @
fb5743c5
...
...
@@ -75,7 +75,8 @@ namespace hpp {
typedef
constraints
::
RelativeOrientationPtr_t
RelativeOrientationPtr_t
;
typedef
constraints
::
RelativePositionPtr_t
RelativePositionPtr_t
;
typedef
constraints
::
RelativeTransformation
RelativeTransformation
;
typedef
constraints
::
RelativeTransformationSE3
RelativeTransformationSE3
;
typedef
constraints
::
RelativeTransformationR3xSO3
RelativeTransformationR3xSO3
;
typedef
constraints
::
RelativeTransformationPtr_t
RelativeTransformationPtr_t
;
typedef
core
::
value_type
value_type
;
...
...
This diff is collapsed.
Click to expand it.
src/handle.cc
+
4
−
4
View file @
fb5743c5
...
...
@@ -132,7 +132,7 @@ namespace hpp {
gripper
->
objectPositionInJoint
(),
localPosition
(),
6
*
constraints
::
EqualToZero
);
}
return
Implicit
::
create
(
RelativeTransformation
SE
3
::
create
return
Implicit
::
create
(
RelativeTransformation
R3xSO
3
::
create
(
n
,
robot
(),
gripper
->
joint
(),
joint
(),
gripper
->
objectPositionInJoint
(),
localPosition
()),
6
*
constraints
::
EqualToZero
,
mask_
);
...
...
@@ -153,7 +153,7 @@ namespace hpp {
r
->
configSize
(),
r
->
numberDof
(),
n
)),
ComparisonTypes_t
());
}
else
{
std
::
vector
<
bool
>
Cmask
=
complementMask
(
mask_
);
return
Implicit
::
create
(
RelativeTransformation
SE
3
::
create
return
Implicit
::
create
(
RelativeTransformation
R3xSO
3
::
create
(
n
,
r
,
gripper
->
joint
(),
joint
(),
gripper
->
objectPositionInJoint
(),
localPosition
()),
6
*
constraints
::
Equality
,
Cmask
);
...
...
@@ -182,7 +182,7 @@ namespace hpp {
(
n
,
robot
(),
gripper
->
joint
(),
joint
(),
gripper
->
objectPositionInJoint
(),
localPosition
(),
comp
);
}
return
Implicit
::
create
(
RelativeTransformation
SE
3
::
create
return
Implicit
::
create
(
RelativeTransformation
R3xSO
3
::
create
(
n
,
robot
(),
gripper
->
joint
(),
joint
(),
gripper
->
objectPositionInJoint
(),
localPosition
()),
comp
,
std
::
vector
<
bool
>
(
6
,
true
));
...
...
@@ -197,7 +197,7 @@ namespace hpp {
n
=
"Pregrasp_ "
+
maskToStr
(
mask_
)
+
"_"
+
name
()
+
"_"
+
gripper
->
name
();
ImplicitPtr_t
result
(
Implicit
::
create
(
RelativeTransformation
SE
3
::
create
(
RelativeTransformation
R3xSO
3
::
create
(
n
,
robot
(),
gripper
->
joint
(),
joint
(),
M
,
localPosition
()),
6
*
constraints
::
EqualToZero
,
mask_
));
...
...
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