diff --git a/src/multibody/data.hpp b/src/multibody/data.hpp index 7ee462791a52ed1c24bc4e6fe84c72d1f7879cbc..758141b0d59147e3e3ca4cf51d2ccecb9d1b0324 100644 --- a/src/multibody/data.hpp +++ b/src/multibody/data.hpp @@ -235,7 +235,7 @@ namespace pinocchio std::vector<int> nvSubtree; /// \brief Starting index of the Joint motion subspace - std::vector<int> starting_subspace_idx_fromRow; + std::vector<int> idx_v_fromRow; /// \brief Joint space intertia matrix square root (upper trianglular part) computed with a Cholesky Decomposition. MatrixXs U; diff --git a/src/multibody/data.hxx b/src/multibody/data.hxx index 3bd641874e4b64e0123f40a0d4e21f4dc1536d85..8f7c03eefb5030030c99a7c2e9bbdeea2e1379b1 100644 --- a/src/multibody/data.hxx +++ b/src/multibody/data.hxx @@ -63,7 +63,7 @@ namespace pinocchio , Fcrb((std::size_t)model.njoints) , lastChild((std::size_t)model.njoints) , nvSubtree((std::size_t)model.njoints) - , starting_subspace_idx_fromRow((std::size_t)model.nv) + , idx_v_fromRow((std::size_t)model.nv) , U(model.nv,model.nv) , D(model.nv) , Dinv(model.nv) @@ -175,12 +175,12 @@ namespace pinocchio else parents_fromRow[(size_t)idx_vj] = -1; nvSubtree_fromRow[(size_t)idx_vj] = nvSubtree[joint]; - starting_subspace_idx_fromRow[(size_t)idx_vj] = idx_vj; + idx_v_fromRow[(size_t)idx_vj] = idx_vj; for(int row=1;row<nvj;++row) { parents_fromRow[(size_t)(idx_vj+row)] = idx_vj+row-1; nvSubtree_fromRow[(size_t)(idx_vj+row)] = nvSubtree[joint]-row; - starting_subspace_idx_fromRow[(size_t)(idx_vj+row)] = idx_vj; + idx_v_fromRow[(size_t)(idx_vj+row)] = idx_vj; } } } diff --git a/unittest/data.cpp b/unittest/data.cpp index 91f74da3abc0f5206c6061da0f2c882490e50a41..b22b960dcddac79bd6e8d04d3e544befd241f85c 100644 --- a/unittest/data.cpp +++ b/unittest/data.cpp @@ -14,7 +14,7 @@ using namespace pinocchio; BOOST_AUTO_TEST_SUITE ( BOOST_TEST_MODULE ) - BOOST_AUTO_TEST_CASE(test_data_starting_subspace_idx_fromRow) + BOOST_AUTO_TEST_CASE(test_data_idx_v_fromRow) { Model model; buildModels::humanoidRandom(model); @@ -27,7 +27,7 @@ BOOST_AUTO_TEST_SUITE ( BOOST_TEST_MODULE ) const int idx_joint = model.joints[joint_id].idx_v(); for(int k = 0; k < nv_joint; ++k) - BOOST_CHECK(data.starting_subspace_idx_fromRow[(size_t)(idx_joint+k)] == idx_joint); + BOOST_CHECK(data.idx_v_fromRow[(size_t)(idx_joint+k)] == idx_joint); } }