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

adjust cell_storage tests to new StaticGraph interface

Browse Source
This commit is contained in:
Michael Krasnyk 2017-02-21 16:20:03 +01:00 committed by Patrick Niklaus
parent ed7438b9ba
commit 1541d32a42
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/util/static_graph.hpp
View File

@ -74,7 +74,7 @@ template <typename EdgeDataT> struct SortableEdgeWithData : SortableEdgeWithData
template <typename... Ts> template <typename... Ts>
SortableEdgeWithData(NodeIterator source, NodeIterator target, Ts &&... data) SortableEdgeWithData(NodeIterator source, NodeIterator target, Ts &&... data)
: Base{source, target}, data(std::forward<Ts>(data)...) : Base{source, target}, data{std::forward<Ts>(data)...}
{ {
} }
}; };

6
unit_tests/util/cell_storage.cpp
View File

@ -55,14 +55,14 @@ auto makeGraph(const std::vector<MockEdge> &mock_edges)
bool forward; bool forward;
bool backward; bool backward;
}; };
using Edge = util::StaticGraph<EdgeData>::InputEdge; using Edge = static_graph_details::SortableEdgeWithData<EdgeData>;
std::vector<Edge> edges; std::vector<Edge> edges;
std::size_t max_id = 0; std::size_t max_id = 0;
for (const auto &m : mock_edges) for (const auto &m : mock_edges)
{ {
max_id = std::max<std::size_t>(max_id, std::max(m.start, m.target)); max_id = std::max<std::size_t>(max_id, std::max(m.start, m.target));
edges.push_back(Edge{m.start, m.target, EdgeData{true, false}}); edges.push_back(Edge{m.start, m.target, true, false});
edges.push_back(Edge{m.target, m.start, EdgeData{false, true}}); edges.push_back(Edge{m.target, m.start, false, true});
} }
std::sort(edges.begin(), edges.end()); std::sort(edges.begin(), edges.end());
return util::StaticGraph<EdgeData>(max_id + 1, edges); return util::StaticGraph<EdgeData>(max_id + 1, edges);

17
unit_tests/util/static_graph.cpp
View File

@ -60,8 +60,7 @@ template <unsigned NUM_NODES, unsigned NUM_EDGES> struct RandomArrayEntryFixture
std::uniform_int_distribution<> node_udist(0, NUM_NODES - 1); std::uniform_int_distribution<> node_udist(0, NUM_NODES - 1);
for (unsigned i = 0; i < NUM_EDGES; i++) for (unsigned i = 0; i < NUM_EDGES; i++)
{ {
edges.emplace_back( edges.emplace_back(TestEdgeArrayEntry{static_cast<unsigned>(node_udist(g)), EdgeID{i}});
TestEdgeArrayEntry{static_cast<unsigned>(node_udist(g)), TestData{i}});
} }
for (unsigned i = 0; i < NUM_NODES; i++) for (unsigned i = 0; i < NUM_NODES; i++)
@ -96,8 +95,8 @@ BOOST_FIXTURE_TEST_CASE(array_test, TestRandomArrayEntryFixture)
BOOST_AUTO_TEST_CASE(target_test) BOOST_AUTO_TEST_CASE(target_test)
{ {
std::vector<TestInputEdge> input_edges = {TestInputEdge{0, 1, TestData{1}}, std::vector<TestInputEdge> input_edges = {TestInputEdge{0, 1, EdgeID{1}},
TestInputEdge{3, 0, TestData{2}}}; TestInputEdge{3, 0, EdgeID{2}}};
TestStaticGraph simple_graph = TestStaticGraph(4, input_edges); TestStaticGraph simple_graph = TestStaticGraph(4, input_edges);
auto target = simple_graph.GetTarget(simple_graph.FindEdge(3, 0)); auto target = simple_graph.GetTarget(simple_graph.FindEdge(3, 0));
@ -114,11 +113,11 @@ BOOST_AUTO_TEST_CASE(find_test)
* (3) -3-> (4) * (3) -3-> (4)
* <-4- * <-4-
*/ */
std::vector<TestInputEdge> input_edges = {TestInputEdge{0, 1, TestData{1}}, std::vector<TestInputEdge> input_edges = {TestInputEdge{0, 1, EdgeID{1}},
TestInputEdge{3, 0, TestData{2}}, TestInputEdge{3, 0, EdgeID{2}},
TestInputEdge{3, 0, TestData{5}}, TestInputEdge{3, 0, EdgeID{5}},
TestInputEdge{3, 4, TestData{3}}, TestInputEdge{3, 4, EdgeID{3}},
TestInputEdge{4, 3, TestData{4}}}; TestInputEdge{4, 3, EdgeID{4}}};
TestStaticGraph simple_graph(5, input_edges); TestStaticGraph simple_graph(5, input_edges);
auto eit = simple_graph.FindEdge(0, 1); auto eit = simple_graph.FindEdge(0, 1);