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

Add a specilization for contraction without exclude flags

Browse Source 
This saves about 10% overhead and avoids contraction changes
to previous releases.
This commit is contained in:
Patrick Niklaus 2017-10-12 00:15:27 +00:00 committed by Patrick Niklaus
parent 088d4edc6b
commit 404c275101
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/contractor/contract_excludable_graph.hpp
View File

@ -12,12 +12,32 @@ namespace osrm
namespace contractor namespace contractor
{ {
using GraphFilterAndCore = std::tuple<QueryGraph, std::vector<std::vector<bool>>>; using GraphAndFilter = std::tuple<QueryGraph, std::vector<std::vector<bool>>>;
inline auto contractFullGraph(ContractorGraph contractor_graph,
std::vector<EdgeWeight> node_weights)
{
auto num_nodes = contractor_graph.GetNumberOfNodes();
contractGraph(contractor_graph, node_weights);
auto edges = toEdges<QueryEdge>(std::move(contractor_graph));
std::vector<bool> edge_filter(edges.size(), true);
return GraphAndFilter{QueryGraph{num_nodes, std::move(edges)}, {std::move(edge_filter)}};
}
inline auto contractExcludableGraph(ContractorGraph contractor_graph_, inline auto contractExcludableGraph(ContractorGraph contractor_graph_,
std::vector<EdgeWeight> node_weights, std::vector<EdgeWeight> node_weights,
const std::vector<std::vector<bool>> &filters) const std::vector<std::vector<bool>> &filters)
{ {
if (filters.size() == 1)
{
if (std::all_of(filters.front().begin(), filters.front().end(), [](auto v) { return v; }))
{
return contractFullGraph(std::move(contractor_graph_), std::move(node_weights));
}
}
auto num_nodes = contractor_graph_.GetNumberOfNodes(); auto num_nodes = contractor_graph_.GetNumberOfNodes();
ContractedEdgeContainer edge_container; ContractedEdgeContainer edge_container;
ContractorGraph shared_core_graph; ContractorGraph shared_core_graph;
@ -64,7 +84,7 @@ inline auto contractExcludableGraph(ContractorGraph contractor_graph_,
edge_container.Merge(toEdges<QueryEdge>(std::move(filtered_core_graph))); edge_container.Merge(toEdges<QueryEdge>(std::move(filtered_core_graph)));
} }
return GraphFilterAndCore{QueryGraph{num_nodes, std::move(edge_container.edges)}, return GraphAndFilter{QueryGraph{num_nodes, std::move(edge_container.edges)},
edge_container.MakeEdgeFilters()}; edge_container.MakeEdgeFilters()};
} }
} }