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

Fingerprint .turn_duration_penalties and .turn_weight_penalties

Browse Source
This commit is contained in:
Pepijn Schoen 2017-04-08 14:37:05 +02:00 committed by Patrick Niklaus
parent 12c11f1d48
commit 15f7257645
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/extractor/edge_based_graph_factory.cpp
View File

@ -559,13 +559,13 @@ void EdgeBasedGraphFactory::GenerateEdgeExpandedEdges(
BOOST_ASSERT(turn_weight_penalties.size() == turn_duration_penalties.size()); BOOST_ASSERT(turn_weight_penalties.size() == turn_duration_penalties.size());
{ {
storage::io::FileWriter writer(turn_weight_penalties_filename, storage::io::FileWriter writer(turn_weight_penalties_filename,
storage::io::FileWriter::HasNoFingerprint); storage::io::FileWriter::GenerateFingerprint);
storage::serialization::write(writer, turn_weight_penalties); storage::serialization::write(writer, turn_weight_penalties);
} }
{ {
storage::io::FileWriter writer(turn_duration_penalties_filename, storage::io::FileWriter writer(turn_duration_penalties_filename,
storage::io::FileWriter::HasNoFingerprint); storage::io::FileWriter::GenerateFingerprint);
storage::serialization::write(writer, turn_duration_penalties); storage::serialization::write(writer, turn_duration_penalties);
} }

8
src/storage/storage.cpp
View File

@ -304,7 +304,7 @@ void Storage::PopulateLayout(DataLayout &layout)
// load turn weight penalties // load turn weight penalties
{ {
io::FileReader turn_weight_penalties_file(config.turn_weight_penalties_path, io::FileReader turn_weight_penalties_file(config.turn_weight_penalties_path,
io::FileReader::HasNoFingerprint); io::FileReader::VerifyFingerprint);
const auto number_of_penalties = turn_weight_penalties_file.ReadElementCount64(); const auto number_of_penalties = turn_weight_penalties_file.ReadElementCount64();
layout.SetBlockSize<TurnPenalty>(DataLayout::TURN_WEIGHT_PENALTIES, number_of_penalties); layout.SetBlockSize<TurnPenalty>(DataLayout::TURN_WEIGHT_PENALTIES, number_of_penalties);
} }
@ -312,7 +312,7 @@ void Storage::PopulateLayout(DataLayout &layout)
// load turn duration penalties // load turn duration penalties
{ {
io::FileReader turn_duration_penalties_file(config.turn_duration_penalties_path, io::FileReader turn_duration_penalties_file(config.turn_duration_penalties_path,
io::FileReader::HasNoFingerprint); io::FileReader::VerifyFingerprint);
const auto number_of_penalties = turn_duration_penalties_file.ReadElementCount64(); const auto number_of_penalties = turn_duration_penalties_file.ReadElementCount64();
layout.SetBlockSize<TurnPenalty>(DataLayout::TURN_DURATION_PENALTIES, number_of_penalties); layout.SetBlockSize<TurnPenalty>(DataLayout::TURN_DURATION_PENALTIES, number_of_penalties);
} }
@ -701,7 +701,7 @@ void Storage::PopulateData(const DataLayout &layout, char *memory_ptr)
// load turn weight penalties // load turn weight penalties
{ {
io::FileReader turn_weight_penalties_file(config.turn_weight_penalties_path, io::FileReader turn_weight_penalties_file(config.turn_weight_penalties_path,
io::FileReader::HasNoFingerprint); io::FileReader::VerifyFingerprint);
const auto number_of_penalties = turn_weight_penalties_file.ReadElementCount64(); const auto number_of_penalties = turn_weight_penalties_file.ReadElementCount64();
const auto turn_weight_penalties_ptr = const auto turn_weight_penalties_ptr =
layout.GetBlockPtr<TurnPenalty, true>(memory_ptr, DataLayout::TURN_WEIGHT_PENALTIES); layout.GetBlockPtr<TurnPenalty, true>(memory_ptr, DataLayout::TURN_WEIGHT_PENALTIES);
@ -711,7 +711,7 @@ void Storage::PopulateData(const DataLayout &layout, char *memory_ptr)
// load turn duration penalties // load turn duration penalties
{ {
io::FileReader turn_duration_penalties_file(config.turn_duration_penalties_path, io::FileReader turn_duration_penalties_file(config.turn_duration_penalties_path,
io::FileReader::HasNoFingerprint); io::FileReader::VerifyFingerprint);
const auto number_of_penalties = turn_duration_penalties_file.ReadElementCount64(); const auto number_of_penalties = turn_duration_penalties_file.ReadElementCount64();
const auto turn_duration_penalties_ptr = const auto turn_duration_penalties_ptr =
layout.GetBlockPtr<TurnPenalty, true>(memory_ptr, DataLayout::TURN_DURATION_PENALTIES); layout.GetBlockPtr<TurnPenalty, true>(memory_ptr, DataLayout::TURN_DURATION_PENALTIES);

6
src/updater/updater.cpp
View File

@ -473,13 +473,13 @@ Updater::LoadAndUpdateEdgeExpandedGraph(std::vector<extractor::EdgeBasedEdge> &e
const auto load_turn_weight_penalties = [&] { const auto load_turn_weight_penalties = [&] {
using storage::io::FileReader; using storage::io::FileReader;
FileReader reader(config.turn_weight_penalties_path, FileReader::HasNoFingerprint); FileReader reader(config.turn_weight_penalties_path, FileReader::VerifyFingerprint);
storage::serialization::read(reader, turn_weight_penalties); storage::serialization::read(reader, turn_weight_penalties);
}; };
const auto load_turn_duration_penalties = [&] { const auto load_turn_duration_penalties = [&] {
using storage::io::FileReader; using storage::io::FileReader;
FileReader reader(config.turn_duration_penalties_path, FileReader::HasNoFingerprint); FileReader reader(config.turn_duration_penalties_path, FileReader::VerifyFingerprint);
storage::serialization::read(reader, turn_duration_penalties); storage::serialization::read(reader, turn_duration_penalties);
}; };
@ -661,7 +661,7 @@ Updater::LoadAndUpdateEdgeExpandedGraph(std::vector<extractor::EdgeBasedEdge> &e
if (update_turn_penalties) if (update_turn_penalties)
{ {
const auto save_penalties = [](const auto &filename, const auto &data) -> void { const auto save_penalties = [](const auto &filename, const auto &data) -> void {
storage::io::FileWriter writer(filename, storage::io::FileWriter::HasNoFingerprint); storage::io::FileWriter writer(filename, storage::io::FileWriter::GenerateFingerprint);
storage::serialization::write(writer, data); storage::serialization::write(writer, data);
}; };