Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

wip

Browse Source
This commit is contained in:
Siarhei Fedartsou 2024-05-29 08:24:25 +02:00
parent 39c74498f7
commit cd4de34f5f
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/engine/routing_algorithms/routing_base_mld.hpp
View File

@ -538,12 +538,12 @@ std::optional<std::pair<NodeID, EdgeWeight>> runSearch(const DataFacade<Algorith
} }
}; };
if (!reverse_heap.Empty()) { // while (!reverse_heap.Empty() && (reverse_heap_min < weight)) {
routingStep<REVERSE_DIRECTION>( // routingStep<REVERSE_DIRECTION>(
facade, reverse_heap, forward_heap, middle, weight, force_step_nodes, args...); // facade, reverse_heap, forward_heap, middle, weight, force_step_nodes, args...);
if (!reverse_heap.Empty()) // if (!reverse_heap.Empty())
reverse_heap_min = reverse_heap.MinKey(); // reverse_heap_min = reverse_heap.MinKey();
} // }
// No path found for both target nodes? // No path found for both target nodes?
if (weight >= weight_upper_bound || SPECIAL_NODEID == middle) if (weight >= weight_upper_bound || SPECIAL_NODEID == middle)
@ -551,7 +551,7 @@ std::optional<std::pair<NodeID, EdgeWeight>> runSearch(const DataFacade<Algorith
return {}; return {};
} }
// std::cerr << "MIDDLE = " << middle << std::endl; std::cerr << "MIDDLE = " << middle << std::endl;
return {{middle, weight}}; return {{middle, weight}};
} }
@ -754,7 +754,7 @@ double getNetworkDistance(SearchEngineData<Algorithm> &engine_working_data,
// forward_heap.Clear(); // forward_heap.Clear();
//if (forward_heap.Empty()) { if (forward_heap.Empty()) {
if (source_phantom.IsValidForwardSource()) if (source_phantom.IsValidForwardSource())
{ {
forward_heap.Insert(source_phantom.forward_segment_id.id, forward_heap.Insert(source_phantom.forward_segment_id.id,
@ -768,7 +768,22 @@ double getNetworkDistance(SearchEngineData<Algorithm> &engine_working_data,
EdgeWeight{0}, EdgeWeight{0},
{source_phantom.reverse_segment_id.id, false, EdgeDistance{0}}); {source_phantom.reverse_segment_id.id, false, EdgeDistance{0}});
} }
//} } else {
if (target_phantom.IsValidForwardTarget()) {
if (forward_heap.WasInserted(target_phantom.forward_segment_id.id)) {
std::cerr << "Found " << target_phantom.forward_segment_id.id << " in forward_heap" << std::endl;
} else {
std::cerr << "Not found " << target_phantom.forward_segment_id.id << " in forward_heap" << std::endl;
}
}
if (target_phantom.IsValidReverseTarget()) {
if (forward_heap.WasInserted(target_phantom.reverse_segment_id.id)) {
std::cerr << "Found " << target_phantom.reverse_segment_id.id << " in forward_heap" << std::endl;
} else {
std::cerr << "Not found " << target_phantom.reverse_segment_id.id << " in forward_heap" << std::endl;
}
}
}
if (target_phantom.IsValidForwardTarget()) if (target_phantom.IsValidForwardTarget())
{ {