diff --git a/core/include/moveit/task_constructor/container_p.h b/core/include/moveit/task_constructor/container_p.h index 3b3e61b6..79c184cf 100644 --- a/core/include/moveit/task_constructor/container_p.h +++ b/core/include/moveit/task_constructor/container_p.h @@ -76,7 +76,7 @@ public: * Negative index counts from end, i.e. -1 is last, -2 is second last, etc. (if !for_insert) * If for_insert == true, negative indexes are shifted by one: -1 is end(), -2 is --end(), etc. * Contrary to std::advance(), iterator limits are considered. */ - const_iterator position(int index, bool for_insert = false) const; + const_iterator childByIndex(int index, bool for_insert = false) const; /// traversing all stages up to max_depth bool traverseStages(const ContainerBase::StageCallback &processor, diff --git a/core/src/container.cpp b/core/src/container.cpp index ca00294c..aa2ff79c 100644 --- a/core/src/container.cpp +++ b/core/src/container.cpp @@ -56,7 +56,7 @@ ContainerBasePrivate::ContainerBasePrivate(ContainerBase *me, const std::string pending_forward_.reset(new Interface); } -ContainerBasePrivate::const_iterator ContainerBasePrivate::position(int index, bool for_insert) const { +ContainerBasePrivate::const_iterator ContainerBasePrivate::childByIndex(int index, bool for_insert) const { if (!for_insert && index < 0) --index; const_iterator position = children_.begin(); @@ -166,7 +166,7 @@ bool ContainerBase::insert(Stage::pointer &&stage, int before) return false; } - ContainerBasePrivate::const_iterator where = pimpl()->position(before, true); + ContainerBasePrivate::const_iterator where = pimpl()->childByIndex(before, true); ContainerBasePrivate::iterator it = pimpl()->children_.insert(where, std::move(stage)); impl->setHierarchy(this, it); return true; @@ -174,7 +174,7 @@ bool ContainerBase::insert(Stage::pointer &&stage, int before) bool ContainerBase::remove(int pos) { - ContainerBasePrivate::const_iterator it = pimpl()->position(pos, false); + ContainerBasePrivate::const_iterator it = pimpl()->childByIndex(pos, false); (*it)->pimpl()->setHierarchy(nullptr, ContainerBasePrivate::iterator()); pimpl()->children_.erase(it); return true; @@ -188,7 +188,7 @@ void ContainerBase::clear() void ContainerBase::exposePropertiesOfChild(int child, const std::initializer_list& names) { auto impl = pimpl(); - ContainerBasePrivate::const_iterator child_it = impl->position(child, false); + ContainerBasePrivate::const_iterator child_it = impl->childByIndex(child, false); if (child_it == impl->children().end()) throw std::runtime_error("invalid child index"); @@ -203,7 +203,7 @@ void ContainerBase::exposePropertyOfChildAs(int child, const std::string& child_ const std::string& parent_property_name) { auto impl = pimpl(); - ContainerBasePrivate::const_iterator child_it = impl->position(child, false); + ContainerBasePrivate::const_iterator child_it = impl->childByIndex(child, false); if (child_it == impl->children().end()) throw std::runtime_error("invalid child index"); diff --git a/core/test/test_container.cpp b/core/test/test_container.cpp index a6457ed0..00e4dd39 100644 --- a/core/test/test_container.cpp +++ b/core/test/test_container.cpp @@ -77,26 +77,26 @@ TEST(ContainerBase, positionForInsert) { SerialContainer s; SerialContainerPrivate *impl = s.pimpl(); - EXPECT_EQ(impl->position(0, true), impl->children().end()); - EXPECT_EQ(impl->position(1, true), impl->children().end()); - EXPECT_EQ(impl->position(-1, true), impl->children().end()); - EXPECT_EQ(impl->position(-2, true), impl->children().end()); + EXPECT_EQ(impl->childByIndex(0, true), impl->children().end()); + EXPECT_EQ(impl->childByIndex(1, true), impl->children().end()); + EXPECT_EQ(impl->childByIndex(-1, true), impl->children().end()); + EXPECT_EQ(impl->childByIndex(-2, true), impl->children().end()); s.insert(std::make_unique("0")); - EXPECT_STREQ((*impl->position(0, true))->name().c_str(), "0"); - EXPECT_EQ(impl->position(-1, true), impl->children().end()); - EXPECT_STREQ((*impl->position(-2, true))->name().c_str(), "0"); - EXPECT_EQ(impl->position(-3, true), impl->children().end()); + EXPECT_STREQ((*impl->childByIndex(0, true))->name().c_str(), "0"); + EXPECT_EQ(impl->childByIndex(-1, true), impl->children().end()); + EXPECT_STREQ((*impl->childByIndex(-2, true))->name().c_str(), "0"); + EXPECT_EQ(impl->childByIndex(-3, true), impl->children().end()); s.insert(std::make_unique("1")); - EXPECT_STREQ((*impl->position(0, true))->name().c_str(), "0"); - EXPECT_STREQ((*impl->position(1, true))->name().c_str(), "1"); - EXPECT_EQ(impl->position(2, true), impl->children().end()); + EXPECT_STREQ((*impl->childByIndex(0, true))->name().c_str(), "0"); + EXPECT_STREQ((*impl->childByIndex(1, true))->name().c_str(), "1"); + EXPECT_EQ(impl->childByIndex(2, true), impl->children().end()); - EXPECT_EQ(impl->position(-1, true), impl->children().end()); - EXPECT_STREQ((*impl->position(-2, true))->name().c_str(), "1"); - EXPECT_STREQ((*impl->position(-3, true))->name().c_str(), "0"); - EXPECT_EQ(impl->position(-4, true), impl->children().end()); + EXPECT_EQ(impl->childByIndex(-1, true), impl->children().end()); + EXPECT_STREQ((*impl->childByIndex(-2, true))->name().c_str(), "1"); + EXPECT_STREQ((*impl->childByIndex(-3, true))->name().c_str(), "0"); + EXPECT_EQ(impl->childByIndex(-4, true), impl->children().end()); } @@ -154,8 +154,8 @@ protected: ASSERT_TRUE(num == expected.size()) << "different list lengths"; // validate position() - EXPECT_EQ(container->children().begin(), container->position(-num)); - EXPECT_EQ(container->children().end(), container->position(num)); + EXPECT_EQ(container->children().begin(), container->childByIndex(-num)); + EXPECT_EQ(container->children().end(), container->childByIndex(num)); // validate order size_t pos = 0; @@ -164,8 +164,8 @@ protected: StagePrivate *child = (*it)->pimpl(); EXPECT_EQ(child, *exp_it) << "wrong order"; EXPECT_EQ(child->parent()->pimpl(), container) << "wrong parent"; - EXPECT_EQ(it, container->position(pos)) << "bad forward position resolution"; - EXPECT_EQ(it, container->position(pos-num)) << "bad backward position resolution"; + EXPECT_EQ(it, container->childByIndex(pos)) << "bad forward position resolution"; + EXPECT_EQ(it, container->childByIndex(pos-num)) << "bad backward position resolution"; } } };