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

Re-use the extractor edge based edge for loading the ebg in osrm-partition

Browse Source
This commit is contained in:
Daniel J. Hofmann 2017-02-14 17:30:28 +01:00 committed by Patrick Niklaus
parent c712fafae3
commit b5d63e5ed5
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/partition/edge_based_graph_reader.hpp
View File

@ -18,16 +18,11 @@ namespace osrm
namespace partition namespace partition
{ {
struct EdgeBasedGraphEdgeData struct EdgeBasedGraphEdgeData : extractor::EdgeBasedEdge
{ {
NodeID edge_id : 31; // We need to write out the full edge based graph again.
// Artificial edge used to fixup partitioning, see #3205.
// These artificial edges have invalid weight / duration. // TODO: in case we want to modify the graph we need to store a boundary_arc flag here
bool is_boundary_arc : 1;
EdgeWeight weight;
EdgeWeight duration : 30;
std::uint32_t forward : 1;
std::uint32_t backward : 1;
}; };
struct EdgeBasedGraph : util::DynamicGraph<EdgeBasedGraphEdgeData> struct EdgeBasedGraph : util::DynamicGraph<EdgeBasedGraphEdgeData>
@ -134,7 +129,6 @@ struct EdgeBasedGraphReader
forward_edge.source = reverse_edge.source = source; forward_edge.source = reverse_edge.source = source;
forward_edge.target = reverse_edge.target = target; forward_edge.target = reverse_edge.target = target;
forward_edge.data.edge_id = reverse_edge.data.edge_id = edges[i].edge_id; forward_edge.data.edge_id = reverse_edge.data.edge_id = edges[i].edge_id;
forward_edge.data.is_boundary_arc = reverse_edge.data.is_boundary_arc = false;
forward_edge.data.weight = reverse_edge.data.weight = INVALID_EDGE_WEIGHT; forward_edge.data.weight = reverse_edge.data.weight = INVALID_EDGE_WEIGHT;
forward_edge.data.duration = reverse_edge.data.duration = MAXIMAL_EDGE_DURATION; forward_edge.data.duration = reverse_edge.data.duration = MAXIMAL_EDGE_DURATION;
forward_edge.data.forward = reverse_edge.data.backward = true; forward_edge.data.forward = reverse_edge.data.backward = true;