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

code cleanup in graph loading function

Browse Source
This commit is contained in:
Dennis Luxen 2014-12-22 16:03:22 +01:00
parent 5f2b2cd0f7
commit 4ec41392f7
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Util/GraphLoader.h
View File

@ -70,12 +70,12 @@ NodeID readBinaryOSRMGraphFromStream(std::istream &input_stream,
"Reprocess to get rid of this warning."; "Reprocess to get rid of this warning.";
} }
NodeID n, source, target;
EdgeID m;
short dir; // direction (0 = open, 1 = forward, 2+ = open)
std::unordered_map<NodeID, NodeID> ext_to_int_id_map; std::unordered_map<NodeID, NodeID> ext_to_int_id_map;
NodeID n;
input_stream.read((char *)&n, sizeof(NodeID)); input_stream.read((char *)&n, sizeof(NodeID));
SimpleLogger().Write() << "Importing n = " << n << " nodes "; SimpleLogger().Write() << "Importing n = " << n << " nodes ";
ExternalMemoryNode current_node; ExternalMemoryNode current_node;
for (NodeID i = 0; i < n; ++i) for (NodeID i = 0; i < n; ++i)
{ {
@ -95,8 +95,8 @@ NodeID readBinaryOSRMGraphFromStream(std::istream &input_stream,
// tighten vector sizes // tighten vector sizes
barrier_node_list.shrink_to_fit(); barrier_node_list.shrink_to_fit();
traffic_light_node_list.shrink_to_fit(); traffic_light_node_list.shrink_to_fit();
input_stream.read((char *)&m, sizeof(unsigned));
SimpleLogger().Write() << " and " << m << " edges "; // renumber nodes in turn restrictions
for (TurnRestriction &current_restriction : restriction_list) for (TurnRestriction &current_restriction : restriction_list)
{ {
auto internal_id_iter = ext_to_int_id_map.find(current_restriction.from.node); auto internal_id_iter = ext_to_int_id_map.find(current_restriction.from.node);
@ -124,12 +124,19 @@ NodeID readBinaryOSRMGraphFromStream(std::istream &input_stream,
current_restriction.to.node = internal_id_iter->second; current_restriction.to.node = internal_id_iter->second;
} }
edge_list.reserve(m);
EdgeWeight weight; EdgeWeight weight;
NodeID nameID; NodeID source, target;
unsigned nameID;
int length; int length;
short dir; // direction (0 = open, 1 = forward, 2+ = open)
bool is_roundabout, ignore_in_grid, is_access_restricted, is_split; bool is_roundabout, ignore_in_grid, is_access_restricted, is_split;
TravelMode travel_mode; TravelMode travel_mode;
EdgeID m;
input_stream.read((char *)&m, sizeof(unsigned));
edge_list.reserve(m);
SimpleLogger().Write() << " and " << m << " edges ";
for (EdgeID i = 0; i < m; ++i) for (EdgeID i = 0; i < m; ++i)
{ {
input_stream.read((char *)&source, sizeof(unsigned)); input_stream.read((char *)&source, sizeof(unsigned));
@ -178,7 +185,8 @@ NodeID readBinaryOSRMGraphFromStream(std::istream &input_stream,
continue; continue;
} }
target = internal_id_iter->second; target = internal_id_iter->second;
BOOST_ASSERT_MSG(source != SPECIAL_NODEID && target != SPECIAL_NODEID, "nonexisting source or target"); BOOST_ASSERT_MSG(source != SPECIAL_NODEID && target != SPECIAL_NODEID,
"nonexisting source or target");
if (source > target) if (source > target)
{ {
@ -198,8 +206,10 @@ NodeID readBinaryOSRMGraphFromStream(std::istream &input_stream,
travel_mode, travel_mode,
is_split); is_split);
} }
ext_to_int_id_map.clear();
tbb::parallel_sort(edge_list.begin(), edge_list.end()); tbb::parallel_sort(edge_list.begin(), edge_list.end());
for (unsigned i = 1; i < edge_list.size(); ++i) for (unsigned i = 1; i < edge_list.size(); ++i)
{ {
if ((edge_list[i - 1].target == edge_list[i].target) && if ((edge_list[i - 1].target == edge_list[i].target) &&
@ -252,11 +262,11 @@ NodeID readBinaryOSRMGraphFromStream(std::istream &input_stream,
} }
} }
} }
const auto new_end_iter = std::remove_if(edge_list.begin(), const auto new_end_iter = std::remove_if(edge_list.begin(), edge_list.end(), [] (const EdgeT &edge)
edge_list.end(), {
[](const EdgeT &edge) return edge.source == SPECIAL_NODEID ||
{ return edge.source == SPECIAL_NODEID; }); edge.target == SPECIAL_NODEID;
ext_to_int_id_map.clear(); });
edge_list.erase(new_end_iter, edge_list.end()); // remove excess candidates. edge_list.erase(new_end_iter, edge_list.end()); // remove excess candidates.
edge_list.shrink_to_fit(); edge_list.shrink_to_fit();
SimpleLogger().Write() << "Graph loaded ok and has " << edge_list.size() << " edges"; SimpleLogger().Write() << "Graph loaded ok and has " << edge_list.size() << " edges";