Implement exclude flags on CH using shared core
The core is fully contracted for each exclude flag and stored in a merged graph data structure.
This commit is contained in:
Patrick Niklaus
committed by
Patrick Niklaus
Patrick Niklaus
parent
4b75cb8b0e
commit
61c430c098
@@ -0,0 +1,109 @@
|
||||
#include "contractor/contracted_edge_container.hpp"
|
||||
|
||||
#include "../common/range_tools.hpp"
|
||||
|
||||
#include <boost/test/unit_test.hpp>
|
||||
|
||||
using namespace osrm;
|
||||
using namespace osrm::contractor;
|
||||
|
||||
namespace osrm
|
||||
{
|
||||
namespace contractor
|
||||
{
|
||||
|
||||
bool operator!=(const QueryEdge &lhs, const QueryEdge &rhs) { return !(lhs == rhs); }
|
||||
|
||||
std::ostream &operator<<(std::ostream &out, const QueryEdge::EdgeData &data)
|
||||
{
|
||||
out << "{" << data.turn_id << ", " << data.shortcut << ", " << data.duration << ", "
|
||||
<< data.weight << ", " << data.forward << ", " << data.backward << "}";
|
||||
return out;
|
||||
}
|
||||
|
||||
std::ostream &operator<<(std::ostream &out, const QueryEdge &edge)
|
||||
{
|
||||
out << "{" << edge.source << ", " << edge.target << ", " << edge.data << "}";
|
||||
return out;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_SUITE(contracted_edge_container)
|
||||
|
||||
BOOST_AUTO_TEST_CASE(merge_edge_of_multiple_graph)
|
||||
{
|
||||
ContractedEdgeContainer container;
|
||||
|
||||
util::DeallocatingVector<QueryEdge> edges;
|
||||
edges.push_back(QueryEdge{0, 1, {1, false, 3, 6, true, false}});
|
||||
edges.push_back(QueryEdge{1, 2, {2, false, 3, 6, true, false}});
|
||||
edges.push_back(QueryEdge{2, 0, {3, false, 3, 6, false, true}});
|
||||
edges.push_back(QueryEdge{2, 1, {4, false, 3, 6, false, true}});
|
||||
container.Insert(edges);
|
||||
|
||||
edges.clear();
|
||||
edges.push_back(QueryEdge{0, 1, {1, false, 3, 6, true, false}});
|
||||
edges.push_back(QueryEdge{1, 2, {2, false, 3, 6, true, false}});
|
||||
edges.push_back(QueryEdge{2, 0, {3, false, 12, 24, false, true}});
|
||||
edges.push_back(QueryEdge{2, 1, {4, false, 12, 24, false, true}});
|
||||
container.Merge(edges);
|
||||
|
||||
edges.clear();
|
||||
edges.push_back(QueryEdge{1, 4, {5, false, 3, 6, true, false}});
|
||||
container.Merge(edges);
|
||||
|
||||
util::DeallocatingVector<QueryEdge> reference_edges;
|
||||
reference_edges.push_back(QueryEdge{0, 1, {1, false, 3, 6, true, false}});
|
||||
reference_edges.push_back(QueryEdge{1, 2, {2, false, 3, 6, true, false}});
|
||||
reference_edges.push_back(QueryEdge{1, 4, {5, false, 3, 6, true, false}});
|
||||
reference_edges.push_back(QueryEdge{2, 0, {3, false, 3, 6, false, true}});
|
||||
reference_edges.push_back(QueryEdge{2, 0, {3, false, 12, 24, false, true}});
|
||||
reference_edges.push_back(QueryEdge{2, 1, {4, false, 3, 6, false, true}});
|
||||
reference_edges.push_back(QueryEdge{2, 1, {4, false, 12, 24, false, true}});
|
||||
CHECK_EQUAL_COLLECTIONS(container.edges, reference_edges);
|
||||
|
||||
auto filters = container.MakeEdgeFilters();
|
||||
BOOST_CHECK_EQUAL(filters.size(), 2);
|
||||
|
||||
REQUIRE_SIZE_RANGE(filters[0], 7);
|
||||
CHECK_EQUAL_RANGE(filters[0], true, true, false, true, true, true, true);
|
||||
|
||||
REQUIRE_SIZE_RANGE(filters[1], 7);
|
||||
CHECK_EQUAL_RANGE(filters[1], true, true, true, true, false, true, false);
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(merge_edge_of_multiple_disjoint_graph)
|
||||
{
|
||||
ContractedEdgeContainer container;
|
||||
|
||||
util::DeallocatingVector<QueryEdge> edges;
|
||||
edges.push_back(QueryEdge{0, 1, {1, false, 3, 6, true, false}});
|
||||
edges.push_back(QueryEdge{1, 2, {2, false, 3, 6, true, false}});
|
||||
edges.push_back(QueryEdge{2, 0, {3, false, 12, 24, false, true}});
|
||||
edges.push_back(QueryEdge{2, 1, {4, false, 12, 24, false, true}});
|
||||
container.Merge(edges);
|
||||
|
||||
edges.clear();
|
||||
edges.push_back(QueryEdge{1, 4, {5, false, 3, 6, true, false}});
|
||||
container.Merge(edges);
|
||||
|
||||
util::DeallocatingVector<QueryEdge> reference_edges;
|
||||
reference_edges.push_back(QueryEdge{0, 1, {1, false, 3, 6, true, false}});
|
||||
reference_edges.push_back(QueryEdge{1, 2, {2, false, 3, 6, true, false}});
|
||||
reference_edges.push_back(QueryEdge{1, 4, {5, false, 3, 6, true, false}});
|
||||
reference_edges.push_back(QueryEdge{2, 0, {3, false, 12, 24, false, true}});
|
||||
reference_edges.push_back(QueryEdge{2, 1, {4, false, 12, 24, false, true}});
|
||||
CHECK_EQUAL_COLLECTIONS(container.edges, reference_edges);
|
||||
|
||||
auto filters = container.MakeEdgeFilters();
|
||||
BOOST_CHECK_EQUAL(filters.size(), 2);
|
||||
|
||||
REQUIRE_SIZE_RANGE(filters[0], 5);
|
||||
CHECK_EQUAL_RANGE(filters[0], true, true, false, true, true);
|
||||
|
||||
REQUIRE_SIZE_RANGE(filters[1], 5);
|
||||
CHECK_EQUAL_RANGE(filters[1], false, false, true, false, false);
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_SUITE_END()
|
||||
@@ -0,0 +1,156 @@
|
||||
#include "contractor/graph_contractor.hpp"
|
||||
|
||||
#include "../common/range_tools.hpp"
|
||||
|
||||
#include <boost/test/test_case_template.hpp>
|
||||
#include <boost/test/unit_test.hpp>
|
||||
|
||||
#include <tbb/task_scheduler_init.h>
|
||||
|
||||
using namespace osrm;
|
||||
using namespace osrm::contractor;
|
||||
|
||||
BOOST_AUTO_TEST_SUITE(graph_contractor)
|
||||
|
||||
using TestEdge = std::tuple<unsigned, unsigned, int>;
|
||||
ContractorGraph makeGraph(const std::vector<TestEdge> &edges)
|
||||
{
|
||||
std::vector<ContractorEdge> input_edges;
|
||||
auto id = 0u;
|
||||
auto max_id = 0u;
|
||||
for (const auto &edge : edges)
|
||||
{
|
||||
unsigned start;
|
||||
unsigned target;
|
||||
int weight;
|
||||
std::tie(start, target, weight) = edge;
|
||||
max_id = std::max(std::max(start, target), max_id);
|
||||
input_edges.push_back(ContractorEdge{
|
||||
start, target, ContractorEdgeData{weight, weight * 2, id++, 0, false, true, false}});
|
||||
input_edges.push_back(ContractorEdge{
|
||||
target, start, ContractorEdgeData{weight, weight * 2, id++, 0, false, false, true}});
|
||||
}
|
||||
std::sort(input_edges.begin(), input_edges.end());
|
||||
|
||||
return ContractorGraph{max_id + 1, std::move(input_edges)};
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_CASE(contract_graph)
|
||||
{
|
||||
tbb::task_scheduler_init scheduler(1);
|
||||
/*
|
||||
* <--1--<
|
||||
* (0) >--3--> (1) >--3--> (3)
|
||||
* v ^ v ^
|
||||
* \ / \ |
|
||||
* 1 1 1 1
|
||||
* \ ^ \ /
|
||||
* >(5) > (4) >
|
||||
*/
|
||||
std::vector<TestEdge> edges = {TestEdge{0, 1, 3},
|
||||
TestEdge{0, 5, 1},
|
||||
TestEdge{1, 3, 3},
|
||||
TestEdge{1, 4, 1},
|
||||
TestEdge{3, 1, 1},
|
||||
TestEdge{4, 3, 1},
|
||||
TestEdge{5, 1, 1}};
|
||||
auto reference_graph = makeGraph(edges);
|
||||
|
||||
auto contracted_graph = reference_graph;
|
||||
std::vector<bool> core = contractGraph(contracted_graph, {1, 1, 1, 1, 1, 1});
|
||||
|
||||
// This contraction order is dependent on the priority caculation in the contractor
|
||||
// but deterministic for the same graph.
|
||||
CHECK_EQUAL_RANGE(core, false, false, false, false, false, false);
|
||||
|
||||
/* After contracting 0 and 2:
|
||||
*
|
||||
* Deltes edges 5 -> 0, 1 -> 0
|
||||
*
|
||||
* <--1--<
|
||||
* (0) ---3--> (1) >--3--> (3)
|
||||
* \ ^ v ^
|
||||
* \ / \ |
|
||||
* 1 1 1 1
|
||||
* \ ^ \ /
|
||||
* >(5) > (4) >
|
||||
*/
|
||||
reference_graph.DeleteEdgesTo(5, 0);
|
||||
reference_graph.DeleteEdgesTo(1, 0);
|
||||
|
||||
/* After contracting 5:
|
||||
*
|
||||
* Deletes edges 1 -> 5
|
||||
*
|
||||
* <--1--<
|
||||
* (0) ---3--> (1) >--3--> (3)
|
||||
* \ ^ v ^
|
||||
* \ / \ |
|
||||
* 1 1 1 1
|
||||
* \ / \ /
|
||||
* >(5) > (4) >
|
||||
*/
|
||||
reference_graph.DeleteEdgesTo(5, 0);
|
||||
reference_graph.DeleteEdgesTo(1, 0);
|
||||
|
||||
/* After contracting 3:
|
||||
*
|
||||
* Deletes edges 1 -> 3
|
||||
* Deletes edges 4 -> 3
|
||||
* Insert edge 4 -> 1
|
||||
*
|
||||
* <--1---
|
||||
* (0) ---3--> (1) >--3--- (3)
|
||||
* \ ^ v ^ |
|
||||
* \ / \ \ |
|
||||
* 1 1 1 2 1
|
||||
* \ / \ \ /
|
||||
* >(5) > (4) >
|
||||
*/
|
||||
reference_graph.DeleteEdgesTo(1, 3);
|
||||
reference_graph.DeleteEdgesTo(4, 3);
|
||||
// Insert shortcut
|
||||
reference_graph.InsertEdge(4, 1, {2, 4, 3, 0, true, true, false});
|
||||
|
||||
/* After contracting 4:
|
||||
*
|
||||
* Delete edges 1 -> 4
|
||||
*
|
||||
* <--1---
|
||||
* (0) ---3--> (1) >--3--- (3)
|
||||
* \ ^ v ^ |
|
||||
* \ / \ \ |
|
||||
* 1 1 1 2 1
|
||||
* \ / \ \ /
|
||||
* >(5) \ (4) >
|
||||
*/
|
||||
reference_graph.DeleteEdgesTo(1, 4);
|
||||
|
||||
/* After contracting 1:
|
||||
*
|
||||
* Delete no edges.
|
||||
*
|
||||
* <--1---
|
||||
* (0) ---3--> (1) >--3--- (3)
|
||||
* \ ^ v ^ |
|
||||
* \ / \ \ |
|
||||
* 1 1 1 2 1
|
||||
* \ / \ \ /
|
||||
* >(5) \ (4) >
|
||||
*/
|
||||
|
||||
REQUIRE_SIZE_RANGE(contracted_graph.GetAdjacentEdgeRange(0), 2);
|
||||
BOOST_CHECK(contracted_graph.FindEdge(0, 1) != SPECIAL_EDGEID);
|
||||
BOOST_CHECK(contracted_graph.FindEdge(0, 5) != SPECIAL_EDGEID);
|
||||
REQUIRE_SIZE_RANGE(contracted_graph.GetAdjacentEdgeRange(1), 0);
|
||||
REQUIRE_SIZE_RANGE(contracted_graph.GetAdjacentEdgeRange(2), 0);
|
||||
REQUIRE_SIZE_RANGE(contracted_graph.GetAdjacentEdgeRange(3), 3);
|
||||
BOOST_CHECK(contracted_graph.FindEdge(3, 1) != SPECIAL_EDGEID);
|
||||
BOOST_CHECK(contracted_graph.FindEdge(3, 4) != SPECIAL_EDGEID);
|
||||
REQUIRE_SIZE_RANGE(contracted_graph.GetAdjacentEdgeRange(4), 2);
|
||||
BOOST_CHECK(contracted_graph.FindEdge(4, 1) != SPECIAL_EDGEID);
|
||||
REQUIRE_SIZE_RANGE(contracted_graph.GetAdjacentEdgeRange(5), 1);
|
||||
BOOST_CHECK(contracted_graph.FindEdge(5, 1) != SPECIAL_EDGEID);
|
||||
}
|
||||
|
||||
BOOST_AUTO_TEST_SUITE_END()
|
||||
Reference in New Issue
Block a user