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

reformat SCC class, make sure road distances are not counted twice

Browse Source
This commit is contained in:
Dennis Luxen 2014-07-17 10:43:21 +02:00
parent 53c102e1e9
commit a7eb89b2f0
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Algorithms/StronglyConnectedComponents.h
View File

@ -81,13 +81,14 @@ class TarjanSCC
struct TarjanEdgeData struct TarjanEdgeData
{ {
TarjanEdgeData() TarjanEdgeData() : distance(INVALID_EDGE_WEIGHT), name_id(INVALID_NAMEID) {}
: distance(INVALID_EDGE_WEIGHT), name_id(INVALID_NAMEID) TarjanEdgeData(int distance, unsigned name_id) //, bool shortcut, short type, bool forward,
// bool backward, bool reversedEdge) :
: distance(distance),
name_id(name_id) //, shortcut(shortcut), type(type), forward(forward),
// backward(backward), reversedEdge(reversedEdge)
{ {
} }
TarjanEdgeData(int distance, unsigned name_id)//, bool shortcut, short type, bool forward, bool backward, bool reversedEdge) :
:distance(distance), name_id(name_id)//, shortcut(shortcut), type(type), forward(forward), backward(backward), reversedEdge(reversedEdge)
{}
int distance; int distance;
unsigned name_id; unsigned name_id;
}; };
@ -238,7 +239,7 @@ class TarjanSCC
unsigned component_index = 0, size_of_current_component = 0; unsigned component_index = 0, size_of_current_component = 0;
int index = 0; int index = 0;
NodeID last_node = m_node_based_graph->GetNumberOfNodes(); NodeID last_node = m_node_based_graph->GetNumberOfNodes();
for(const NodeID node : boost::irange(0u, last_node)) for (const NodeID node : boost::irange(0u, last_node))
{ {
if (SPECIAL_NODEID == components_index[node]) if (SPECIAL_NODEID == components_index[node])
{ {
@ -265,7 +266,7 @@ class TarjanSCC
++index; ++index;
// Traverse outgoing edges // Traverse outgoing edges
for (auto e2 : m_node_based_graph->GetAdjacentEdgeRange(v)) for (const auto e2 : m_node_based_graph->GetAdjacentEdgeRange(v))
{ {
const TarjanDynamicGraph::NodeIterator vprime = const TarjanDynamicGraph::NodeIterator vprime =
m_node_based_graph->GetTarget(e2); m_node_based_graph->GetTarget(e2);
@ -343,13 +344,16 @@ class TarjanSCC
// } // }
const TarjanDynamicGraph::NodeIterator v = m_node_based_graph->GetTarget(e1); const TarjanDynamicGraph::NodeIterator v = m_node_based_graph->GetTarget(e1);
total_network_distance += 100 * FixedPointCoordinate::ApproximateEuclideanDistance( if (u < v || SPECIAL_EDGEID == m_node_based_graph->FindEdge(v, u))
m_coordinate_list[u].lat, {
m_coordinate_list[u].lon, total_network_distance +=
m_coordinate_list[v].lat, 100 * FixedPointCoordinate::ApproximateEuclideanDistance(
m_coordinate_list[v].lon); m_coordinate_list[u].lat,
m_coordinate_list[u].lon,
if (true) //SHRT_MAX != m_node_based_graph->GetEdgeData(e1).type) m_coordinate_list[v].lat,
m_coordinate_list[v].lon);
}
if (true) // SHRT_MAX != m_node_based_graph->GetEdgeData(e1).type)
{ {
BOOST_ASSERT(e1 != SPECIAL_EDGEID); BOOST_ASSERT(e1 != SPECIAL_EDGEID);
BOOST_ASSERT(u != SPECIAL_NODEID); BOOST_ASSERT(u != SPECIAL_NODEID);