From c29939b6f0b82b9919cc85abdb1fd9b9e5a49557 Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Thu, 22 Feb 2018 11:23:57 +0100
Subject: [PATCH] Fix compilation.
---
include/hpp/manipulation/problem.hh | 4 ++--
.../manipulation/steering-method/cross-state-optimization.hh | 2 +-
src/graph/edge.cc | 2 +-
src/path-optimization/keypoints.cc | 2 +-
src/problem.cc | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/hpp/manipulation/problem.hh b/include/hpp/manipulation/problem.hh
index c7c318b..5dce20f 100644
--- a/include/hpp/manipulation/problem.hh
+++ b/include/hpp/manipulation/problem.hh
@@ -55,7 +55,7 @@ namespace hpp {
if (!pathValidation ())
throw std::runtime_error ("No GraphPathValidation in the problem.");
if (!steeringMethod ())
- throw std::runtime_error ("No GraphSteeringMethod in the problem.");
+ throw std::runtime_error ("No SteeringMethod in the problem.");
}
/// Get the path validation as a GraphPathValidation
@@ -63,7 +63,7 @@ namespace hpp {
void pathValidation (const PathValidationPtr_t& pathValidation);
- /// Get the steering method as a GraphSteeringMethod
+ /// Get the steering method as a SteeringMethod
SteeringMethodPtr_t steeringMethod () const;
/// Build a new path validation
diff --git a/include/hpp/manipulation/steering-method/cross-state-optimization.hh b/include/hpp/manipulation/steering-method/cross-state-optimization.hh
index 6563101..cf040c1 100644
--- a/include/hpp/manipulation/steering-method/cross-state-optimization.hh
+++ b/include/hpp/manipulation/steering-method/cross-state-optimization.hh
@@ -23,7 +23,7 @@
# include <hpp/manipulation/fwd.hh>
# include <hpp/manipulation/problem.hh>
# include <hpp/manipulation/steering-method/fwd.hh>
-# include <hpp/manipulation/graph-steering-method.hh>
+# include <hpp/manipulation/steering-method/graph.hh>
namespace hpp {
namespace manipulation {
diff --git a/src/graph/edge.cc b/src/graph/edge.cc
index 5c30efa..537fd7e 100644
--- a/src/graph/edge.cc
+++ b/src/graph/edge.cc
@@ -29,7 +29,7 @@
#include "hpp/manipulation/device.hh"
#include "hpp/manipulation/problem.hh"
-#include "hpp/manipulation/graph-steering-method.hh"
+#include "hpp/manipulation/steering-method/graph.hh"
#include "hpp/manipulation/graph/statistics.hh"
#include "hpp/manipulation/constraint-set.hh"
diff --git a/src/path-optimization/keypoints.cc b/src/path-optimization/keypoints.cc
index 384750c..fd802d0 100644
--- a/src/path-optimization/keypoints.cc
+++ b/src/path-optimization/keypoints.cc
@@ -24,7 +24,7 @@
#include <hpp/manipulation/graph/edge.hh>
#include <hpp/manipulation/graph/graph.hh>
#include <hpp/manipulation/constraint-set.hh>
-#include <hpp/manipulation/graph-steering-method.hh>
+#include <hpp/manipulation/steering-method/graph.hh>
namespace hpp {
namespace manipulation {
diff --git a/src/problem.cc b/src/problem.cc
index 78a1b72..863604f 100644
--- a/src/problem.cc
+++ b/src/problem.cc
@@ -19,7 +19,7 @@
#include <hpp/core/discretized-collision-checking.hh>
#include <hpp/manipulation/weighed-distance.hh>
-#include <hpp/manipulation/graph-steering-method.hh>
+#include <hpp/manipulation/steering-method/graph.hh>
#include <hpp/manipulation/graph-path-validation.hh>
namespace hpp {
@@ -27,7 +27,7 @@ namespace hpp {
Problem::Problem (DevicePtr_t robot)
: Parent (robot), graph_()
{
- Parent::steeringMethod (GraphSteeringMethod::create (*this));
+ Parent::steeringMethod (steeringMethod::Graph::create (*this));
distance (WeighedDistance::create (robot, graph_));
setPathValidationFactory(core::DiscretizedCollisionChecking::create, 0.05);
--
GitLab