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

- correct number of components in compressed graph by number of removed nodes

Browse Source 
- replace integer for loops by integer range-based loop
This commit is contained in:
Dennis Luxen 2014-12-23 14:51:25 +01:00
parent 4b1224f874
commit f42cc848d5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contractor/edge_based_graph_factory.cpp
View File

@ -476,16 +476,16 @@ void EdgeBasedGraphFactory::GenerateEdgeExpandedNodes()
component_explorer.run(); component_explorer.run();
SimpleLogger().Write() << "identified: " << component_explorer.get_number_of_components() SimpleLogger().Write() << "identified: " << component_explorer.get_number_of_components() - removed_node_count
<< " many components"; << " (compressed) components";
SimpleLogger().Write() << "identified " << component_explorer.get_size_one_count() SimpleLogger().Write() << "identified " << component_explorer.get_size_one_count() - removed_node_count
<< " SCCs of size 1"; << " (compressed) 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());
// loop over all edges and generate new set of nodes // loop over all edges and generate new set of nodes
for (NodeID u = 0, end = m_node_based_graph->GetNumberOfNodes(); u < end; ++u) for (const auto u : osrm::irange(0u, m_node_based_graph->GetNumberOfNodes()))
{ {
BOOST_ASSERT(u != SPECIAL_NODEID); BOOST_ASSERT(u != SPECIAL_NODEID);
BOOST_ASSERT(u < m_node_based_graph->GetNumberOfNodes()); BOOST_ASSERT(u < m_node_based_graph->GetNumberOfNodes());
@ -556,7 +556,7 @@ EdgeBasedGraphFactory::GenerateEdgeExpandedEdges(const std::string &original_edg
Percent progress(m_node_based_graph->GetNumberOfNodes()); Percent progress(m_node_based_graph->GetNumberOfNodes());
for (NodeID u = 0, end = m_node_based_graph->GetNumberOfNodes(); u < end; ++u) for (const auto u : osrm::irange(0u, m_node_based_graph->GetNumberOfNodes()))
{ {
progress.printStatus(u); progress.printStatus(u);
for (const EdgeID e1 : m_node_based_graph->GetAdjacentEdgeRange(u)) for (const EdgeID e1 : m_node_based_graph->GetAdjacentEdgeRange(u))