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

Fix invalid warning

Browse Source
This commit is contained in:
Patrick Niklaus 2017-03-15 00:01:04 +00:00 committed by Patrick Niklaus
parent ed143b503d
commit 864543b023
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/updater/updater.cpp
View File

@ -535,7 +535,8 @@ Updater::LoadAndUpdateEdgeExpandedGraph(std::vector<extractor::EdgeBasedEdge> &e
auto segment_speed_lookup = csv::readSegmentValues(config.segment_speed_lookup_paths); auto segment_speed_lookup = csv::readSegmentValues(config.segment_speed_lookup_paths);
TIMER_START(segment); TIMER_START(segment);
updated_segments = updateSegmentData(config, profile_properties, segment_speed_lookup, segment_data); updated_segments =
updateSegmentData(config, profile_properties, segment_speed_lookup, segment_data);
// Now save out the updated compressed geometries // Now save out the updated compressed geometries
extractor::io::write(config.geometry_path, segment_data); extractor::io::write(config.geometry_path, segment_data);
TIMER_STOP(segment); TIMER_STOP(segment);
@ -642,15 +643,20 @@ Updater::LoadAndUpdateEdgeExpandedGraph(std::vector<extractor::EdgeBasedEdge> &e
const auto num_nodes = segment_data.GetForwardGeometry(geometry_id.id).size(); const auto num_nodes = segment_data.GetForwardGeometry(geometry_id.id).size();
const auto weight_min_value = static_cast<EdgeWeight>(num_nodes); const auto weight_min_value = static_cast<EdgeWeight>(num_nodes);
if (turn_weight_penalty + new_weight < weight_min_value) if (turn_weight_penalty + new_weight < weight_min_value)
{
if (turn_weight_penalty < 0)
{ {
util::Log(logWARNING) << "turn penalty " << turn_weight_penalty util::Log(logWARNING) << "turn penalty " << turn_weight_penalty
<< " is too negative: clamping turn weight to " << " is too negative: clamping turn weight to "
<< weight_min_value; << weight_min_value;
turn_weight_penalty = weight_min_value - new_weight; turn_weight_penalty = weight_min_value - new_weight;
}
turn_weight_penalties[edge_index] = turn_weight_penalty; turn_weight_penalties[edge_index] = turn_weight_penalty;
}
else
{
new_weight = weight_min_value;
}
}
// Update edge weight // Update edge weight
inbuffer.data.weight = new_weight + turn_weight_penalty; inbuffer.data.weight = new_weight + turn_weight_penalty;