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

Remove unnecessary loading of turns data in updater

Browse Source
This commit is contained in:
Michael Krasnyk 2018-01-09 15:09:15 +01:00
parent c6d12e064c
commit 1cbfbd34cf
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/updater/updater_config.hpp
View File

@ -50,7 +50,6 @@ struct UpdaterConfig final : storage::IOConfig
".osrm.turn_penalties_index", ".osrm.turn_penalties_index",
".osrm.nbg_nodes", ".osrm.nbg_nodes",
".osrm.ebg_nodes", ".osrm.ebg_nodes",
".osrm.edges",
".osrm.geometry", ".osrm.geometry",
".osrm.fileIndex", ".osrm.fileIndex",
".osrm.properties", ".osrm.properties",

9
src/updater/updater.cpp
View File

@ -112,9 +112,6 @@ void checkWeightsConsistency(
extractor::EdgeBasedNodeDataContainer node_data; extractor::EdgeBasedNodeDataContainer node_data;
extractor::files::readNodeData(config.GetPath(".osrm.ebg_nodes"), node_data); extractor::files::readNodeData(config.GetPath(".osrm.ebg_nodes"), node_data);
extractor::TurnDataContainer turn_data;
extractor::files::readTurnData(config.GetPath(".osrm.edges"), turn_data);
for (auto &edge : edge_based_edge_list) for (auto &edge : edge_based_edge_list)
{ {
const auto node_id = edge.source; const auto node_id = edge.source;
@ -560,7 +557,6 @@ Updater::LoadAndUpdateEdgeExpandedGraph(std::vector<extractor::EdgeBasedEdge> &e
SOURCE_REF); SOURCE_REF);
extractor::EdgeBasedNodeDataContainer node_data; extractor::EdgeBasedNodeDataContainer node_data;
extractor::TurnDataContainer turn_data;
extractor::SegmentDataContainer segment_data; extractor::SegmentDataContainer segment_data;
extractor::ProfileProperties profile_properties; extractor::ProfileProperties profile_properties;
std::vector<TurnPenalty> turn_weight_penalties; std::vector<TurnPenalty> turn_weight_penalties;
@ -575,10 +571,6 @@ Updater::LoadAndUpdateEdgeExpandedGraph(std::vector<extractor::EdgeBasedEdge> &e
extractor::files::readNodeData(config.GetPath(".osrm.ebg_nodes"), node_data); extractor::files::readNodeData(config.GetPath(".osrm.ebg_nodes"), node_data);
}; };
const auto load_edge_data = [&] {
extractor::files::readTurnData(config.GetPath(".osrm.edges"), turn_data);
};
const auto load_turn_weight_penalties = [&] { const auto load_turn_weight_penalties = [&] {
using storage::io::FileReader; using storage::io::FileReader;
FileReader reader(config.GetPath(".osrm.turn_weight_penalties"), FileReader reader(config.GetPath(".osrm.turn_weight_penalties"),
@ -601,7 +593,6 @@ Updater::LoadAndUpdateEdgeExpandedGraph(std::vector<extractor::EdgeBasedEdge> &e
}; };
tbb::parallel_invoke(load_node_data, tbb::parallel_invoke(load_node_data,
load_edge_data,
load_segment_data, load_segment_data,
load_turn_weight_penalties, load_turn_weight_penalties,
load_turn_duration_penalties, load_turn_duration_penalties,