diff --git a/parametric-curves/Makefile b/parametric-curves/Makefile index 7b199f01fa3628e7acdc60592d22baa1192b7e0f..dffee43baf3df781fe4b3957d043c395b48b4872 100644 --- a/parametric-curves/Makefile +++ b/parametric-curves/Makefile @@ -5,6 +5,7 @@ ORG= stack-of-tasks NAME= parametric-curves VERSION= 1.3.0 +PKGREVISION= 1 CATEGORIES= wip COMMENT= This packages provides a template based parametric curves library. diff --git a/parametric-curves/distinfo b/parametric-curves/distinfo index 70ab1551e97de743d7c4412be8a7bd94d84a2ce0..1668cbe7c9c459040a03a84b605e262525c5a409 100644 --- a/parametric-curves/distinfo +++ b/parametric-curves/distinfo @@ -1,3 +1,4 @@ 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 diff --git a/parametric-curves/patches/patch-aa b/parametric-curves/patches/patch-aa new file mode 100644 index 0000000000000000000000000000000000000000..ffdd095ce51aecb9e1d66fd8207d01577a76bfd3 --- /dev/null +++ b/parametric-curves/patches/patch-aa @@ -0,0 +1,43 @@ +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 +