diff --git a/parametric-curves/Makefile b/parametric-curves/Makefile index dffee43baf3df781fe4b3957d043c395b48b4872..e01146b81635dfe8bbcf3949c6c280f681855a6f 100644 --- a/parametric-curves/Makefile +++ b/parametric-curves/Makefile @@ -4,8 +4,7 @@ ORG= stack-of-tasks NAME= parametric-curves -VERSION= 1.3.0 -PKGREVISION= 1 +VERSION= 1.3.1 CATEGORIES= wip COMMENT= This packages provides a template based parametric curves library. diff --git a/parametric-curves/PLIST b/parametric-curves/PLIST index a1685147208c7073d1034cb4b216423353b152ea..99406b01e17da9c0fe34c621b75401254f5e509f 100644 --- a/parametric-curves/PLIST +++ b/parametric-curves/PLIST @@ -1,3 +1,4 @@ +@comment Fri Feb 28 15:21:08 CET 2020 include/parametric-curves/MathDefs.h include/parametric-curves/abstract-curve.hpp include/parametric-curves/config.hh diff --git a/parametric-curves/distinfo b/parametric-curves/distinfo index 1668cbe7c9c459040a03a84b605e262525c5a409..1a97d3771acecd3381b18cf39be35d1525d9c49d 100644 --- a/parametric-curves/distinfo +++ b/parametric-curves/distinfo @@ -1,4 +1,3 @@ -SHA1 (parametric-curves-1.3.0.tar.gz) = 17feba96271c999cea1962c97140043e2489701c -RMD160 (parametric-curves-1.3.0.tar.gz) = 909ff78a82a8bd0f6f0b5debb0ccfd08eaf52c4d -Size (parametric-curves-1.3.0.tar.gz) = 853751 bytes -SHA1 (patch-aa) = fafbde0a3ccca34c34d39e1ad6dd67c82b06a6c1 +SHA1 (parametric-curves-1.3.1.tar.gz) = be2f129e9f90921b51d0c84fb0688e97f4443e0f +RMD160 (parametric-curves-1.3.1.tar.gz) = f0d962e53ee9627ab7f4fe0167bdf906e72e7e07 +Size (parametric-curves-1.3.1.tar.gz) = 887172 bytes diff --git a/parametric-curves/patches/patch-aa b/parametric-curves/patches/patch-aa deleted file mode 100644 index ffdd095ce51aecb9e1d66fd8207d01577a76bfd3..0000000000000000000000000000000000000000 --- a/parametric-curves/patches/patch-aa +++ /dev/null @@ -1,43 +0,0 @@ -From 9e8da928b606fab125a7c0525d84c101ae1c1ce1 Mon Sep 17 00:00:00 2001 -From: Gabriele Buondonno <gbuondon@laas.fr> -Date: Tue, 17 Dec 2019 15:17:42 +0100 -Subject: [PATCH] [textCurve] Fix setZero - ---- - include/parametric-curves/text-file.hpp | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/include/parametric-curves/text-file.hpp b/include/parametric-curves/text-file.hpp -index db0973a..ac2adcc 100644 ---- include/parametric-curves/text-file.hpp -+++ include/parametric-curves/text-file.hpp -@@ -56,20 +56,21 @@ struct TextFile : public AbstractCurve<Numeric, Point> { - virtual bool loadTextFile(const std::string& fileName) { - Eigen::MatrixXd data = parametriccurves::utils::readMatrixFromFile(fileName); - if (data.cols() == size) { -- std::cout << "Setting derivatives to zero" << std::endl; -+ std::cout << fileName << ": setting derivatives to zero" << std::endl; - posValues = data; -- velValues.setZero(size); -- accValues.setZero(size); -+ velValues.setZero(data.rows(), size); -+ accValues.setZero(data.rows(), size); - } else if (data.cols() == 2 * size) { -+ std::cout << fileName << ": setting second derivative to zero" << std::endl; - posValues = data.leftCols(size); - velValues = data.rightCols(size); -- accValues = accValues.setZero(size); -+ accValues = accValues.setZero(data.rows(), size); - } else if (data.cols() == 3 * size) { - posValues = data.leftCols(size); - velValues = data.middleCols(size, size); - accValues = data.rightCols(size); - } else { -- std::cout << "Unexpected number of columns (expected " << 3 * size << ", found " << data.cols() << ")\n"; -+ std::cout << "Unexpected number of columns (expected " << size << " or " << 2*size << " or " << 3 * size << ", found " << data.cols() << ")\n"; - return false; - } - this->t_max = timeStep * (double)data.rows(); --- -2.17.1 - diff --git a/py-parametric-curves/Makefile b/py-parametric-curves/Makefile index 8e3cb841c239a192b73c8b72d8fc4581a6140de3..f91487c227941d8c847f4dbd486ff773d6db948d 100644 --- a/py-parametric-curves/Makefile +++ b/py-parametric-curves/Makefile @@ -4,7 +4,7 @@ ORG= stack-of-tasks NAME= parametric-curves -VERSION= 1.3.0 +VERSION= 1.3.1 CATEGORIES= wip COMMENT= This packages provides a template based parametric curves library (python bindings) diff --git a/py-parametric-curves/distinfo b/py-parametric-curves/distinfo index 70ab1551e97de743d7c4412be8a7bd94d84a2ce0..1a97d3771acecd3381b18cf39be35d1525d9c49d 100644 --- a/py-parametric-curves/distinfo +++ b/py-parametric-curves/distinfo @@ -1,3 +1,3 @@ -SHA1 (parametric-curves-1.3.0.tar.gz) = 17feba96271c999cea1962c97140043e2489701c -RMD160 (parametric-curves-1.3.0.tar.gz) = 909ff78a82a8bd0f6f0b5debb0ccfd08eaf52c4d -Size (parametric-curves-1.3.0.tar.gz) = 853751 bytes +SHA1 (parametric-curves-1.3.1.tar.gz) = be2f129e9f90921b51d0c84fb0688e97f4443e0f +RMD160 (parametric-curves-1.3.1.tar.gz) = f0d962e53ee9627ab7f4fe0167bdf906e72e7e07 +Size (parametric-curves-1.3.1.tar.gz) = 887172 bytes