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

support new restriction type in component analysis

Browse Source
This commit is contained in:
Dennis Luxen 2014-08-26 17:30:15 +02:00
parent 05a79f5b55
commit 2d677a8af9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Algorithms/StronglyConnectedComponents.h
View File

@ -119,8 +119,8 @@ class TarjanSCC
TIMER_START(SCC_LOAD); TIMER_START(SCC_LOAD);
for (const TurnRestriction &restriction : irs) for (const TurnRestriction &restriction : irs)
{ {
std::pair<NodeID, NodeID> restriction_source = {restriction.fromNode, std::pair<NodeID, NodeID> restriction_source = {restriction.from.node,
restriction.viaNode}; restriction.via.node};
unsigned index = 0; unsigned index = 0;
const auto restriction_iterator = m_restriction_map.find(restriction_source); const auto restriction_iterator = m_restriction_map.find(restriction_source);
if (restriction_iterator == m_restriction_map.end()) if (restriction_iterator == m_restriction_map.end())
@ -137,7 +137,7 @@ class TarjanSCC
{ {
continue; continue;
} }
else if (restriction.flags.isOnly) else if (restriction.flags.is_only)
{ {
// We are going to insert an is_only_*-restriction. There can be only one. // We are going to insert an is_only_*-restriction. There can be only one.
m_restriction_bucket_list.at(index).clear(); m_restriction_bucket_list.at(index).clear();
@ -145,7 +145,7 @@ class TarjanSCC
} }
m_restriction_bucket_list.at(index) m_restriction_bucket_list.at(index)
.emplace_back(restriction.toNode, restriction.flags.isOnly); .emplace_back(restriction.to.node, restriction.flags.is_only);
} }
barrier_node_list.insert(bn.begin(), bn.end()); barrier_node_list.insert(bn.begin(), bn.end());