diff --git a/include/hpp/manipulation/fwd.hh b/include/hpp/manipulation/fwd.hh index 2921eb6585204086af39529b9449b5c6098826db..9cae85c541e411f57587db8527e29393e8341256 100644 --- a/include/hpp/manipulation/fwd.hh +++ b/include/hpp/manipulation/fwd.hh @@ -91,6 +91,7 @@ namespace hpp { typedef core::DifferentiableFunctionPtr_t DifferentiableFunctionPtr_t; typedef core::ConfigurationShooter ConfigurationShooter; typedef core::ConfigurationShooterPtr_t ConfigurationShooterPtr_t; + typedef core::ValidationReport ValidationReport; typedef std::pair< GripperPtr_t, HandlePtr_t> Grasp_t; typedef boost::shared_ptr <Grasp_t> GraspPtr_t; diff --git a/include/hpp/manipulation/graph-path-validation.hh b/include/hpp/manipulation/graph-path-validation.hh index 402c0074f08b3fdd9b2fc0c65ccda9d76b122ed4..15d9295f865f0adaf69693996e25787d9a49875d 100644 --- a/include/hpp/manipulation/graph-path-validation.hh +++ b/include/hpp/manipulation/graph-path-validation.hh @@ -49,6 +49,19 @@ namespace hpp { /// the encapsulated PathValidation::validate. bool validate (const PathPtr_t& path, bool reverse, PathPtr_t& validPart); + /// 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. + virtual bool validate (const PathPtr_t& path, bool reverse, + PathPtr_t& validPart, + ValidationReport& report); + /// Set the encapsulated path validator. void innerValidation (const PathValidationPtr_t& pathValidation) { diff --git a/src/graph-path-validation.cc b/src/graph-path-validation.cc index e550786655180a0bd79b42daa2f59d0fb74f6c9c..6bb3b4b965d464470a6fa8606789a81cf1e623a1 100644 --- a/src/graph-path-validation.cc +++ b/src/graph-path-validation.cc @@ -35,6 +35,14 @@ namespace hpp { return impl_validate (path, reverse, validPart); } + bool GraphPathValidation::validate + (const PathPtr_t& path, bool reverse, PathPtr_t& validPart, + ValidationReport&) + { + assert (path); + return impl_validate (path, reverse, validPart); + } + bool GraphPathValidation::impl_validate ( const PathVectorPtr_t& path, bool reverse, PathPtr_t& validPart) {