Skip to content
Snippets Groups Projects
Commit 5bafa0f0 authored by Joseph Mirabel's avatar Joseph Mirabel Committed by Joseph Mirabel
Browse files

Fix some compilation warnings and clean code

* rename PartialShortcutTrait into PartialShortcutTraits
parent f21885c3
No related branches found
No related tags found
No related merge requests found
...@@ -99,6 +99,7 @@ namespace hpp { ...@@ -99,6 +99,7 @@ namespace hpp {
{ {
return steeringMethod_; return steeringMethod_;
} }
/// Print the object in a stream. /// Print the object in a stream.
virtual std::ostream& dotPrint (std::ostream& os, dot::DrawingAttributes da = dot::DrawingAttributes ()) const; virtual std::ostream& dotPrint (std::ostream& os, dot::DrawingAttributes da = dot::DrawingAttributes ()) const;
......
...@@ -34,8 +34,8 @@ namespace hpp { ...@@ -34,8 +34,8 @@ namespace hpp {
assert (path); assert (path);
bool success = impl_validate (path, reverse, validPart); bool success = impl_validate (path, reverse, validPart);
assert (constraintGraph_); assert (constraintGraph_);
assert (constraintGraph_->getNode ((*validPart) (validPart->timeRange ().first))); assert (constraintGraph_->getNode (validPart->initial ()));
assert (constraintGraph_->getNode ((*validPart) (validPart->timeRange ().second))); assert (constraintGraph_->getNode (validPart->end ()));
return success; return success;
} }
......
...@@ -51,7 +51,6 @@ namespace hpp { ...@@ -51,7 +51,6 @@ namespace hpp {
return components_; return components_;
} }
std::size_t GraphComponent::id () const std::size_t GraphComponent::id () const
{ {
return id_; return id_;
......
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
namespace hpp { namespace hpp {
namespace manipulation { namespace manipulation {
namespace { namespace {
struct PartialShortcutTrait : struct PartialShortcutTraits :
core::pathOptimization::PartialShortcutTrait { core::pathOptimization::PartialShortcutTraits {
static bool removeLockedJoints () { return false; } static bool removeLockedJoints () { return false; }
}; };
} }
...@@ -60,7 +60,7 @@ namespace hpp { ...@@ -60,7 +60,7 @@ namespace hpp {
addPathOptimizerType ("Graph-RandomShortcut", addPathOptimizerType ("Graph-RandomShortcut",
GraphOptimizer::create <core::RandomShortcut>); GraphOptimizer::create <core::RandomShortcut>);
addPathOptimizerType ("PartialShortcut", core::pathOptimization:: addPathOptimizerType ("PartialShortcut", core::pathOptimization::
PartialShortcut::createWithTrait <PartialShortcutTrait>); PartialShortcut::createWithTraits <PartialShortcutTraits>);
addPathOptimizerType ("Graph-PartialShortcut", addPathOptimizerType ("Graph-PartialShortcut",
GraphOptimizer::create <core::pathOptimization::PartialShortcut>); GraphOptimizer::create <core::pathOptimization::PartialShortcut>);
pathPlannerType ("M-RRT"); pathPlannerType ("M-RRT");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment