Commit 4cf8b3d2 authored by Guilhem Saurel's avatar Guilhem Saurel

[wip/{py-,}parametric-curves] Update to v1.3.1

Changes since v1.3.0:
- fix setZero
- stay on numpy.matrix for tests
parent 8fe4c2f7
......@@ -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.
......
@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
......
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
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
......@@ -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)
......
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
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