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

Only recompute weights for segments that needs to be updated

Browse Source
This commit is contained in:
Patrick Niklaus 2017-03-14 20:48:44 +00:00 committed by Patrick Niklaus
parent 5828f4400d
commit 1f238fedd8
1 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/updater/updater.cpp
View File

@ -225,7 +225,7 @@ UpdatedListAndSegmentData updaterSegmentData(const UpdaterConfig &config,
} }
} }
if (fwd_was_updated) if (fwd_was_updated)
updated_segments.push_back(GeometryID{true, geometry_id}); updated_segments.push_back(GeometryID{geometry_id, true});
// In this case we want it oriented from in forward directions // In this case we want it oriented from in forward directions
auto rev_weights_range = auto rev_weights_range =
@ -260,7 +260,7 @@ UpdatedListAndSegmentData updaterSegmentData(const UpdaterConfig &config,
} }
} }
if (rev_was_updated) if (rev_was_updated)
updated_segments.push_back(GeometryID{false, geometry_id}); updated_segments.push_back(GeometryID{geometry_id, false});
} }
}); // parallel_for }); // parallel_for
@ -473,6 +473,11 @@ 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);
auto turn_penalty_lookup = csv::readTurnValues(config.turn_penalty_lookup_paths); auto turn_penalty_lookup = csv::readTurnValues(config.turn_penalty_lookup_paths);
storage::io::FileReader edges_input_file(config.osrm_input_path.string() + ".edges",
storage::io::FileReader::HasNoFingerprint);
std::vector<extractor::OriginalEdgeData> edge_data(edges_input_file.ReadElementCount64());
edges_input_file.ReadInto(edge_data);
tbb::concurrent_vector<GeometryID> updated_segments; tbb::concurrent_vector<GeometryID> updated_segments;
extractor::SegmentDataContainer segment_data; extractor::SegmentDataContainer segment_data;
if (update_edge_weights) if (update_edge_weights)
@ -531,9 +536,29 @@ Updater::LoadAndUpdateEdgeExpandedGraph(std::vector<extractor::EdgeBasedEdge> &e
{ {
// Make a copy of the data from the memory map // Make a copy of the data from the memory map
extractor::EdgeBasedEdge inbuffer = edge_based_edge_ptr[edge_index]; extractor::EdgeBasedEdge inbuffer = edge_based_edge_ptr[edge_index];
bool needs_update = update_turn_penalties;
if (update_edge_weights || update_turn_penalties) if (update_edge_weights)
{ {
const auto geometry_id = edge_data[edge_index].via_geometry;
auto updated_iter = std::lower_bound(updated_segments.begin(),
updated_segments.end(),
geometry_id,
[](const GeometryID lhs, const GeometryID rhs) {
return std::tie(lhs.id, lhs.forward) <
std::tie(rhs.id, rhs.forward);
});
if (updated_iter == updated_segments.end() || updated_iter->id != geometry_id.id ||
updated_iter->forward != geometry_id.forward)
{
needs_update = update_turn_penalties;
}
else
{
needs_update = true;
}
}
using extractor::lookup::SegmentHeaderBlock; using extractor::lookup::SegmentHeaderBlock;
using extractor::lookup::SegmentBlock; using extractor::lookup::SegmentBlock;
@ -546,6 +571,8 @@ Updater::LoadAndUpdateEdgeExpandedGraph(std::vector<extractor::EdgeBasedEdge> &e
edge_segment_byte_ptr += sizeof(SegmentBlock) * (header->num_osm_nodes - 1); edge_segment_byte_ptr += sizeof(SegmentBlock) * (header->num_osm_nodes - 1);
auto last = reinterpret_cast<const SegmentBlock *>(edge_segment_byte_ptr); auto last = reinterpret_cast<const SegmentBlock *>(edge_segment_byte_ptr);
if (needs_update)
{
// Find a segment with zero speed and simultaneously compute the new edge weight // Find a segment with zero speed and simultaneously compute the new edge weight
EdgeWeight new_weight = 0; EdgeWeight new_weight = 0;
EdgeWeight new_duration = 0; EdgeWeight new_duration = 0;