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

minor refactoring of code layout

Browse Source
This commit is contained in:
Dennis Luxen 2014-04-28 19:37:42 +02:00
parent f02ec41fbc
commit e44ebe0743
1 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Contractor/EdgeBasedGraphFactory.cpp
View File

@ -721,17 +721,10 @@ void EdgeBasedGraphFactory::Run(
unsigned skipped_barrier_turns_counter = 0; unsigned skipped_barrier_turns_counter = 0;
unsigned compressed = 0; unsigned compressed = 0;
p.reinit(m_node_based_graph->GetNumberOfNodes()); p.reinit(m_node_based_graph->GetNumberOfNodes());
for( for (NodeIterator u = 0, end = m_node_based_graph->GetNumberOfNodes(); u < end; ++u)
NodeIterator u = 0, end = m_node_based_graph->GetNumberOfNodes(); {
u < end; for (EdgeIterator e1 = m_node_based_graph->BeginEdges(u), last_edge_u = m_node_based_graph->EndEdges(u); e1 < last_edge_u; ++e1)
++u {
) {
for(
EdgeIterator e1 = m_node_based_graph->BeginEdges(u),
last_edge_u = m_node_based_graph->EndEdges(u);
e1 < last_edge_u;
++e1
) {
if( !m_node_based_graph->GetEdgeData(e1).forward ) { if( !m_node_based_graph->GetEdgeData(e1).forward ) {
continue; continue;
} }
@ -747,27 +740,31 @@ void EdgeBasedGraphFactory::Run(
e2 < last_edge_v; e2 < last_edge_v;
++e2 ++e2
) { ) {
if( !m_node_based_graph->GetEdgeData(e2).forward ) { if (!m_node_based_graph->GetEdgeData(e2).forward)
{
continue; continue;
} }
const NodeIterator w = m_node_based_graph->GetTarget(e2); const NodeIterator w = m_node_based_graph->GetTarget(e2);
if( if ((to_node_of_only_restriction != SPECIAL_NODEID) && (w != to_node_of_only_restriction))
to_node_of_only_restriction != SPECIAL_NODEID && {
w != to_node_of_only_restriction
) {
//We are at an only_-restriction but not at the right turn. //We are at an only_-restriction but not at the right turn.
++restricted_turns_counter; ++restricted_turns_counter;
continue; continue;
} }
if( is_barrier_node) { if (is_barrier_node)
if(u != w) { {
if (u != w)
{
++skipped_barrier_turns_counter; ++skipped_barrier_turns_counter;
continue; continue;
} }
} else { }
if ( (u == w) && (m_node_based_graph->GetOutDegree(v) > 1) ) { else
{
if ((u == w) && (m_node_based_graph->GetOutDegree(v) > 1))
{
++skipped_uturns_counter; ++skipped_uturns_counter;
continue; continue;
} }
@ -775,11 +772,8 @@ void EdgeBasedGraphFactory::Run(
//only add an edge if turn is not a U-turn except when it is //only add an edge if turn is not a U-turn except when it is
//at the end of a dead-end street //at the end of a dead-end street
if ( if (CheckIfTurnIsRestricted(u, v, w) && (to_node_of_only_restriction == SPECIAL_NODEID) && (w != to_node_of_only_restriction))
CheckIfTurnIsRestricted(u, v, w) && {
(to_node_of_only_restriction == SPECIAL_NODEID) &&
(w != to_node_of_only_restriction)
) {
++restricted_turns_counter; ++restricted_turns_counter;
continue; continue;
} }
@ -794,19 +788,22 @@ void EdgeBasedGraphFactory::Run(
// the following is the core of the loop. // the following is the core of the loop.
unsigned distance = edge_data1.distance; unsigned distance = edge_data1.distance;
if( m_traffic_lights.find(v) != m_traffic_lights.end() ) { if (m_traffic_lights.find(v) != m_traffic_lights.end())
{
distance += speed_profile.trafficSignalPenalty; distance += speed_profile.trafficSignalPenalty;
} }
const int turn_penalty = GetTurnPenalty(u, v, w, lua_state); const int turn_penalty = GetTurnPenalty(u, v, w, lua_state);
TurnInstruction turn_instruction = AnalyzeTurn(u, v, w); TurnInstruction turn_instruction = AnalyzeTurn(u, v, w);
if(turn_instruction == TurnInstructionsClass::UTurn){ if (turn_instruction == TurnInstructionsClass::UTurn)
{
distance += speed_profile.uTurnPenalty; distance += speed_profile.uTurnPenalty;
} }
distance += turn_penalty; distance += turn_penalty;
const bool edge_is_compressed = m_geometry_compressor.HasEntryForID(e1); const bool edge_is_compressed = m_geometry_compressor.HasEntryForID(e1);
if(edge_is_compressed) { if (edge_is_compressed)
{
++compressed; ++compressed;
} }
@ -821,11 +818,9 @@ void EdgeBasedGraphFactory::Run(
++original_edges_counter; ++original_edges_counter;
if(original_edge_data_vector.size() > 100000) { if (original_edge_data_vector.size() > 100000)
FlushVectorToStream( {
edge_data_file, FlushVectorToStream(edge_data_file, original_edge_data_vector);
original_edge_data_vector
);
} }
BOOST_ASSERT( SPECIAL_NODEID != edge_data1.edgeBasedNodeID ); BOOST_ASSERT( SPECIAL_NODEID != edge_data1.edgeBasedNodeID );