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

Break tie for equal weights but different durations

Browse Source 
There is no possibility until multiple-weights are implemented
to break tie in the contraction and the direct shortest path plugin
as duration is not computed during contraction.

This must be fixed after multiple-weights implementation
by using `std::tie(weight, duration)` pairs everywhere.
This commit is contained in:
Michael Krasnyk
2017-09-27 15:17:47 +02:00
parent a862e5fb3a
commit f2333eb31a
3 changed files with 79 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/customizer/cell_customizer.hpp
+9 -5
View File
@@ -159,14 +159,16 @@ class CellCustomizer
}
const EdgeWeight to_weight = weight + subcell_weight;
const EdgeDuration to_duration = duration + *subcell_duration;
if (!heap.WasInserted(to))
{
heap.Insert(to, to_weight, {true, duration + *subcell_duration});
heap.Insert(to, to_weight, {true, to_duration});
}
else if (to_weight < heap.GetKey(to))
else if (std::tie(to_weight, to_duration) <
std::tie(heap.GetKey(to), heap.GetData(to).duration))
{
heap.DecreaseKey(to, to_weight);
heap.GetData(to) = {true, duration + *subcell_duration};
heap.GetData(to) = {true, to_duration};
}
}
@@ -191,14 +193,16 @@ class CellCustomizer
partition.GetCell(level - 1, node) != partition.GetCell(level - 1, to)))
{
const EdgeWeight to_weight = weight + data.weight;
const EdgeDuration to_duration = duration + data.duration;
if (!heap.WasInserted(to))
{
heap.Insert(to, to_weight, {false, duration + data.duration});
}
else if (to_weight < heap.GetKey(to))
else if (std::tie(to_weight, to_duration) <
std::tie(heap.GetKey(to), heap.GetData(to).duration))
{
heap.DecreaseKey(to, to_weight);
heap.GetData(to) = {false, duration + data.duration};
heap.GetData(to) = {false, to_duration};
}
}
}