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
3c0cf959
Commit
3c0cf959
authored
9 years ago
by
Joseph Mirabel
Committed by
Joseph Mirabel
9 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Node containing edges can be sepcified by the user.
parent
74d91cda
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
+18
-6
18 additions, 6 deletions
include/hpp/manipulation/graph/edge.hh
src/graph/edge.cc
+1
-7
1 addition, 7 deletions
src/graph/edge.cc
with
19 additions
and
13 deletions
include/hpp/manipulation/graph/edge.hh
+
18
−
6
View file @
3c0cf959
...
@@ -85,17 +85,29 @@ namespace hpp {
...
@@ -85,17 +85,29 @@ namespace hpp {
NodePtr_t
from
()
const
;
NodePtr_t
from
()
const
;
/// Get the node in which path is.
/// Get the node in which path is.
virtual
NodePtr_t
node
()
const
;
NodePtr_t
node
()
const
{
return
node_
.
lock
();
}
void
node
(
NodePtr_t
node
)
{
node_
=
node
;
}
void
isInNodeFrom
(
bool
iinf
)
/// \deprecated use node(NodePtr_t) instead.
void
isInNodeFrom
(
bool
iinf
)
HPP_MANIPULATION_DEPRECATED
{
{
isInNodeFrom_
=
iinf
;
if
(
iinf
)
node_
=
from_
;
else
node_
=
to_
;
}
}
bool
isInNodeFrom
()
const
/// \deprecated see NodePtr_t node() const
bool
isInNodeFrom
()
const
HPP_MANIPULATION_DEPRECATED
{
{
return
isInNodeFrom_
;
return
node_
.
lock
()
==
from_
.
lock
()
;
}
}
/// Get steering method associated to the edge.
/// Get steering method associated to the edge.
const
core
::
SteeringMethodPtr_t
&
steeringMethod
()
const
const
core
::
SteeringMethodPtr_t
&
steeringMethod
()
const
{
{
...
@@ -158,7 +170,7 @@ namespace hpp {
...
@@ -158,7 +170,7 @@ namespace hpp {
NodeWkPtr_t
from_
,
to_
;
NodeWkPtr_t
from_
,
to_
;
/// True if this path is in node from, False if in node to
/// True if this path is in node from, False if in node to
bool
isInNodeFrom
_
;
NodeWkPtr_t
node
_
;
/// Steering method used to create paths associated to the edge
/// Steering method used to create paths associated to the edge
SteeringMethod_t
*
steeringMethod_
;
SteeringMethod_t
*
steeringMethod_
;
...
...
This diff is collapsed.
Click to expand it.
src/graph/edge.cc
+
1
−
7
View file @
3c0cf959
...
@@ -57,12 +57,6 @@ namespace hpp {
...
@@ -57,12 +57,6 @@ namespace hpp {
return
from_
.
lock
();
return
from_
.
lock
();
}
}
NodePtr_t
Edge
::
node
()
const
{
if
(
isInNodeFrom_
)
return
from
();
else
return
to
();
}
bool
Edge
::
direction
(
const
core
::
PathPtr_t
&
path
)
const
bool
Edge
::
direction
(
const
core
::
PathPtr_t
&
path
)
const
{
{
Configuration_t
q0
=
path
->
initial
(),
Configuration_t
q0
=
path
->
initial
(),
...
@@ -169,7 +163,7 @@ namespace hpp {
...
@@ -169,7 +163,7 @@ namespace hpp {
wkPtr_
=
weak
;
wkPtr_
=
weak
;
from_
=
from
;
from_
=
from
;
to_
=
to
;
to_
=
to
;
isInNodeFrom_
=
false
;
node_
=
to
;
}
}
std
::
ostream
&
Edge
::
print
(
std
::
ostream
&
os
)
const
std
::
ostream
&
Edge
::
print
(
std
::
ostream
&
os
)
const
...
...
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