Skip to content

Commit 21f3d95

Browse files
committed
fix autocomplete typo
1 parent 4bee034 commit 21f3d95

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

core/src/container.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -886,17 +886,17 @@ void MergerPrivate::onNewGeneratorSolution(const SolutionBase& s) {
886886
void MergerPrivate::mergeAnyCombination(const ChildSolutionMap& all_solutions, const SolutionBase& current,
887887
const planning_scene::PlanningSceneConstPtr& start_scene,
888888
const Spawner& spawner) {
889-
std::vector<size_t> indeces; // which solution index was considered last for i-th child?
890-
indeces.reserve(children().size());
889+
std::vector<size_t> indices; // which solution index was considered last for i-th child?
890+
indices.reserve(children().size());
891891

892892
ChildSolutionList sub_solutions;
893893
sub_solutions.reserve(children().size());
894894

895895
// initialize vector of sub solutions
896896
for (const auto& pair : all_solutions) {
897897
// all children, except current solution's creator, start with zero index
898-
indeces.push_back(pair.first != current.creator() ? 0 : pair.second.size() - 1);
899-
sub_solutions.push_back(pair.second[indeces.back()]);
898+
indices.push_back(pair.first != current.creator() ? 0 : pair.second.size() - 1);
899+
sub_solutions.push_back(pair.second[indices.back()]);
900900
}
901901
while (true) {
902902
merge(sub_solutions, start_scene, spawner);
@@ -906,13 +906,13 @@ void MergerPrivate::mergeAnyCombination(const ChildSolutionMap& all_solutions, c
906906
for (auto it = all_solutions.cbegin(), end = all_solutions.cend(); it != end; ++it, ++child) {
907907
if (it->first == current.creator())
908908
continue; // skip current solution's child
909-
if (++indeces[child] >= it->second.size()) {
910-
indeces[child] = 0; // start over with zero
911-
sub_solutions[child] = it->second[indeces[child]];
909+
if (++indices[child] >= it->second.size()) {
910+
indices[child] = 0; // start over with zero
911+
sub_solutions[child] = it->second[indices[child]];
912912
continue; // and continue with next child
913913
}
914914
// otherwise, a new solution combination is available
915-
sub_solutions[child] = it->second[indeces[child]];
915+
sub_solutions[child] = it->second[indices[child]];
916916
break;
917917
}
918918
if (child == children().size()) // all combinations exhausted?

0 commit comments

Comments
 (0)