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
88749f7c
Commit
88749f7c
authored
9 months ago
by
Ilias Harkati
Browse files
Options
Downloads
Patches
Plain Diff
fix compiler warnings
parent
b1601f95
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#41628
passed with warnings
9 months ago
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/path-planner/states-path-finder.cc
+5
-5
5 additions, 5 deletions
src/path-planner/states-path-finder.cc
with
5 additions
and
5 deletions
src/path-planner/states-path-finder.cc
+
5
−
5
View file @
88749f7c
...
@@ -1279,7 +1279,7 @@ bool StatesPathFinder::saveIncompatibleRHS(ConstraintMap_t& pairMap,
...
@@ -1279,7 +1279,7 @@ bool StatesPathFinder::saveIncompatibleRHS(ConstraintMap_t& pairMap,
// indices of their respective constraints
// indices of their respective constraints
exploreJOC
=
[
&
](
core
::
JointConstPtr_t
j
,
jointOfConstraint
current
,
exploreJOC
=
[
&
](
core
::
JointConstPtr_t
j
,
jointOfConstraint
current
,
int
initial
)
{
int
initial
)
{
in
t
constraint_index
=
std
::
get
<
1
>
(
current
);
size_
t
constraint_index
=
std
::
get
<
1
>
(
current
);
visited
[
constraint_index
]
++
;
visited
[
constraint_index
]
++
;
core
::
JointConstPtr_t
current_joint
=
std
::
get
<
0
>
(
current
);
core
::
JointConstPtr_t
current_joint
=
std
::
get
<
0
>
(
current
);
auto
iconstraint
=
constraints_
[
constraint_index
];
auto
iconstraint
=
constraints_
[
constraint_index
];
...
@@ -1287,14 +1287,14 @@ bool StatesPathFinder::saveIncompatibleRHS(ConstraintMap_t& pairMap,
...
@@ -1287,14 +1287,14 @@ bool StatesPathFinder::saveIncompatibleRHS(ConstraintMap_t& pairMap,
auto
id_cj
=
core
::
RelativeMotion
::
idx
(
current_joint
);
auto
id_cj
=
core
::
RelativeMotion
::
idx
(
current_joint
);
for
(
auto
&
joc
:
JOCs
)
{
for
(
auto
&
joc
:
JOCs
)
{
in
t
ci
=
std
::
get
<
1
>
(
joc
);
size_
t
ci
=
std
::
get
<
1
>
(
joc
);
core
::
JointConstPtr_t
ji
=
std
::
get
<
0
>
(
joc
);
core
::
JointConstPtr_t
ji
=
std
::
get
<
0
>
(
joc
);
auto
id_ji
=
core
::
RelativeMotion
::
idx
(
ji
);
auto
id_ji
=
core
::
RelativeMotion
::
idx
(
ji
);
if
(
m
(
id_cj
,
id_ji
)
==
if
(
m
(
id_cj
,
id_ji
)
==
core
::
RelativeMotion
::
RelativeMotionType
::
Unconstrained
)
core
::
RelativeMotion
::
RelativeMotionType
::
Unconstrained
)
continue
;
continue
;
if
(
equalJoints
(
ji
,
j
))
if
(
equalJoints
(
ji
,
j
))
return
std
::
vector
<
int
>
{
initial
,
ci
};
return
std
::
vector
<
int
>
{
initial
,
(
int
)
ci
};
else
if
(
visited
[
ci
]
<
2
)
{
else
if
(
visited
[
ci
]
<
2
)
{
return
exploreJOC
(
j
,
joc
,
initial
);
return
exploreJOC
(
j
,
joc
,
initial
);
}
}
...
@@ -1303,10 +1303,10 @@ bool StatesPathFinder::saveIncompatibleRHS(ConstraintMap_t& pairMap,
...
@@ -1303,10 +1303,10 @@ bool StatesPathFinder::saveIncompatibleRHS(ConstraintMap_t& pairMap,
};
};
// get the indices of the constraints associated to the two joints
// get the indices of the constraints associated to the two joints
auto
getIndices
=
[
&
]
->
std
::
vector
<
int
>
{
auto
getIndices
=
[
&
]
()
->
std
::
vector
<
int
>
{
for
(
auto
&
joc
:
constraints_j1
)
{
for
(
auto
&
joc
:
constraints_j1
)
{
visited
[
std
::
get
<
1
>
(
joc
)]
=
1
;
visited
[
std
::
get
<
1
>
(
joc
)]
=
1
;
auto
indices
=
exploreJOC
(
j2
,
joc
,
std
::
get
<
1
>
(
joc
));
auto
indices
=
exploreJOC
(
j2
,
joc
,
(
int
)
std
::
get
<
1
>
(
joc
));
if
(
indices
[
0
]
>=
0
||
indices
[
1
]
>=
0
)
return
indices
;
if
(
indices
[
0
]
>=
0
||
indices
[
1
]
>=
0
)
return
indices
;
}
}
return
std
::
vector
<
int
>
{
-
1
,
-
1
};
return
std
::
vector
<
int
>
{
-
1
,
-
1
};
...
...
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