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

remove debug output

Browse Source
This commit is contained in:
Dennis Luxen 2014-03-21 19:19:33 +01:00
parent 12b43d206c
commit bcaea1a617
2 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Contractor/EdgeBasedGraphFactory.cpp
View File

@ -371,14 +371,14 @@ void EdgeBasedGraphFactory::InsertEdgeBasedNode(
BOOST_ASSERT( forward_data.distance >= temp_sum ); BOOST_ASSERT( forward_data.distance >= temp_sum );
forward_dist_prefix_sum[i] = forward_data.distance - temp_sum; forward_dist_prefix_sum[i] = forward_data.distance - temp_sum;
} }
BOOST_ASSERT( forward_data.distance == temp_sum ); // BOOST_ASSERT( forward_data.distance == temp_sum );
temp_sum = 0; temp_sum = 0;
for( unsigned i = 0; i < reverse_geometry.size(); ++i ) { for( unsigned i = 0; i < reverse_geometry.size(); ++i ) {
temp_sum += reverse_geometry[i].second; temp_sum += reverse_geometry[i].second;
BOOST_ASSERT( reverse_data.distance >= temp_sum ); BOOST_ASSERT( reverse_data.distance >= temp_sum );
reverse_dist_prefix_sum[i] = reverse_data.distance - temp_sum; reverse_dist_prefix_sum[i] = reverse_data.distance - temp_sum;
} }
BOOST_ASSERT( reverse_data.distance == temp_sum ); // BOOST_ASSERT( reverse_data.distance == temp_sum );
BOOST_ASSERT( forward_geometry.size() == reverse_geometry.size() ); BOOST_ASSERT( forward_geometry.size() == reverse_geometry.size() );
@ -570,9 +570,16 @@ void EdgeBasedGraphFactory::Run(
BOOST_ASSERT( 0 != reverse_weight1 ); BOOST_ASSERT( 0 != reverse_weight1 );
BOOST_ASSERT( 0 != forward_weight2 ); BOOST_ASSERT( 0 != forward_weight2 );
const bool add_traffic_signal_penalty = (m_traffic_lights.find(v) != m_traffic_lights.end());
// add weight of e2's to e1 // add weight of e2's to e1
m_node_based_graph->GetEdgeData(forward_e1).distance += fwd_edge_data2.distance; m_node_based_graph->GetEdgeData(forward_e1).distance += fwd_edge_data2.distance;
m_node_based_graph->GetEdgeData(reverse_e1).distance += rev_edge_data2.distance; m_node_based_graph->GetEdgeData(reverse_e1).distance += rev_edge_data2.distance;
if (add_traffic_signal_penalty)
{
m_node_based_graph->GetEdgeData(forward_e1).distance += speed_profile.trafficSignalPenalty;
m_node_based_graph->GetEdgeData(reverse_e1).distance += speed_profile.trafficSignalPenalty;
}
// extend e1's to targets of e2's // extend e1's to targets of e2's
m_node_based_graph->SetTarget(forward_e1, w); m_node_based_graph->SetTarget(forward_e1, w);
@ -595,7 +602,7 @@ void EdgeBasedGraphFactory::Run(
forward_e2, forward_e2,
v, v,
w, w,
forward_weight1, forward_weight1 + (add_traffic_signal_penalty ? speed_profile.trafficSignalPenalty :0),
forward_weight2 forward_weight2
); );
m_geometry_compressor.CompressEdge( m_geometry_compressor.CompressEdge(
@ -603,8 +610,8 @@ void EdgeBasedGraphFactory::Run(
reverse_e2, reverse_e2,
v, v,
u, u,
reverse_weight1, reverse_weight1 ,
reverse_weight2 reverse_weight2 + (add_traffic_signal_penalty ? speed_profile.trafficSignalPenalty :0)
); );
++removed_node_count; ++removed_node_count;
@ -808,21 +815,14 @@ void EdgeBasedGraphFactory::Run(
const EdgeData & edge_data1 = m_node_based_graph->GetEdgeData(e1); const EdgeData & edge_data1 = m_node_based_graph->GetEdgeData(e1);
const EdgeData & edge_data2 = m_node_based_graph->GetEdgeData(e2); const EdgeData & edge_data2 = m_node_based_graph->GetEdgeData(e2);
// BOOST_ASSERT( BOOST_ASSERT(edge_data1.edgeBasedNodeID != edge_data2.edgeBasedNodeID);
// edge_data1.edgeBasedNodeID < m_node_based_graph->GetNumberOfEdges() BOOST_ASSERT(edge_data1.forward);
// ); BOOST_ASSERT(edge_data2.forward);
// BOOST_ASSERT(
// edge_data2.edgeBasedNodeID < m_node_based_graph->GetNumberOfEdges()
// );
BOOST_ASSERT(
edge_data1.edgeBasedNodeID != edge_data2.edgeBasedNodeID
);
BOOST_ASSERT( edge_data1.forward );
BOOST_ASSERT( edge_data2.forward );
// 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() ) {
SimpleLogger().Write(logDEBUG) << "penalty: " << speed_profile.trafficSignalPenalty;
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);

23
prepare.cpp
View File

@ -222,6 +222,7 @@ int main (int argc, char *argv[]) {
return 1; return 1;
} }
speedProfile.trafficSignalPenalty = 10*lua_tointeger(myLuaState, -1); speedProfile.trafficSignalPenalty = 10*lua_tointeger(myLuaState, -1);
SimpleLogger().Write(logDEBUG) << "traffic_signal_penalty: " << speedProfile.trafficSignalPenalty;
if(0 != luaL_dostring( myLuaState, "return u_turn_penalty\n")) { if(0 != luaL_dostring( myLuaState, "return u_turn_penalty\n")) {
std::cerr << std::cerr <<
@ -364,11 +365,11 @@ int main (int argc, char *argv[]) {
} }
node_array[node].firstEdge = position; //=edge node_array[node].firstEdge = position; //=edge
position += edge - lastEdge; //remove position += edge - lastEdge; //remove
SimpleLogger().Write(logDEBUG) << "node: " << node << ", edge: " << edge << ", position: " << position << ", lastEdge: " << lastEdge; // SimpleLogger().Write(logDEBUG) << "node: " << node << ", edge: " << edge << ", position: " << position << ", lastEdge: " << lastEdge;
} }
SimpleLogger().Write(logDEBUG) << "contracted_edge_count: " << contracted_edge_count << ", position: " << position << ", lastEdge: " << lastEdge; // SimpleLogger().Write(logDEBUG) << "contracted_edge_count: " << contracted_edge_count << ", position: " << position << ", lastEdge: " << lastEdge;
SimpleLogger().Write(logDEBUG) << "marking range [" << max_used_node_id << "," << node_array.size() << ") as dummies"; // SimpleLogger().Write(logDEBUG) << "marking range [" << max_used_node_id << "," << node_array.size() << ") as dummies";
for (unsigned sentinel_counter = max_used_node_id; for (unsigned sentinel_counter = max_used_node_id;
sentinel_counter != node_array.size(); sentinel_counter != node_array.size();
@ -377,7 +378,7 @@ int main (int argc, char *argv[]) {
{ {
//sentinel element, guarded against underflow //sentinel element, guarded against underflow
node_array[sentinel_counter].firstEdge = contracted_edge_count; node_array[sentinel_counter].firstEdge = contracted_edge_count;
SimpleLogger().Write(logDEBUG) << "node_array[" << sentinel_counter << "].firstEdge = " << node_array[sentinel_counter].firstEdge; // SimpleLogger().Write(logDEBUG) << "node_array[" << sentinel_counter << "].firstEdge = " << node_array[sentinel_counter].firstEdge;
} }
// node_array.back().firstEdge = contracted_edge_count; //sentinel element // node_array.back().firstEdge = contracted_edge_count; //sentinel element
// ++max_used_node_id; // ++max_used_node_id;
@ -387,10 +388,10 @@ int main (int argc, char *argv[]) {
// "no. of nodes dont match" // "no. of nodes dont match"
// ); // );
for(unsigned i = 0; i < node_array.size(); ++i) // for(unsigned i = 0; i < node_array.size(); ++i)
{ // {
SimpleLogger().Write() << "node_array[" << i << "].firstEdge = " << node_array[i].firstEdge; // SimpleLogger().Write() << "node_array[" << i << "].firstEdge = " << node_array[i].firstEdge;
} // }
unsigned node_array_size = node_array.size(); unsigned node_array_size = node_array.size();
@ -410,7 +411,7 @@ int main (int argc, char *argv[]) {
for(unsigned edge = 0; edge < contractedEdgeList.size(); ++edge) for(unsigned edge = 0; edge < contractedEdgeList.size(); ++edge)
{ {
SimpleLogger().Write(logDEBUG) << ">[" << edge << "] (" << contractedEdgeList[edge].source << "," << contractedEdgeList[edge].target << ")"; // SimpleLogger().Write(logDEBUG) << ">[" << edge << "] (" << contractedEdgeList[edge].source << "," << contractedEdgeList[edge].target << ")";
} }
StaticGraph<EdgeData>::_StrEdge currentEdge; StaticGraph<EdgeData>::_StrEdge currentEdge;
@ -438,8 +439,8 @@ int main (int argc, char *argv[]) {
return 1; return 1;
} }
//Serialize edges //Serialize edges
SimpleLogger().Write(logDEBUG) << "edge[" << edge << "], (" << contractedEdgeList[edge].source << "," << currentEdge.target << "), w: " << currentEdge.data.distance << // SimpleLogger().Write(logDEBUG) << "edge[" << edge << "], (" << contractedEdgeList[edge].source << "," << currentEdge.target << "), w: " << currentEdge.data.distance <<
"shortcut: " << (currentEdge.data.shortcut ? "y" : "n"); // "shortcut: " << (currentEdge.data.shortcut ? "y" : "n");
hsgr_output_stream.write((char*) &currentEdge, sizeof(StaticGraph<EdgeData>::_StrEdge)); hsgr_output_stream.write((char*) &currentEdge, sizeof(StaticGraph<EdgeData>::_StrEdge));
// ++edge; // ++edge;
++usedEdgeCounter; ++usedEdgeCounter;