Commit 954799d2 authored by Guilhem Saurel's avatar Guilhem Saurel Committed by Anthony Mallet
Browse files

[optimization/roboptim-trajectory] Update to 3.1

Changes since 1.0:

Cf. optimization/roboptim-core
parent 1ce9826e
......@@ -2,11 +2,12 @@
# Created: florent on Sat, 9 May 2009
#
VERSION= 1.0
PKGREVISION= 2
DISTNAME= roboptim-trajectory-${VERSION}
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=roboptim/}
MASTER_REPOSITORY=git git://github.com/roboptim/roboptim-trajectory.git
VERSION= 3.1
PACKAGE= roboptim-trajectory
DISTNAME= ${PACKAGE}-${VERSION}
MASTER_SITES=\
${MASTER_SITE_GITHUB:=roboptim/${PACKAGE}/releases/download/v${VERSION}/}
MASTER_REPOSITORY=git git://github.com/roboptim/${PACKAGE}.git
CATEGORIES= optimization
COMMENT= Optimization for robotics: trajectory optimization
......@@ -22,16 +23,10 @@ CMAKE_ARGS+= -DCXX_DISABLE_WERROR=yes
INCLUDE_DIRS.boost-headers=include
# Make sure git-version-gen is not confused by the robotpkg ``.git''
# directory.
BUILD_MAKE_FLAGS+= GIT_DIR=/dev/null
# --------------------------------------------------------------------
include ../../mk/sysdep/cmake.mk
include ../../devel/boost-headers/depend.mk
include ../../pkgtools/pkg-config/depend.mk
include ../../optimization/roboptim-core/depend.mk
include ../../pkgtools/pkg-config/depend.mk
include ../../mk/sysdep/cmake.mk
include ../../mk/sysdep/doxygen.mk
include ../../mk/sysdep/latex.mk
include ../../mk/language/c.mk
......
@comment Sat Feb 27 12:47:02 CET 2010
@comment Thu Mar 22 16:08:16 CET 2018
include/roboptim/trajectory.hh
include/roboptim/trajectory/anthropomorphic-cost-function.hh
include/roboptim/trajectory/anthropomorphic-cost-function.hxx
include/roboptim/trajectory/b-spline.hh
include/roboptim/trajectory/b-spline.hxx
include/roboptim/trajectory/config.h
include/roboptim/trajectory/config.hh
include/roboptim/trajectory/constrained-b-spline.hh
include/roboptim/trajectory/constrained-b-spline.hxx
include/roboptim/trajectory/cubic-b-spline.hh
include/roboptim/trajectory/cubic-b-spline.hxx
include/roboptim/trajectory/deprecated.hh
......@@ -16,6 +22,9 @@ include/roboptim/trajectory/limit-omega.hxx
include/roboptim/trajectory/limit-speed.hh
include/roboptim/trajectory/limit-speed.hxx
include/roboptim/trajectory/orthogonal-speed.hh
include/roboptim/trajectory/polynomial-3.hh
include/roboptim/trajectory/polynomial.hh
include/roboptim/trajectory/polynomial.hxx
include/roboptim/trajectory/spline-length.hh
include/roboptim/trajectory/stable-point-state-function.hh
include/roboptim/trajectory/stable-point-state-function.hxx
......@@ -25,15 +34,18 @@ include/roboptim/trajectory/state-function.hxx
include/roboptim/trajectory/sys.hh
include/roboptim/trajectory/trajectory-cost.hh
include/roboptim/trajectory/trajectory-cost.hxx
include/roboptim/trajectory/trajectory.hh
include/roboptim/trajectory/trajectory.hxx
include/roboptim/trajectory/trajectory-sum-cost.hh
include/roboptim/trajectory/trajectory-sum-cost.hxx
include/roboptim/trajectory/trajectory.hh
include/roboptim/trajectory/trajectory.hxx
include/roboptim/trajectory/vector-interpolation.hh
include/roboptim/trajectory/vector-interpolation.hxx
include/roboptim/trajectory/visualization/b-spline-matplotlib.hh
include/roboptim/trajectory/visualization/cubic-b-spline-matplotlib.hh
include/roboptim/trajectory/visualization/limit-speed.hh
include/roboptim/trajectory/visualization/speed.hh
include/roboptim/trajectory/visualization/trajectory.hh
include/roboptim/trajectory.hh
include/roboptim/trajectory/warning.hh
lib/libroboptim-trajectory.so
lib/libroboptim-trajectory.so.1.1.0
lib/libroboptim-trajectory.so.${PKGVERSION}.0
lib/pkgconfig/roboptim-trajectory.pc
......@@ -9,18 +9,19 @@ ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= roboptim-trajectory
endif
ifeq (+,$(ROBOPTIM_TRAJECTORY_DEPEND_MK)) # ------------------------------
ifeq (+,$(ROBOPTIM_TRAJECTORY_DEPEND_MK)) # --------------------------------
PREFER.roboptim-trajectory?= robotpkg
DEPEND_USE+= roboptim-trajectory
DEPEND_ABI.roboptim-trajectory?= roboptim-trajectory>=0.4
DEPEND_DIR.roboptim-trajectory?= ../../optimization/roboptim-trajectory
DEPEND_ABI.roboptim-trajectory?=roboptim-trajectory>=3.1
DEPEND_DIR.roboptim-trajectory?=../../optimization/roboptim-trajectory
SYSTEM_SEARCH.roboptim-trajectory=\
include/roboptim/trajectory/fwd.hh \
'lib/pkgconfig/roboptim-trajectory.pc:/Version/s/[^0-9.]//gp'
'include/roboptim/trajectory/fwd.hh' \
'lib/libroboptim-trajectory.so' \
'lib/pkgconfig/roboptim-trajectory.pc:/Version/s/[^0-9.]//gp'
endif # --------------------------------------------------------------------
......
SHA1 (roboptim-trajectory-1.0.tar.gz) = 9ce01de432e1f51e46d30450baaa02db00e7de27
RMD160 (roboptim-trajectory-1.0.tar.gz) = 487db05ecb9f5ed3510664931d2e3955986d9d2d
Size (roboptim-trajectory-1.0.tar.gz) = 264676 bytes
SHA1 (patch-aa) = 619cb2fab7a75bcd9feab11ef0f1626346cb2bc2
SHA1 (patch-ab) = 0433ac303f026fcccae802f6ae808ff6fc2ea2f6
SHA1 (patch-ac) = 697d5c89aac64760943e96a0d87c4b7b50e032a1
SHA1 (patch-ad) = fe503371e94076cb79c0c94347aafb63630fa1a2
SHA1 (patch-ae) = 22361851f24e1515d9f680079b7cb81c1e2eb937
SHA1 (patch-af) = ed9dde3c5f538e956e04498cb896297893d65c0e
SHA1 (roboptim-trajectory-3.1.tar.gz) = 807e5f5c4a2cdeb9fa3284a56ffcd9b15aa5b29c
RMD160 (roboptim-trajectory-3.1.tar.gz) = d9a4e2e5a042d19d94f51c1eab96dba05317e29b
Size (roboptim-trajectory-3.1.tar.gz) = 419459 bytes
--- CMakeLists.txt.orig 2012-01-31 09:30:16.787611063 +0100
+++ CMakeLists.txt 2012-01-31 09:30:21.967025222 +0100
@@ -83,7 +83,6 @@
HEADER_INSTALL("${HEADERS}")
ADD_SUBDIRECTORY(src)
-ADD_SUBDIRECTORY(tests)
SETUP_PROJECT_FINALIZE()
SETUP_PROJECT_CPACK()
Fix for -Werror on x86_64
--- src/spline-length.cc~ 2012-01-30 22:53:03.000000000 +0100
+++ src/spline-length.cc 2012-02-13 12:16:54.077208847 +0100
@@ -94,7 +94,7 @@
const value_type delta =
getUpperBound (interval_) - getLowerBound (interval_);
- res[0] *= delta / nDiscretizationPoints_;
+ res[0] *= delta / (value_type)nDiscretizationPoints_;
res[0] /= 2.;
}
@@ -113,6 +113,6 @@
foreach (interval_, nDiscretizationPoints_, sumlengthgrad);
const value_type delta =
getUpperBound (interval_) - getLowerBound (interval_);
- grad *= delta / nDiscretizationPoints_;
+ grad *= delta / (value_type)nDiscretizationPoints_;
}
} // end of namespace roboptim.
Fix for -Werror on x86_64
--- include/roboptim/trajectory/cubic-b-spline.hh~ 2012-01-30 22:53:03.000000000 +0100
+++ include/roboptim/trajectory/cubic-b-spline.hh 2012-02-13 12:25:05.400617665 +0100
@@ -115,7 +115,7 @@
private:
/// \brief Number of control points.
- unsigned int nbp_;
+ size_type nbp_;
};
/// @}
Fix for -Werror on x86_64
--- src/cubic-b-spline.cc~ 2012-01-30 22:53:03.000000000 +0100
+++ src/cubic-b-spline.cc 2012-02-13 12:27:08.448935674 +0100
@@ -75,7 +75,7 @@
CubicBSpline::value_type
CubicBSpline::Dt () const
{
- return length () / (nbp_ - 3.);
+ return length () / ((value_type)nbp_ - 3.);
}
CubicBSpline::size_type
@@ -104,7 +104,7 @@
// Non zero basis functions are b_{i-3,3}(t), b_{i-2,3}(t), b_{i-1,3}(t),
// b_{i,3}(t).
- const value_type t_i = t3 + (i - 3) * Dt;
+ const value_type t_i = t3 + ((value_type)i - 3) * Dt;
const value_type tau_i = t - t_i;
const value_type tau_i_2 = tau_i * tau_i;
@@ -234,7 +234,7 @@
CubicBSpline::value_type
CubicBSpline::singularPointAtRank (size_type rank) const
{
- return rank * length () / (nbp_- 3);
+ return (value_type)rank * length () / ((value_type)nbp_- 3);
}
CubicBSpline::vector_t
Use cmake's idea of the "make" program, so that it can be tuned by robotpkg
https://github.com/jrl-umi3218/jrl-cmakemodules/issues/34
--- cmake/doxygen.cmake~ 2013-07-30 19:48:34.000000000 +0200
+++ cmake/doxygen.cmake 2013-12-14 18:26:08.000000000 +0100
@@ -66,7 +66,7 @@
COMMENT "Generating Doxygen documentation"
)
- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${MAKE} doc)")
+ INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_MAKE_PROGRAM} doc)")
ENDIF(MSVC)
ADD_CUSTOM_COMMAND(
Fix for boost>=1.60
--- include/roboptim/trajectory/spline-length.hh~ 2012-01-30 22:53:03.000000000 +0100
+++ include/roboptim/trajectory/spline-length.hh 2016-06-13 12:17:00.000000000 +0200
@@ -51,7 +51,7 @@
/// \param nDiscretizationPoints number of discretization points
SplineLength (const CubicBSpline& spline,
const size_type nDiscretizationPoints = 100,
- boost::optional<interval_t> interval = boost::none_t ()) throw ();
+ boost::optional<interval_t> interval = boost::none) throw ();
virtual ~SplineLength () throw ();
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment