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

output total number of compoments and those of size one

Browse Source
This commit is contained in:
Dennis Luxen 2014-12-23 14:32:46 +01:00
parent 71e2f2ed61
commit 8174b3b85a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contractor/edge_based_graph_factory.cpp
View File

@ -444,10 +444,9 @@ void EdgeBasedGraphFactory::RenumberEdges()
{ {
// renumber edge based node IDs // renumber edge based node IDs
unsigned numbered_edges_count = 0; unsigned numbered_edges_count = 0;
for (NodeID current_node = 0; current_node < m_node_based_graph->GetNumberOfNodes(); for (const auto current_node : osrm::irange(0u, m_node_based_graph->GetNumberOfNodes()))
++current_node)
{ {
for (EdgeID current_edge : m_node_based_graph->GetAdjacentEdgeRange(current_node)) for (const auto current_edge : m_node_based_graph->GetAdjacentEdgeRange(current_node))
{ {
EdgeData &edge_data = m_node_based_graph->GetEdgeData(current_edge); EdgeData &edge_data = m_node_based_graph->GetEdgeData(current_edge);
if (!edge_data.forward) if (!edge_data.forward)
@ -470,7 +469,7 @@ void EdgeBasedGraphFactory::RenumberEdges()
*/ */
void EdgeBasedGraphFactory::GenerateEdgeExpandedNodes() void EdgeBasedGraphFactory::GenerateEdgeExpandedNodes()
{ {
SimpleLogger().Write() << "Identifying components of the road network"; SimpleLogger().Write() << "Identifying components of the (compressed) road network";
// Run a BFS on the undirected graph and identify small components // Run a BFS on the undirected graph and identify small components
TarjanSCC<NodeBasedDynamicGraph> component_explorer( TarjanSCC<NodeBasedDynamicGraph> component_explorer(
@ -480,6 +479,8 @@ void EdgeBasedGraphFactory::GenerateEdgeExpandedNodes()
SimpleLogger().Write() << "identified: " << component_explorer.get_number_of_components() SimpleLogger().Write() << "identified: " << component_explorer.get_number_of_components()
<< " many components"; << " many components";
SimpleLogger().Write() << "identified " << component_explorer.get_size_one_count()
<< " SCCs of size 1";
SimpleLogger().Write() << "generating edge-expanded nodes"; SimpleLogger().Write() << "generating edge-expanded nodes";
Percent progress(m_node_based_graph->GetNumberOfNodes()); Percent progress(m_node_based_graph->GetNumberOfNodes());

3
tools/components.cpp
View File

@ -185,6 +185,9 @@ int main(int argc, char *argv[])
restriction_map, restriction_map,
bollard_node_list); bollard_node_list);
tarjan->run(); tarjan->run();
SimpleLogger().Write() << "identified: " << tarjan->get_number_of_components()
<< " many components";
SimpleLogger().Write() << "identified " << tarjan->get_size_one_count() << " SCCs of size 1";
// output // output
TIMER_START(SCC_RUN_SETUP); TIMER_START(SCC_RUN_SETUP);