diff --git a/src/graph-path-validation.cc b/src/graph-path-validation.cc index 240e7d947a2ad5a792540a4d8a13407d3af78984..9c478b7dbada644debcc3b1f7abbdd937ebece17 100644 --- a/src/graph-path-validation.cc +++ b/src/graph-path-validation.cc @@ -133,11 +133,11 @@ bool GraphPathValidation::impl_validate(const PathPtr_t& path, bool reverse, const core::interval_t &newTR = newPath.timeRange(), oldTR = oldPath.timeRange(); Configuration_t q(newPath.outputSize()); - if (!newPath(q, newTR.first)) + if (!newPath.eval(q, newTR.first)) throw std::logic_error( "Initial configuration of the valid part cannot be projected."); const graph::StatePtr_t& origState = constraintGraph_->getState(q); - if (!newPath(q, newTR.second)) + if (!newPath.eval(q, newTR.second)) throw std::logic_error( "End configuration of the valid part cannot be projected."); // This may throw in the following case: @@ -171,7 +171,7 @@ bool GraphPathValidation::impl_validate(const PathPtr_t& path, bool reverse, validPart = path->extract(std::make_pair(oldTR.first, oldTR.first)); return false; } - if (!oldPath(q, oldTR.first)) { + if (!oldPath.eval(q, oldTR.first)) { std::stringstream oss; oss << "Initial configuration of the path to be validated failed to" " be projected. After maximal number of iterations, q=" @@ -182,7 +182,7 @@ bool GraphPathValidation::impl_validate(const PathPtr_t& path, bool reverse, throw std::logic_error(oss.str().c_str()); } const graph::StatePtr_t& oldOstate = constraintGraph_->getState(q); - if (!oldPath(q, oldTR.second)) { + if (!oldPath.eval(q, oldTR.second)) { std::stringstream oss; oss << "End configuration of the path to be validated failed to" " be projected. After maximal number of iterations, q=" diff --git a/src/steering-method/end-effector-trajectory.cc b/src/steering-method/end-effector-trajectory.cc index d3832902397f2b09f842b158eab8b7f7880d4d04..8d08f1a57ce73699d91e01a6c3c9deeb0894e81b 100644 --- a/src/steering-method/end-effector-trajectory.cc +++ b/src/steering-method/end-effector-trajectory.cc @@ -64,7 +64,7 @@ class FunctionFromPath : public constraints::DifferentiableFunction { protected: void impl_compute(core::LiegroupElementRef result, vectorIn_t arg) const { - bool success = (*path_)(result.vector(), arg[0]); + bool success = path_->eval(result.vector(), arg[0]); if (!success) { hppDout(warning, "Failed to evaluate path at param " << arg[0] << incindent << iendl << *path_