Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
robotpkg-wip
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gepetto
robotpkg-wip
Commits
532796fb
Commit
532796fb
authored
5 years ago
by
Guilhem Saurel
Browse files
Options
Downloads
Patches
Plain Diff
[wip/parametric-curves] Add patch-aa
to fix build of sot-talos-balance
parent
4ffe4aa4
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
parametric-curves/Makefile
+1
-0
1 addition, 0 deletions
parametric-curves/Makefile
parametric-curves/distinfo
+1
-0
1 addition, 0 deletions
parametric-curves/distinfo
parametric-curves/patches/patch-aa
+43
-0
43 additions, 0 deletions
parametric-curves/patches/patch-aa
with
45 additions
and
0 deletions
parametric-curves/Makefile
+
1
−
0
View file @
532796fb
...
...
@@ -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.
...
...
This diff is collapsed.
Click to expand it.
parametric-curves/distinfo
+
1
−
0
View file @
532796fb
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
This diff is collapsed.
Click to expand it.
parametric-curves/patches/patch-aa
0 → 100644
+
43
−
0
View file @
532796fb
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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment