Skip to content

Fix MLD search functions to return unpacked edges #7408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Claude wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Fix MLD search functions to return unpacked edges #7408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4324f73
Initial plan
Claude Mar 6, 2026
ea671a7
Fix search functions to return unpacked edges
Claude Mar 6, 2026
3f0eeba
Fix formatting
Claude Mar 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion include/engine/routing_algorithms/routing_base_mld.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,11 +656,11 @@ inline void search(SearchEngineData<Algorithm> &engine_working_data,
typename SearchEngineData<Algorithm>::QueryHeap &reverse_heap,
EdgeWeight &weight,
std::vector<NodeID> &unpacked_nodes,
std::vector<EdgeID> &unpacked_edges,
const std::vector<NodeID> &force_step_nodes,
const PhantomEndpointT &endpoints,
const EdgeWeight weight_upper_bound = INVALID_EDGE_WEIGHT)
{
// TODO: change search calling interface to use unpacked_edges result
auto unpacked_path = search(engine_working_data,
facade,
forward_heap,
Expand All @@ -670,6 +670,20 @@ inline void search(SearchEngineData<Algorithm> &engine_working_data,
endpoints);
weight = unpacked_path.weight;
unpacked_nodes = std::move(unpacked_path.nodes);
unpacked_edges = std::move(unpacked_path.edges);
}

// Overload that accepts pre-computed unpacked nodes and edges to avoid unnecessary FindEdge calls
template <typename FacadeT>
void unpackPath(const FacadeT &facade,
const std::vector<NodeID> &unpacked_nodes,
const std::vector<EdgeID> &unpacked_edges,
const PhantomEndpoints &route_endpoints,
std::vector<PathData> &unpacked_path)
{
BOOST_ASSERT(!unpacked_nodes.empty());
BOOST_ASSERT(unpacked_nodes.size() == unpacked_edges.size() + 1);
annotatePath(facade, route_endpoints, unpacked_nodes, unpacked_edges, unpacked_path);
}

// TODO: refactor CH-related stub to use unpacked_edges
Expand Down
Loading
Loading