diff --git a/features/support/hooks.js b/features/support/hooks.js index 7bd8116cb..01c2e6e89 100644 --- a/features/support/hooks.js +++ b/features/support/hooks.js @@ -51,7 +51,7 @@ module.exports = function () { .defer(rimraf, this.scenarioLogFile) .awaitAll(callback); // uncomment to get path to logfile - console.log(' Writing logging output to ' + this.scenarioLogFile); + // console.log(' Writing logging output to ' + this.scenarioLogFile); }); this.After((scenario, callback) => { diff --git a/include/partitioner/cell_storage.hpp b/include/partitioner/cell_storage.hpp index 0ffe3e2cc..05370970c 100644 --- a/include/partitioner/cell_storage.hpp +++ b/include/partitioner/cell_storage.hpp @@ -102,9 +102,10 @@ template class CellStorageImpl { using ValueT = decltype(*std::declval()); - typedef boost:: - iterator_facade, ValueT, boost::random_access_traversal_tag> - base_t; + typedef boost::iterator_facade, + ValueT, + boost::random_access_traversal_tag> + base_t; public: typedef typename base_t::value_type value_type; @@ -196,10 +197,10 @@ template class CellStorageImpl const NodeID *const all_sources, const NodeID *const all_destinations) : num_source_nodes{data.num_source_nodes}, - num_destination_nodes{data.num_destination_nodes}, weights{all_weights + - data.value_offset}, - durations{all_durations + data.value_offset}, distances{all_distances + - data.value_offset}, + num_destination_nodes{data.num_destination_nodes}, + weights{all_weights + data.value_offset}, + durations{all_durations + data.value_offset}, + distances{all_distances + data.value_offset}, source_boundary{all_sources + data.source_boundary_offset}, destination_boundary{all_destinations + data.destination_boundary_offset} { @@ -217,8 +218,8 @@ template class CellStorageImpl const NodeID *const all_destinations) : num_source_nodes{data.num_source_nodes}, num_destination_nodes{data.num_destination_nodes}, weights{nullptr}, - durations{nullptr}, distances{nullptr}, source_boundary{all_sources + - data.source_boundary_offset}, + durations{nullptr}, distances{nullptr}, + source_boundary{all_sources + data.source_boundary_offset}, destination_boundary{all_destinations + data.destination_boundary_offset} { BOOST_ASSERT(num_source_nodes == 0 || all_sources != nullptr); diff --git a/src/engine/routing_algorithms/many_to_many_mld.cpp b/src/engine/routing_algorithms/many_to_many_mld.cpp index 5076083e1..f1ba43f00 100644 --- a/src/engine/routing_algorithms/many_to_many_mld.cpp +++ b/src/engine/routing_algorithms/many_to_many_mld.cpp @@ -64,7 +64,6 @@ void relaxOutgoingEdges(const DataFacade &facade, const auto &cell = cells.GetCell(metric, level, partition.GetCell(level, node)); if (DIRECTION == FORWARD_DIRECTION) { // Shortcuts in forward direction - // std::cout << "FORWARD_DIRECTION relaxOutgoingEdges" << std::endl; auto destination = cell.GetDestinationNodes().begin(); auto shortcut_durations = cell.GetOutDuration(node); auto shortcut_distances = cell.GetOutDistance(node); @@ -296,6 +295,7 @@ oneToManySearch(SearchEngineData &engine_working_data, EdgeWeight initial_weight, EdgeDuration initial_duration, EdgeDistance initial_distance) { + // Update single node paths update_values(node, initial_weight, initial_duration, initial_distance); @@ -372,6 +372,7 @@ oneToManySearch(SearchEngineData &engine_working_data, while (!query_heap.Empty() && !target_nodes_index.empty()) { + // Extract node from the heap const auto node = query_heap.DeleteMin(); const auto weight = query_heap.GetKey(node); @@ -534,13 +535,10 @@ void forwardRoutingStep(const DataFacade &facade, std::vector &middle_nodes_table, const PhantomNode &phantom_node) { - std::cout << (DIRECTION == FORWARD_DIRECTION ? "forward_routing_step FORWARD_DIRECTION: " : "forward_routing_step REVERSE_DIRECTION: ") << std::endl; const auto node = query_heap.DeleteMin(); const auto source_weight = query_heap.GetKey(node); const auto source_duration = query_heap.GetData(node).duration; const auto source_distance = query_heap.GetData(node).distance; - std::cout << "source_duration: " << source_duration << std::endl; - std::cout << "source_distance: " << source_distance << std::endl; // Check if each encountered node has an entry const auto &bucket_list = std::equal_range(search_space_with_buckets.begin(), @@ -554,9 +552,6 @@ void forwardRoutingStep(const DataFacade &facade, const auto target_weight = current_bucket.weight; const auto target_duration = current_bucket.duration; const auto target_distance = current_bucket.distance; - std::cout << "target_duration: " << target_duration << std::endl; - std::cout << "target_distance: " << target_distance << std::endl; - // Get the value location in the results tables: // * row-major direct (row_idx, column_idx) index for forward direction @@ -581,8 +576,6 @@ void forwardRoutingStep(const DataFacade &facade, current_duration = new_duration; current_distance = new_distance; middle_nodes_table[location] = node; - std::cout << "new_duration: " << new_duration << std::endl; - std::cout << "new_distance: " << new_distance << std::endl; } } diff --git a/src/extractor/extraction_containers.cpp b/src/extractor/extraction_containers.cpp index 433a4d368..aeb1a84c1 100644 --- a/src/extractor/extraction_containers.cpp +++ b/src/extractor/extraction_containers.cpp @@ -389,7 +389,6 @@ void ExtractionContainers::PrepareEdges(ScriptingEnvironment &scripting_environm const auto accurate_distance = util::coordinate_calculation::fccApproximateDistance(source_coord, target_coord); - std::cout << "accurate_distance: " << accurate_distance << std::endl; ExtractionSegment segment(source_coord, target_coord, distance, weight, duration); scripting_environment.ProcessSegment(segment);