diff --git a/include/hpp/manipulation/graph-path-validation.hh b/include/hpp/manipulation/graph-path-validation.hh index 92642de15f2670a7c3799592a1c25a2091735cad..7449f8e7e76db0a97a905d3b1f9e110782e7555a 100644 --- a/include/hpp/manipulation/graph-path-validation.hh +++ b/include/hpp/manipulation/graph-path-validation.hh @@ -48,29 +48,6 @@ namespace hpp { class HPP_MANIPULATION_DLLAPI GraphPathValidation : public PathValidation { public: - /// Check that the path is valid regarding the constraint graph and call - /// the encapsulated PathValidation::validate. - /// \deprecated Use the method that takes as input a reference to a - /// ValidationReportPtr_t instead. - bool validate (const PathPtr_t& path, bool reverse, - PathPtr_t& validPart) HPP_MANIPULATION_DEPRECATED; - - /// Call the GraphPathValidation::validate without validation report. - /// - /// \param path the path to check for validity, - /// \param reverse if true check from the end, - /// \retval the extracted valid part of the path, pointer to path if - /// path is valid, - /// \retval report information about the validation process. unused in - /// this case, - /// \return whether the whole path is valid. - /// \deprecated Use the method that takes as input a reference to a - /// ValidationReportPtr_t instead. - virtual bool validate (const PathPtr_t& path, bool reverse, - PathPtr_t& validPart, - ValidationReport& report) - HPP_MANIPULATION_DEPRECATED; - /// Check that path is valid regarding the constraint graph. /// /// \param path the path to check for validity, diff --git a/src/graph-path-validation.cc b/src/graph-path-validation.cc index 5e6c445c24c67c19a6b6add63f3f4783513815e5..ba56e6f5d0e58325c201e48e092492097bce72f9 100644 --- a/src/graph-path-validation.cc +++ b/src/graph-path-validation.cc @@ -30,11 +30,11 @@ namespace hpp { pathValidation_ (pathValidation), constraintGraph_ () {} - bool GraphPathValidation::validate ( - const PathPtr_t& path, bool reverse, PathPtr_t& validPart) + bool GraphPathValidation::validate (const PathPtr_t& path, bool reverse, + PathPtr_t& validPart, + PathValidationReportPtr_t& report) { assert (path); - PathValidationReportPtr_t report; bool success = impl_validate (path, reverse, validPart, report); assert (constraintGraph_); assert (constraintGraph_->getNode (validPart->initial ())); @@ -42,23 +42,6 @@ namespace hpp { return success; } - bool GraphPathValidation::validate - (const PathPtr_t& path, bool reverse, PathPtr_t& validPart, - ValidationReport&) - { - assert (path); - PathValidationReportPtr_t report; - return impl_validate (path, reverse, validPart, report); - } - - bool GraphPathValidation::validate (const PathPtr_t& path, bool reverse, - PathPtr_t& validPart, - PathValidationReportPtr_t& report) - { - assert (path); - return impl_validate (path, reverse, validPart, report); - } - bool GraphPathValidation::impl_validate (const PathVectorPtr_t& path, bool reverse, PathPtr_t& validPart, PathValidationReportPtr_t& report) {