From 38447e4dd2a050d65418b74615c0213b23614f1d Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 3 Oct 2019 12:44:43 +0200 Subject: [PATCH] replace Eigen::Index with auto to support older Eigen3 versions --- src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.cpp | 2 +- src/Mod/Robot/App/kdl_cp/jacobian.cpp | 6 +++--- src/Mod/Robot/App/kdl_cp/treeiksolvervel_wdls.cpp | 4 ++-- .../Robot/App/kdl_cp/utilities/svd_eigen_Macie.hpp | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.cpp b/src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.cpp index 6bddf5f613..bf7de9ed86 100644 --- a/src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.cpp +++ b/src/Mod/Robot/App/kdl_cp/chainiksolverpos_lma.cpp @@ -195,7 +195,7 @@ int ChainIkSolverPos_LMA::CartToJnt(const KDL::JntArray& q_init, const KDL::Fram svd.compute(jac); original_Aii = svd.singularValues(); - for (Eigen::Index j=0;jsetColumn(i,this->getColumn(i).RefPoint(base_AB)); } @@ -97,7 +97,7 @@ namespace KDL } void Jacobian::changeBase(const Rotation& rot){ - for(Eigen::Index i=0;isetColumn(i,rot*this->getColumn(i));; } @@ -111,7 +111,7 @@ namespace KDL } void Jacobian::changeRefFrame(const Frame& frame){ - for(Eigen::Index i=0;isetColumn(i,frame*this->getColumn(i)); } diff --git a/src/Mod/Robot/App/kdl_cp/treeiksolvervel_wdls.cpp b/src/Mod/Robot/App/kdl_cp/treeiksolvervel_wdls.cpp index 52639edecd..7067a782e9 100644 --- a/src/Mod/Robot/App/kdl_cp/treeiksolvervel_wdls.cpp +++ b/src/Mod/Robot/App/kdl_cp/treeiksolvervel_wdls.cpp @@ -89,9 +89,9 @@ namespace KDL { Wq_V.noalias() = Wq * V; // tmp = (Si*Wy*U'*y), - for (Eigen::Index i = 0; i < J.cols(); i++) { + for (auto i = 0; i < J.cols(); i++) { double sum = 0.0; - for (Eigen::Index j = 0; j < J.rows(); j++) { + for (auto j = 0; j < J.rows(); j++) { if (i < Wy_t.rows()) sum += U(j, i) * Wy_t(j); else diff --git a/src/Mod/Robot/App/kdl_cp/utilities/svd_eigen_Macie.hpp b/src/Mod/Robot/App/kdl_cp/utilities/svd_eigen_Macie.hpp index 4e3e00c235..76a1f28dbc 100644 --- a/src/Mod/Robot/App/kdl_cp/utilities/svd_eigen_Macie.hpp +++ b/src/Mod/Robot/App/kdl_cp/utilities/svd_eigen_Macie.hpp @@ -70,8 +70,8 @@ namespace KDL rotate=false; rotations=0; //Perform rotations between columns of B - for(Eigen::Index i=0;i