diff --git a/Contractor/EdgeBasedGraphFactory.cpp b/Contractor/EdgeBasedGraphFactory.cpp index c516048cc..f4575a656 100644 --- a/Contractor/EdgeBasedGraphFactory.cpp +++ b/Contractor/EdgeBasedGraphFactory.cpp @@ -617,7 +617,6 @@ void EdgeBasedGraphFactory::Run( if( !edge_data.forward ) { continue; } - const NodeID target = m_node_based_graph->GetTarget(current_edge); BOOST_ASSERT( numbered_edges_count < m_node_based_graph->GetNumberOfEdges() ); edge_data.edgeBasedNodeID = numbered_edges_count; diff --git a/Contractor/GeometryCompressor.cpp b/Contractor/GeometryCompressor.cpp index 318b29d04..587984eb4 100644 --- a/Contractor/GeometryCompressor.cpp +++ b/Contractor/GeometryCompressor.cpp @@ -214,27 +214,24 @@ void GeometryCompressor::CompressEdge( void GeometryCompressor::PrintStatistics() const { - unsigned number_of_compressed_geometries = 0; - const unsigned compressed_edges = m_compressed_geometries.size(); - + const uint64_t compressed_edges = m_compressed_geometries.size(); + BOOST_ASSERT(0 == compressed_edges % 2); BOOST_ASSERT( m_compressed_geometries.size() + m_free_list.size() > 0 ); - unsigned long longest_chain_length = 0; + uint64_t number_of_compressed_geometries = 0; + uint64_t longest_chain_length = 0; BOOST_FOREACH(const std::vector & current_vector, m_compressed_geometries) { number_of_compressed_geometries += current_vector.size(); - longest_chain_length = std::max(longest_chain_length, current_vector.size()); + longest_chain_length = std::max(longest_chain_length, (uint64_t)current_vector.size()); } - BOOST_ASSERT(0 == compressed_edges % 2); - SimpleLogger().Write() << - "compressed edges: " << compressed_edges << - ", compressed geometries: " << number_of_compressed_geometries << - ", longest chain length: " << longest_chain_length << - ", cmpr ratio: " << ((float)compressed_edges/std::max(number_of_compressed_geometries, 1u) ) << - ", avg chain length: " << (float)number_of_compressed_geometries/std::max(1u, compressed_edges); - SimpleLogger().Write() << - "No bytes: " << 4*compressed_edges + number_of_compressed_geometries*4 +8; + SimpleLogger().Write() << "Geometry successfully removed:" + "\n compressed edges: " << compressed_edges << + "\n compressed geometries: " << number_of_compressed_geometries << + "\n longest chain length: " << longest_chain_length << + "\n cmpr ratio: " << ((float)compressed_edges/std::max(number_of_compressed_geometries, (uint64_t)1) ) << + "\n avg chain length: " << (float)number_of_compressed_geometries/std::max((uint64_t)1, compressed_edges); } const std::vector & GeometryCompressor::GetBucketReference( diff --git a/DataStructures/StaticRTree.h b/DataStructures/StaticRTree.h index 157affb1b..a2b936c84 100644 --- a/DataStructures/StaticRTree.h +++ b/DataStructures/StaticRTree.h @@ -758,10 +758,10 @@ public: ratio = std::min(1., ratio); } - SimpleLogger().Write(logDEBUG) << "[rtree] result_phantom_node.forward_offset: " << result_phantom_node.forward_offset; - SimpleLogger().Write(logDEBUG) << "[rtree] result_phantom_node.reverse_offset: " << result_phantom_node.reverse_offset; - SimpleLogger().Write(logDEBUG) << "[rtree] result_phantom_node.forward_weight: " << result_phantom_node.forward_weight; - SimpleLogger().Write(logDEBUG) << "[rtree] result_phantom_node.reverse_weight: " << result_phantom_node.reverse_weight; + // SimpleLogger().Write(logDEBUG) << "[rtree] result_phantom_node.forward_offset: " << result_phantom_node.forward_offset; + // SimpleLogger().Write(logDEBUG) << "[rtree] result_phantom_node.reverse_offset: " << result_phantom_node.reverse_offset; + // SimpleLogger().Write(logDEBUG) << "[rtree] result_phantom_node.forward_weight: " << result_phantom_node.forward_weight; + // SimpleLogger().Write(logDEBUG) << "[rtree] result_phantom_node.reverse_weight: " << result_phantom_node.reverse_weight; if (SPECIAL_NODEID != result_phantom_node.forward_node_id) { @@ -772,14 +772,14 @@ public: result_phantom_node.reverse_weight *= (1.-ratio); } - SimpleLogger().Write(logDEBUG) << "[rtree] result location: " << result_phantom_node.location << ", start: " << current_start_coordinate << ", end: " << current_end_coordinate; - SimpleLogger().Write(logDEBUG) << "[rtree] fwd node: " << result_phantom_node.forward_node_id << ", rev node: " << result_phantom_node.reverse_node_id; - SimpleLogger().Write(logDEBUG) << "[rtree] fwd weight: " << result_phantom_node.forward_weight << ", rev weight: " << result_phantom_node.reverse_weight; - SimpleLogger().Write(logDEBUG) << "[rtree] fwd offset: " << result_phantom_node.forward_offset << ", rev offset: " << result_phantom_node.reverse_offset; - SimpleLogger().Write(logDEBUG) << "[rtree] bidirected: " << (result_phantom_node.isBidirected() ? "y" : "n"); - SimpleLogger().Write(logDEBUG) << "[rtree] name id: " << result_phantom_node.name_id; - SimpleLogger().Write(logDEBUG) << "[rtree] geom id: " << result_phantom_node.packed_geometry_id; - SimpleLogger().Write(logDEBUG) << "[rtree] ratio: " << ratio; + // SimpleLogger().Write(logDEBUG) << "[rtree] result location: " << result_phantom_node.location << ", start: " << current_start_coordinate << ", end: " << current_end_coordinate; + // SimpleLogger().Write(logDEBUG) << "[rtree] fwd node: " << result_phantom_node.forward_node_id << ", rev node: " << result_phantom_node.reverse_node_id; + // SimpleLogger().Write(logDEBUG) << "[rtree] fwd weight: " << result_phantom_node.forward_weight << ", rev weight: " << result_phantom_node.reverse_weight; + // SimpleLogger().Write(logDEBUG) << "[rtree] fwd offset: " << result_phantom_node.forward_offset << ", rev offset: " << result_phantom_node.reverse_offset; + // SimpleLogger().Write(logDEBUG) << "[rtree] bidirected: " << (result_phantom_node.isBidirected() ? "y" : "n"); + // SimpleLogger().Write(logDEBUG) << "[rtree] name id: " << result_phantom_node.name_id; + // SimpleLogger().Write(logDEBUG) << "[rtree] geom id: " << result_phantom_node.packed_geometry_id; + // SimpleLogger().Write(logDEBUG) << "[rtree] ratio: " << ratio; return found_a_nearest_edge; } diff --git a/RoutingAlgorithms/AlternativePathRouting.h b/RoutingAlgorithms/AlternativePathRouting.h index b0ac3237f..5315b04ca 100644 --- a/RoutingAlgorithms/AlternativePathRouting.h +++ b/RoutingAlgorithms/AlternativePathRouting.h @@ -83,13 +83,11 @@ public: const PhantomNodes & phantom_node_pair, RawRouteData & raw_route_data ) { - SimpleLogger().Write(logDEBUG) << "alt path routing"; if( //phantom_node_pair.AtLeastOnePhantomNodeIsInvalid() || phantom_node_pair.PhantomNodesHaveEqualLocation() ) { // raw_route_data.lengthOfShortestPath = INVALID_EDGE_WEIGHT; // raw_route_data.lengthOfAlternativePath = INVALID_EDGE_WEIGHT; - // SimpleLogger().Write(logDEBUG) << "not executing path search"; return; } @@ -117,7 +115,7 @@ public: int upper_bound_to_shortest_path_distance = INVALID_EDGE_WEIGHT; NodeID middle_node = SPECIAL_NODEID; if(phantom_node_pair.source_phantom.forward_node_id != SPECIAL_NODEID ) { - SimpleLogger().Write(logDEBUG) << "fwd-a insert: " << phantom_node_pair.source_phantom.forward_node_id << ", w: " << -phantom_node_pair.source_phantom.GetForwardWeightPlusOffset(); + // SimpleLogger().Write(logDEBUG) << "fwd-a insert: " << phantom_node_pair.source_phantom.forward_node_id << ", w: " << -phantom_node_pair.source_phantom.GetForwardWeightPlusOffset(); forward_heap1.Insert( phantom_node_pair.source_phantom.forward_node_id, -phantom_node_pair.source_phantom.GetForwardWeightPlusOffset(), @@ -125,7 +123,7 @@ public: ); } if(phantom_node_pair.source_phantom.reverse_node_id != SPECIAL_NODEID ) { - SimpleLogger().Write(logDEBUG) << "fwd-b insert: " << phantom_node_pair.source_phantom.reverse_node_id << ", w: " << -phantom_node_pair.source_phantom.GetReverseWeightPlusOffset(); + // SimpleLogger().Write(logDEBUG) << "fwd-b insert: " << phantom_node_pair.source_phantom.reverse_node_id << ", w: " << -phantom_node_pair.source_phantom.GetReverseWeightPlusOffset(); forward_heap1.Insert( phantom_node_pair.source_phantom.reverse_node_id, -phantom_node_pair.source_phantom.GetReverseWeightPlusOffset(), @@ -134,7 +132,7 @@ public: } if(phantom_node_pair.target_phantom.forward_node_id != SPECIAL_NODEID ) { - SimpleLogger().Write(logDEBUG) << "rev-a insert: " << phantom_node_pair.target_phantom.forward_node_id << ", w: " << phantom_node_pair.target_phantom.GetForwardWeightPlusOffset(); + // SimpleLogger().Write(logDEBUG) << "rev-a insert: " << phantom_node_pair.target_phantom.forward_node_id << ", w: " << phantom_node_pair.target_phantom.GetForwardWeightPlusOffset(); reverse_heap1.Insert( phantom_node_pair.target_phantom.forward_node_id, phantom_node_pair.target_phantom.GetForwardWeightPlusOffset(), @@ -142,7 +140,7 @@ public: ); } if(phantom_node_pair.target_phantom.reverse_node_id != SPECIAL_NODEID ) { - SimpleLogger().Write(logDEBUG) << "rev-b insert: " << phantom_node_pair.target_phantom.reverse_node_id << ", w: " << phantom_node_pair.target_phantom.GetReverseWeightPlusOffset(); + // SimpleLogger().Write(logDEBUG) << "rev-b insert: " << phantom_node_pair.target_phantom.reverse_node_id << ", w: " << phantom_node_pair.target_phantom.GetReverseWeightPlusOffset(); reverse_heap1.Insert( phantom_node_pair.target_phantom.reverse_node_id, phantom_node_pair.target_phantom.GetReverseWeightPlusOffset(), diff --git a/RoutingAlgorithms/ShortestPathRouting.h b/RoutingAlgorithms/ShortestPathRouting.h index d49ffb890..aef1eabfd 100644 --- a/RoutingAlgorithms/ShortestPathRouting.h +++ b/RoutingAlgorithms/ShortestPathRouting.h @@ -57,8 +57,6 @@ public: RawRouteData & raw_route_data ) const { - SimpleLogger().Write(logDEBUG) << "shrt path routing"; - BOOST_FOREACH( const PhantomNodes & phantom_node_pair, phantom_nodes_vector @@ -66,8 +64,6 @@ public: if( phantom_node_pair.AtLeastOnePhantomNodeIsInvalid() ) { // raw_route_data.lengthOfShortestPath = INT_MAX; // raw_route_data.lengthOfAlternativePath = INT_MAX; - SimpleLogger().Write(logDEBUG) << "returning early"; - return; } } @@ -113,7 +109,7 @@ public: search_from_1st_node && phantom_node_pair.source_phantom.forward_node_id != SPECIAL_NODEID ) { - SimpleLogger().Write(logDEBUG) << "fwd1 insert: " << phantom_node_pair.source_phantom.forward_node_id << ", w: " << -phantom_node_pair.source_phantom.GetForwardWeightPlusOffset(); + // SimpleLogger().Write(logDEBUG) << "fwd1 insert: " << phantom_node_pair.source_phantom.forward_node_id << ", w: " << -phantom_node_pair.source_phantom.GetForwardWeightPlusOffset(); forward_heap1.Insert( phantom_node_pair.source_phantom.forward_node_id, distance1-phantom_node_pair.source_phantom.GetForwardWeightPlusOffset(), @@ -129,7 +125,7 @@ public: search_from_2nd_node && phantom_node_pair.source_phantom.reverse_node_id != SPECIAL_NODEID ) { - SimpleLogger().Write(logDEBUG) << "fwd1 insert: " << phantom_node_pair.source_phantom.reverse_node_id << ", w: " << -phantom_node_pair.source_phantom.GetReverseWeightPlusOffset(); + // SimpleLogger().Write(logDEBUG) << "fwd1 insert: " << phantom_node_pair.source_phantom.reverse_node_id << ", w: " << -phantom_node_pair.source_phantom.GetReverseWeightPlusOffset(); forward_heap1.Insert( phantom_node_pair.source_phantom.reverse_node_id, distance2-phantom_node_pair.source_phantom.GetReverseWeightPlusOffset(), @@ -144,7 +140,7 @@ public: //insert new backward nodes into backward heap, unadjusted. if( phantom_node_pair.target_phantom.forward_node_id != SPECIAL_NODEID ) { - SimpleLogger().Write(logDEBUG) << "rev insert: " << phantom_node_pair.target_phantom.forward_node_id << ", w: " << phantom_node_pair.target_phantom.GetForwardWeightPlusOffset(); + // SimpleLogger().Write(logDEBUG) << "rev insert: " << phantom_node_pair.target_phantom.forward_node_id << ", w: " << phantom_node_pair.target_phantom.GetForwardWeightPlusOffset(); reverse_heap1.Insert( phantom_node_pair.target_phantom.forward_node_id, phantom_node_pair.target_phantom.GetForwardWeightPlusOffset(), @@ -153,7 +149,7 @@ public: } if( phantom_node_pair.target_phantom.reverse_node_id != SPECIAL_NODEID ) { - SimpleLogger().Write(logDEBUG) << "rev insert: " << phantom_node_pair.target_phantom.reverse_node_id << ", w: " << phantom_node_pair.target_phantom.GetReverseWeightPlusOffset(); + // SimpleLogger().Write(logDEBUG) << "rev insert: " << phantom_node_pair.target_phantom.reverse_node_id << ", w: " << phantom_node_pair.target_phantom.GetReverseWeightPlusOffset(); reverse_heap2.Insert( phantom_node_pair.target_phantom.reverse_node_id, phantom_node_pair.target_phantom.GetReverseWeightPlusOffset(),