Skip to content

Commit

Permalink
Merge branch 'calderpg:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
calderpg-tri authored Apr 21, 2022
2 parents 65fd81f + baf66f7 commit b28bda1
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions include/common_robotics_utilities/simple_rrt_planner.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ class SimpleRRTPlannerTree
};

return serialization::SerializeVectorLike<SimpleRRTPlannerState<StateType>>(
tree.GetNodes(), buffer, element_serializer);
tree.GetNodesImmutable(), buffer, element_serializer);
}

static serialization::Deserialized<SimpleRRTPlannerTree<StateType>>
Expand Down Expand Up @@ -281,7 +281,7 @@ class SimpleRRTPlannerTree
return new_node_index;
}

const SimpleRRTPlannerStateVector<StateType>& GetNodes() const
const SimpleRRTPlannerStateVector<StateType>& GetNodesImmutable() const
{
return nodes_;
}
Expand Down Expand Up @@ -1545,7 +1545,7 @@ MakeLinearRRTNearestNeighborsFunction(
return distance_fn(candidate_q, sample);
};
const auto neighbors = simple_knearest_neighbors::GetKNearestNeighbors(
tree.GetNodes(), sampled, real_distance_fn, 1, use_parallel);
tree.GetNodesImmutable(), sampled, real_distance_fn, 1, use_parallel);
if (neighbors.size() > 0)
{
const auto& nearest_neighbor = neighbors.at(0);
Expand Down Expand Up @@ -1602,7 +1602,7 @@ MakeKinematicLinearBiRRTNearestNeighborsFunction(
return distance_fn(candidate_q, sample);
};
const auto neighbors = simple_knearest_neighbors::GetKNearestNeighbors(
tree.GetNodes(), sampled, real_distance_fn, 1, use_parallel);
tree.GetNodesImmutable(), sampled, real_distance_fn, 1, use_parallel);
if (neighbors.size() > 0)
{
const auto& nearest_neighbor = neighbors.at(0);
Expand Down

0 comments on commit b28bda1

Please sign in to comment.