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

remove debugging

Browse Source 
lint

remove debugging logging

comment out cuke log file logging

redo mld progress flag
This commit is contained in:
Kajari Ghosh 2018-10-23 04:37:43 -04:00
parent c290315b77
commit f10ad15bb4
4 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/support/hooks.js
View File

@ -51,7 +51,7 @@ module.exports = function () {
.defer(rimraf, this.scenarioLogFile) .defer(rimraf, this.scenarioLogFile)
.awaitAll(callback); .awaitAll(callback);
// uncomment to get path to logfile // 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) => { this.After((scenario, callback) => {

19
include/partitioner/cell_storage.hpp
View File

@ -102,9 +102,10 @@ template <storage::Ownership Ownership> class CellStorageImpl
{ {
using ValueT = decltype(*std::declval<ValuePtrT>()); using ValueT = decltype(*std::declval<ValuePtrT>());
typedef boost:: typedef boost::iterator_facade<ColumnIterator<ValueT>,
iterator_facade<ColumnIterator<ValueT>, ValueT, boost::random_access_traversal_tag> ValueT,
base_t; boost::random_access_traversal_tag>
base_t;
public: public:
typedef typename base_t::value_type value_type; typedef typename base_t::value_type value_type;
@ -196,10 +197,10 @@ template <storage::Ownership Ownership> class CellStorageImpl
const NodeID *const all_sources, const NodeID *const all_sources,
const NodeID *const all_destinations) const NodeID *const all_destinations)
: num_source_nodes{data.num_source_nodes}, : num_source_nodes{data.num_source_nodes},
num_destination_nodes{data.num_destination_nodes}, weights{all_weights + num_destination_nodes{data.num_destination_nodes},
data.value_offset}, weights{all_weights + data.value_offset},
durations{all_durations + data.value_offset}, distances{all_distances + durations{all_durations + data.value_offset},
data.value_offset}, distances{all_distances + data.value_offset},
source_boundary{all_sources + data.source_boundary_offset}, source_boundary{all_sources + data.source_boundary_offset},
destination_boundary{all_destinations + data.destination_boundary_offset} destination_boundary{all_destinations + data.destination_boundary_offset}
{ {
@ -217,8 +218,8 @@ template <storage::Ownership Ownership> class CellStorageImpl
const NodeID *const all_destinations) const NodeID *const all_destinations)
: num_source_nodes{data.num_source_nodes}, : num_source_nodes{data.num_source_nodes},
num_destination_nodes{data.num_destination_nodes}, weights{nullptr}, num_destination_nodes{data.num_destination_nodes}, weights{nullptr},
durations{nullptr}, distances{nullptr}, source_boundary{all_sources + durations{nullptr}, distances{nullptr},
data.source_boundary_offset}, source_boundary{all_sources + data.source_boundary_offset},
destination_boundary{all_destinations + data.destination_boundary_offset} destination_boundary{all_destinations + data.destination_boundary_offset}
{ {
BOOST_ASSERT(num_source_nodes == 0 || all_sources != nullptr); BOOST_ASSERT(num_source_nodes == 0 || all_sources != nullptr);

11
src/engine/routing_algorithms/many_to_many_mld.cpp
View File

@ -64,7 +64,6 @@ void relaxOutgoingEdges(const DataFacade<mld::Algorithm> &facade,
const auto &cell = cells.GetCell(metric, level, partition.GetCell(level, node)); const auto &cell = cells.GetCell(metric, level, partition.GetCell(level, node));
if (DIRECTION == FORWARD_DIRECTION) if (DIRECTION == FORWARD_DIRECTION)
{ // Shortcuts in forward direction { // Shortcuts in forward direction
// std::cout << "FORWARD_DIRECTION relaxOutgoingEdges" << std::endl;
auto destination = cell.GetDestinationNodes().begin(); auto destination = cell.GetDestinationNodes().begin();
auto shortcut_durations = cell.GetOutDuration(node); auto shortcut_durations = cell.GetOutDuration(node);
auto shortcut_distances = cell.GetOutDistance(node); auto shortcut_distances = cell.GetOutDistance(node);
@ -296,6 +295,7 @@ oneToManySearch(SearchEngineData<Algorithm> &engine_working_data,
EdgeWeight initial_weight, EdgeWeight initial_weight,
EdgeDuration initial_duration, EdgeDuration initial_duration,
EdgeDistance initial_distance) { EdgeDistance initial_distance) {
// Update single node paths // Update single node paths
update_values(node, initial_weight, initial_duration, initial_distance); update_values(node, initial_weight, initial_duration, initial_distance);
@ -372,6 +372,7 @@ oneToManySearch(SearchEngineData<Algorithm> &engine_working_data,
while (!query_heap.Empty() && !target_nodes_index.empty()) while (!query_heap.Empty() && !target_nodes_index.empty())
{ {
// Extract node from the heap // Extract node from the heap
const auto node = query_heap.DeleteMin(); const auto node = query_heap.DeleteMin();
const auto weight = query_heap.GetKey(node); const auto weight = query_heap.GetKey(node);
@ -534,13 +535,10 @@ void forwardRoutingStep(const DataFacade<Algorithm> &facade,
std::vector<NodeID> &middle_nodes_table, std::vector<NodeID> &middle_nodes_table,
const PhantomNode &phantom_node) 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 node = query_heap.DeleteMin();
const auto source_weight = query_heap.GetKey(node); const auto source_weight = query_heap.GetKey(node);
const auto source_duration = query_heap.GetData(node).duration; const auto source_duration = query_heap.GetData(node).duration;
const auto source_distance = query_heap.GetData(node).distance; 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 // Check if each encountered node has an entry
const auto &bucket_list = std::equal_range(search_space_with_buckets.begin(), const auto &bucket_list = std::equal_range(search_space_with_buckets.begin(),
@ -554,9 +552,6 @@ void forwardRoutingStep(const DataFacade<Algorithm> &facade,
const auto target_weight = current_bucket.weight; const auto target_weight = current_bucket.weight;
const auto target_duration = current_bucket.duration; const auto target_duration = current_bucket.duration;
const auto target_distance = current_bucket.distance; 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: // Get the value location in the results tables:
// * row-major direct (row_idx, column_idx) index for forward direction // * row-major direct (row_idx, column_idx) index for forward direction
@ -581,8 +576,6 @@ void forwardRoutingStep(const DataFacade<Algorithm> &facade,
current_duration = new_duration; current_duration = new_duration;
current_distance = new_distance; current_distance = new_distance;
middle_nodes_table[location] = node; middle_nodes_table[location] = node;
std::cout << "new_duration: " << new_duration << std::endl;
std::cout << "new_distance: " << new_distance << std::endl;
} }
} }

1
src/extractor/extraction_containers.cpp
View File

@ -389,7 +389,6 @@ void ExtractionContainers::PrepareEdges(ScriptingEnvironment &scripting_environm
const auto accurate_distance = const auto accurate_distance =
util::coordinate_calculation::fccApproximateDistance(source_coord, target_coord); 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); ExtractionSegment segment(source_coord, target_coord, distance, weight, duration);
scripting_environment.ProcessSegment(segment); scripting_environment.ProcessSegment(segment);