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
42575d2a
Commit
42575d2a
authored
8 years ago
by
Joseph Mirabel
Committed by
Joseph Mirabel
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
graph::Edge now stores the RelativeMotion matrix
parent
85803c44
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/graph/edge.hh
+9
-0
9 additions, 0 deletions
include/hpp/manipulation/graph/edge.hh
src/graph/edge.cc
+3
-4
3 additions, 4 deletions
src/graph/edge.cc
with
12 additions
and
4 deletions
include/hpp/manipulation/graph/edge.hh
+
9
−
0
View file @
42575d2a
...
@@ -19,6 +19,7 @@
...
@@ -19,6 +19,7 @@
#include
<hpp/core/constraint-set.hh>
#include
<hpp/core/constraint-set.hh>
#include
<hpp/core/steering-method.hh>
#include
<hpp/core/steering-method.hh>
#include
<hpp/core/relative-motion.hh>
#include
<hpp/core/path.hh>
#include
<hpp/core/path.hh>
#include
"hpp/manipulation/config.hh"
#include
"hpp/manipulation/config.hh"
...
@@ -59,6 +60,8 @@ namespace hpp {
...
@@ -59,6 +60,8 @@ namespace hpp {
class
HPP_MANIPULATION_DLLAPI
Edge
:
public
GraphComponent
class
HPP_MANIPULATION_DLLAPI
Edge
:
public
GraphComponent
{
{
public:
public:
typedef
core
::
RelativeMotion
RelativeMotion
;
/// Destructor
/// Destructor
virtual
~
Edge
();
virtual
~
Edge
();
...
@@ -120,6 +123,11 @@ namespace hpp {
...
@@ -120,6 +123,11 @@ namespace hpp {
return
pathValidation_
->
get
();
return
pathValidation_
->
get
();
}
}
const
RelativeMotion
::
matrix_type
&
relativeMotion
()
const
{
return
relMotion_
;
}
/// Get direction of the path compare to the edge
/// Get direction of the path compare to the edge
/// \return true is reverse
/// \return true is reverse
virtual
bool
direction
(
const
core
::
PathPtr_t
&
path
)
const
;
virtual
bool
direction
(
const
core
::
PathPtr_t
&
path
)
const
;
...
@@ -187,6 +195,7 @@ namespace hpp {
...
@@ -187,6 +195,7 @@ namespace hpp {
SteeringMethod_t
*
steeringMethod_
;
SteeringMethod_t
*
steeringMethod_
;
/// Path validation associated to the edge
/// Path validation associated to the edge
mutable
RelativeMotion
::
matrix_type
relMotion_
;
PathValidation_t
*
pathValidation_
;
PathValidation_t
*
pathValidation_
;
/// Weak pointer to itself.
/// Weak pointer to itself.
...
...
This diff is collapsed.
Click to expand it.
src/graph/edge.cc
+
3
−
4
View file @
42575d2a
...
@@ -254,10 +254,9 @@ namespace hpp {
...
@@ -254,10 +254,9 @@ namespace hpp {
// TODO this path validation will not contain obstacles added after
// TODO this path validation will not contain obstacles added after
// its creation.
// its creation.
pathValidation_
->
set
(
problem
->
pathValidationFactory
());
pathValidation_
->
set
(
problem
->
pathValidationFactory
());
using
core
::
RelativeMotion
;
relMotion_
=
RelativeMotion
::
matrix
(
g
->
robot
());
RelativeMotion
::
matrix_type
matrix
(
RelativeMotion
::
matrix
(
g
->
robot
()));
RelativeMotion
::
fromConstraint
(
relMotion_
,
g
->
robot
(),
constraint
);
RelativeMotion
::
fromConstraint
(
matrix
,
g
->
robot
(),
constraint
);
pathValidation_
->
get
()
->
filterCollisionPairs
(
relMotion_
);
pathValidation_
->
get
()
->
filterCollisionPairs
(
matrix
);
return
constraint
;
return
constraint
;
}
}
...
...
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