From fd8d4c437d605d7102a75e831872ba549f6ebd21 Mon Sep 17 00:00:00 2001
From: Mirko Waechter <mirko.waechter@kit.edu>
Date: Sun, 4 Jun 2017 01:15:50 +0200
Subject: [PATCH] fixed getStates function in trajectory
Conflicts:
source/RobotAPI/libraries/core/Trajectory.cpp
---
source/RobotAPI/libraries/core/Trajectory.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/source/RobotAPI/libraries/core/Trajectory.cpp b/source/RobotAPI/libraries/core/Trajectory.cpp
index a277ffe90..33a0698f8 100644
--- a/source/RobotAPI/libraries/core/Trajectory.cpp
+++ b/source/RobotAPI/libraries/core/Trajectory.cpp
@@ -894,9 +894,9 @@ namespace armarx
Ice::DoubleSeq Trajectory::getStates(double t, size_t derivation) const
{
- Ice::DoubleSeq result;
size_t dimensions = dim();
-
+ Ice::DoubleSeq result;
+ result.reserve(dimensions);
for (size_t i = 0; i < dimensions; i++)
{
result.push_back(getState(t, i, derivation));
--
GitLab