diff --git a/include/curves/curve_abc.h b/include/curves/curve_abc.h index b21bf8e6e638a57506f0bb2b8c0b80108cdfb2e3..72a2e31a8061439ba75db285532c3e8dcb6454cd 100644 --- a/include/curves/curve_abc.h +++ b/include/curves/curve_abc.h @@ -59,10 +59,6 @@ struct curve_abc : std::unary_function<Time, Point>, public serialization::Seria /// \return \f$\frac{d^Nx(t)}{dt^N}\f$, point corresponding on derivative curve of order N at time t. virtual point_derivate_t derivate(const time_t t, const std::size_t order) const = 0; - /// \brief Compute the derived curve at order N. - /// \param order : order of derivative. - /// \return \f$\frac{d^Nx(t)}{dt^N}\f$ derivative order N of the curve. - //virtual curve_t* compute_derivate(const std::size_t order) const = 0 ; /*Operations*/ diff --git a/include/curves/polynomial.h b/include/curves/polynomial.h index df1216e57eafca758e7509c63c8c1cd84a843559..2e75d6b6e75a7a45853c8c8e40b40a35be3efabc 100644 --- a/include/curves/polynomial.h +++ b/include/curves/polynomial.h @@ -281,7 +281,6 @@ struct polynomial : public curve_abc<Time, Numeric, Safe, Point> { coeff_t coeff_derivated = deriv_coeff(coefficients_); polynomial_t deriv(coeff_derivated, T_min_, T_max_); return deriv.compute_derivate(order - 1); - } /// \brief Compute the derived curve at order N. diff --git a/python/python_definitions.h b/python/python_definitions.h index 296a971698283e2b7b08e7f8330dc29a5c74d06b..02131a4ad25b0d927f4e52e93a052fec181bbe66 100644 --- a/python/python_definitions.h +++ b/python/python_definitions.h @@ -28,25 +28,7 @@ typedef Eigen::Matrix<real, 6, Eigen::Dynamic> point_list6_t; typedef polynomial_t::coeff_t coeff_t; typedef curves::Bern<double> bernstein_t; -/* -typedef double real; -typedef Eigen::Vector3d point3_t; -typedef Eigen::Vector3d tangent_t; -typedef Eigen::VectorXd vectorX_t; -typedef std::pair<point3_t, tangent_t> pair_point_tangent_t; -typedef Eigen::Matrix<double, 6, 1, 0, 6, 1> point6_t; -typedef Eigen::Matrix<double, 3, 1, 0, 3, 1> ret_point_t; -typedef Eigen::Matrix<double, 6, 1, 0, 6, 1> ret_point6_t; -typedef Eigen::VectorXd time_waypoints_t; -typedef Eigen::Matrix<real, 3, Eigen::Dynamic> point_list_t; -typedef Eigen::Matrix<real, 6, Eigen::Dynamic> point_list6_t; -typedef std::vector<point3_t, Eigen::aligned_allocator<point3_t> > t_point3_t; -typedef std::vector<point6_t, Eigen::aligned_allocator<point6_t> > t_point6_t; -typedef std::pair<real, point3_t> Waypoint; -typedef std::vector<Waypoint> T_Waypoint; -typedef std::pair<real, point6_t> Waypoint6; -typedef std::vector<Waypoint6> T_Waypoint6; -*/ + template <typename PointList, typename T_Point> T_Point vectorFromEigenArray(const PointList& array) { T_Point res;