From 631c9f2360dddbb5511fd00f0e734ac4c43513a4 Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Fri, 7 Sep 2018 04:05:37 -0700 Subject: [PATCH] Remove logging. --- include/engine/phantom_node.hpp | 6 --- .../partitioner/edge_based_graph_reader.hpp | 52 ------------------- src/contractor/contractor.cpp | 14 ----- src/contractor/graph_contractor.cpp | 4 -- .../routing_algorithms/many_to_many_ch.cpp | 1 - src/extractor/edge_based_graph_factory.cpp | 2 - 6 files changed, 79 deletions(-) diff --git a/include/engine/phantom_node.hpp b/include/engine/phantom_node.hpp index ede3ea227..98bbde7ea 100644 --- a/include/engine/phantom_node.hpp +++ b/include/engine/phantom_node.hpp @@ -94,9 +94,6 @@ struct PhantomNode // x <-- this is PhantomNode.location // 0----1----2----3----4 <-- EdgeBasedGraph Node segments BOOST_ASSERT(forward_segment_id.enabled); - std::cout << "forward_distance: " << forward_distance; - std::cout << " forward_distance_offset: " << forward_distance_offset; - std::cout << std::endl; return forward_distance + forward_distance_offset; } @@ -108,9 +105,6 @@ struct PhantomNode // x <-- this is PhantomNode.location // 0----1----2----3----4 <-- EdgeBasedGraph Node segments BOOST_ASSERT(reverse_segment_id.enabled); - std::cout << "reverse_distance: " << reverse_distance; - std::cout << " reverse_distance_offset: " << reverse_distance_offset; - std::cout << std::endl; return reverse_distance + reverse_distance_offset; } diff --git a/include/partitioner/edge_based_graph_reader.hpp b/include/partitioner/edge_based_graph_reader.hpp index 8d49908c0..505fe49bf 100644 --- a/include/partitioner/edge_based_graph_reader.hpp +++ b/include/partitioner/edge_based_graph_reader.hpp @@ -40,16 +40,6 @@ splitBidirectionalEdges(const std::vector &edges) if (edge.data.weight == INVALID_EDGE_WEIGHT) continue; - std::cout << " EdgeBasedEdge {"; - std::cout << " source " << edge.source << ", target: " << edge.target; - std::cout << " EdgeBasedEdgeData data {"; - std::cout << " turn_id: " << edge.data.turn_id << ", weight: " << edge.data.weight; - std::cout << " distance: " << edge.data.distance << ", duration: " << edge.data.duration; - std::cout << " forward: " << (edge.data.forward == 0 ? "false" : "true") - << ", backward: " << (edge.data.backward == 0 ? "false" : "true"); - std::cout << " }"; - std::cout << "}" << std::endl; - directed.emplace_back(edge.source, edge.target, edge.data.turn_id, @@ -69,21 +59,6 @@ splitBidirectionalEdges(const std::vector &edges) edge.data.forward); } - std::cout << "Directed edges" << std::endl; - for (const auto &edge : directed) - { - std::cout << " EdgeBasedEdge {"; - std::cout << " source " << edge.source << ", target: " << edge.target; - std::cout << " EdgeBasedEdgeData data {"; - std::cout << " turn_id: " << edge.data.turn_id << ", weight: " << edge.data.weight; - std::cout << " distance: " << edge.data.distance << ", duration: " << edge.data.duration; - std::cout << " forward: " << (edge.data.forward == 0 ? "false" : "true") - << ", backward: " << (edge.data.backward == 0 ? "false" : "true"); - std::cout << " }"; - std::cout << "}" << std::endl; - } - std::cout << "Done directed edges" << std::endl; - return directed; } @@ -98,21 +73,6 @@ std::vector prepareEdgesForUsageInGraph(std::vector output_edges; output_edges.reserve(edges.size()); @@ -134,18 +94,6 @@ std::vector prepareEdgesForUsageInGraph(std::vectorsource << ", target: " << begin_interval->target; - std::cout << " EdgeBasedEdgeData data {"; - std::cout << " turn_id: " << begin_interval->data.turn_id - << ", weight: " << begin_interval->data.weight; - std::cout << " distance: " << begin_interval->data.distance - << ", duration: " << begin_interval->data.duration; - std::cout << " forward: " << (begin_interval->data.forward == 0 ? "false" : "true") - << ", backward: " << (begin_interval->data.backward == 0 ? "false" : "true"); - std::cout << " }"; - std::cout << "}" << std::endl; - BOOST_ASSERT_MSG(begin_interval->data.forward != begin_interval->data.backward, "The forward and backward flag need to be mutally exclusive"); diff --git a/src/contractor/contractor.cpp b/src/contractor/contractor.cpp index 9315f49fd..e7b71f14b 100644 --- a/src/contractor/contractor.cpp +++ b/src/contractor/contractor.cpp @@ -103,20 +103,6 @@ int Contractor::Run() std::vector> edge_filters; std::vector> cores; - std::cout << "Pre contractor edge-based-graph" << std::endl; - for (const auto &edge : edge_based_edge_list) - { - std::cout << " EdgeBasedEdge {"; - std::cout << " source " << edge.source << ", target: " << edge.target; - std::cout << " EdgeBasedEdgeData data {"; - std::cout << " turn_id: " << edge.data.turn_id << ", weight: " << edge.data.weight; - std::cout << " distance: " << edge.data.distance << ", duration: " << edge.data.duration; - std::cout << " forward: " << (edge.data.forward == 0 ? "false" : "true") - << ", backward: " << (edge.data.backward == 0 ? "false" : "true"); - std::cout << " }"; - std::cout << "}" << std::endl; - } - std::tie(query_graph, edge_filters) = contractExcludableGraph( toContractorGraph(number_of_edge_based_nodes, std::move(edge_based_edge_list)), std::move(node_weights), diff --git a/src/contractor/graph_contractor.cpp b/src/contractor/graph_contractor.cpp index b8d336892..8315a57c5 100644 --- a/src/contractor/graph_contractor.cpp +++ b/src/contractor/graph_contractor.cpp @@ -207,8 +207,6 @@ void ContractNode(ContractorThreadData *data, } else { - std::cout << "Contractor: " << in_data.distance << "," << out_data.distance - << std::endl; // CAREFUL: This only works due to the independent node-setting. This // guarantees that source is not connected to another node that is // contracted @@ -280,8 +278,6 @@ void ContractNode(ContractorThreadData *data, } else { - std::cout << "Contractor: " << in_data.distance << "," << out_data.distance - << std::endl; inserted_edges.emplace_back(source, target, path_weight, diff --git a/src/engine/routing_algorithms/many_to_many_ch.cpp b/src/engine/routing_algorithms/many_to_many_ch.cpp index d3c22f640..966887c85 100644 --- a/src/engine/routing_algorithms/many_to_many_ch.cpp +++ b/src/engine/routing_algorithms/many_to_many_ch.cpp @@ -68,7 +68,6 @@ void relaxOutgoingEdges(const DataFacade &facade, const auto edge_duration = data.duration; const auto edge_distance = data.distance; - std::cout << "edge_distance " << data.distance << std::endl; BOOST_ASSERT_MSG(edge_weight > 0, "edge_weight invalid"); const auto to_weight = weight + edge_weight; diff --git a/src/extractor/edge_based_graph_factory.cpp b/src/extractor/edge_based_graph_factory.cpp index 916e093ff..0d36d98f4 100644 --- a/src/extractor/edge_based_graph_factory.cpp +++ b/src/extractor/edge_based_graph_factory.cpp @@ -653,8 +653,6 @@ void EdgeBasedGraphFactory::GenerateEdgeExpandedEdges( auto duration = boost::numeric_cast(edge_data1.duration + duration_penalty); auto distance = boost::numeric_cast(edge_data1.distance); - std::cout << "EBGF distance: " << distance << std::endl; - EdgeBasedEdge edge_based_edge = {edge_based_node_from, edge_based_node_to, SPECIAL_NODEID, // This will be updated once the main