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

Fix bug and add test coverage for GetInternalEdgeRange

Browse Source
This commit is contained in:
Patrick Niklaus 2017-03-20 15:23:17 +00:00 committed by Patrick Niklaus
parent 655ca803d8
commit 2b397942fe
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/partition/multi_level_graph.hpp
View File

@ -85,6 +85,7 @@ class MultiLevelGraph : public util::StaticGraph<EdgeDataT, UseSharedMemory>
} }
// Fast scan over all relevant border edges // Fast scan over all relevant border edges
// For level 0 this yield the same result as GetAdjacentEdgeRange
auto GetBorderEdgeRange(const LevelID level, const NodeID node) const auto GetBorderEdgeRange(const LevelID level, const NodeID node) const
{ {
auto begin = BeginBorderEdges(level, node); auto begin = BeginBorderEdges(level, node);
@ -94,10 +95,11 @@ class MultiLevelGraph : public util::StaticGraph<EdgeDataT, UseSharedMemory>
// Fast scan over all relevant internal edges, that is edges that will not // Fast scan over all relevant internal edges, that is edges that will not
// leave the cell of that node at the given level // leave the cell of that node at the given level
// For level 0 this returns an empty edge range
auto GetInternalEdgeRange(const LevelID level, const NodeID node) const auto GetInternalEdgeRange(const LevelID level, const NodeID node) const
{ {
auto begin = SuperT::BeginEdges(node); auto begin = SuperT::BeginEdges(node);
auto end = SuperT::BeginEdges(node) + node_to_edge_offset[node + level]; auto end = BeginBorderEdges(level, node);
return util::irange<EdgeID>(begin, end); return util::irange<EdgeID>(begin, end);
} }
@ -110,7 +112,7 @@ class MultiLevelGraph : public util::StaticGraph<EdgeDataT, UseSharedMemory>
return SuperT::BeginEdges(node) + node_to_edge_offset[index + level]; return SuperT::BeginEdges(node) + node_to_edge_offset[index + level];
} }
// We save the level as senitel at the end // We save the level as sentinel at the end
LevelID GetNumberOfLevels() const { return node_to_edge_offset.back(); } LevelID GetNumberOfLevels() const { return node_to_edge_offset.back(); }
private: private:
@ -135,7 +137,7 @@ class MultiLevelGraph : public util::StaticGraph<EdgeDataT, UseSharedMemory>
permutation.begin(), permutation.begin(),
permutation.end(), permutation.end(),
[&edges, &highest_border_level](const auto &lhs, const auto &rhs) { [&edges, &highest_border_level](const auto &lhs, const auto &rhs) {
// sort by source node and then by level in acending order // sort by source node and then by level in ascending order
return std::tie(edges[lhs].source, highest_border_level[lhs], edges[lhs].target) < return std::tie(edges[lhs].source, highest_border_level[lhs], edges[lhs].target) <
std::tie(edges[rhs].source, highest_border_level[rhs], edges[rhs].target); std::tie(edges[rhs].source, highest_border_level[rhs], edges[rhs].target);
}); });
@ -151,7 +153,7 @@ class MultiLevelGraph : public util::StaticGraph<EdgeDataT, UseSharedMemory>
{ {
auto num_levels = mlp.GetNumberOfLevels(); auto num_levels = mlp.GetNumberOfLevels();
// we save one senitel element at the end // we save one sentinel element at the end
node_to_edge_offset.reserve(num_levels * (max_border_node_id + 1) + 1); node_to_edge_offset.reserve(num_levels * (max_border_node_id + 1) + 1);
auto iter = edge_and_level_begin; auto iter = edge_and_level_begin;
for (auto node : util::irange<NodeID>(0, max_border_node_id + 1)) for (auto node : util::irange<NodeID>(0, max_border_node_id + 1))

19
unit_tests/partition/multi_level_graph.cpp
View File

@ -90,6 +90,25 @@ BOOST_AUTO_TEST_CASE(check_edges_sorting)
CHECK_EQUAL_COLLECTIONS(graph.GetBorderEdgeRange(0, node), CHECK_EQUAL_COLLECTIONS(graph.GetBorderEdgeRange(0, node),
graph.GetAdjacentEdgeRange(node)); graph.GetAdjacentEdgeRange(node));
// on level 0 there are no internal edges
for (auto node : util::irange<NodeID>(0, 13))
CHECK_EQUAL_COLLECTIONS(graph.GetInternalEdgeRange(0, node), util::irange<EdgeID>(0, 0));
// the union of border and internal edge needs to equal the adjacent edges
for (auto level : util::irange<LevelID>(0, 4))
{
for (auto node : util::irange<NodeID>(0, 13))
{
const auto adjacent = graph.GetAdjacentEdgeRange(node);
const auto border = graph.GetBorderEdgeRange(level, node);
const auto internal = graph.GetInternalEdgeRange(level, node);
std::vector<EdgeID> merged;
std::copy(internal.begin(), internal.end(), std::back_inserter(merged));
std::copy(border.begin(), border.end(), std::back_inserter(merged));
CHECK_EQUAL_COLLECTIONS(adjacent, merged);
}
}
BOOST_CHECK_EQUAL(graph.GetBorderEdgeRange(1, 0).size(), 1); BOOST_CHECK_EQUAL(graph.GetBorderEdgeRange(1, 0).size(), 1);
BOOST_CHECK_EQUAL(graph.GetBorderEdgeRange(1, 1).size(), 0); BOOST_CHECK_EQUAL(graph.GetBorderEdgeRange(1, 1).size(), 0);
BOOST_CHECK_EQUAL(graph.GetBorderEdgeRange(1, 2).size(), 0); BOOST_CHECK_EQUAL(graph.GetBorderEdgeRange(1, 2).size(), 0);