Skip to content
Snippets Groups Projects
Commit bbb4f107 authored by Florent Lamiraux's avatar Florent Lamiraux
Browse files

Remove call to deprecated methods.

  Path::operator().
parent b69dde3c
No related branches found
No related tags found
No related merge requests found
...@@ -133,11 +133,11 @@ bool GraphPathValidation::impl_validate(const PathPtr_t& path, bool reverse, ...@@ -133,11 +133,11 @@ bool GraphPathValidation::impl_validate(const PathPtr_t& path, bool reverse,
const core::interval_t &newTR = newPath.timeRange(), const core::interval_t &newTR = newPath.timeRange(),
oldTR = oldPath.timeRange(); oldTR = oldPath.timeRange();
Configuration_t q(newPath.outputSize()); Configuration_t q(newPath.outputSize());
if (!newPath(q, newTR.first)) if (!newPath.eval(q, newTR.first))
throw std::logic_error( throw std::logic_error(
"Initial configuration of the valid part cannot be projected."); "Initial configuration of the valid part cannot be projected.");
const graph::StatePtr_t& origState = constraintGraph_->getState(q); const graph::StatePtr_t& origState = constraintGraph_->getState(q);
if (!newPath(q, newTR.second)) if (!newPath.eval(q, newTR.second))
throw std::logic_error( throw std::logic_error(
"End configuration of the valid part cannot be projected."); "End configuration of the valid part cannot be projected.");
// This may throw in the following case: // This may throw in the following case:
...@@ -171,7 +171,7 @@ bool GraphPathValidation::impl_validate(const PathPtr_t& path, bool reverse, ...@@ -171,7 +171,7 @@ bool GraphPathValidation::impl_validate(const PathPtr_t& path, bool reverse,
validPart = path->extract(std::make_pair(oldTR.first, oldTR.first)); validPart = path->extract(std::make_pair(oldTR.first, oldTR.first));
return false; return false;
} }
if (!oldPath(q, oldTR.first)) { if (!oldPath.eval(q, oldTR.first)) {
std::stringstream oss; std::stringstream oss;
oss << "Initial configuration of the path to be validated failed to" oss << "Initial configuration of the path to be validated failed to"
" be projected. After maximal number of iterations, q=" " be projected. After maximal number of iterations, q="
...@@ -182,7 +182,7 @@ bool GraphPathValidation::impl_validate(const PathPtr_t& path, bool reverse, ...@@ -182,7 +182,7 @@ bool GraphPathValidation::impl_validate(const PathPtr_t& path, bool reverse,
throw std::logic_error(oss.str().c_str()); throw std::logic_error(oss.str().c_str());
} }
const graph::StatePtr_t& oldOstate = constraintGraph_->getState(q); const graph::StatePtr_t& oldOstate = constraintGraph_->getState(q);
if (!oldPath(q, oldTR.second)) { if (!oldPath.eval(q, oldTR.second)) {
std::stringstream oss; std::stringstream oss;
oss << "End configuration of the path to be validated failed to" oss << "End configuration of the path to be validated failed to"
" be projected. After maximal number of iterations, q=" " be projected. After maximal number of iterations, q="
......
...@@ -64,7 +64,7 @@ class FunctionFromPath : public constraints::DifferentiableFunction { ...@@ -64,7 +64,7 @@ class FunctionFromPath : public constraints::DifferentiableFunction {
protected: protected:
void impl_compute(core::LiegroupElementRef result, vectorIn_t arg) const { 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) { if (!success) {
hppDout(warning, "Failed to evaluate path at param " hppDout(warning, "Failed to evaluate path at param "
<< arg[0] << incindent << iendl << *path_ << arg[0] << incindent << iendl << *path_
......
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