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

Address PR comment by @oxidase

Browse Source
This commit is contained in:
Patrick Niklaus 2017-03-10 11:03:45 +00:00 committed by Patrick Niklaus
parent 260a84b94b
commit ffd6311e7d
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/extractor/io.hpp
View File

@ -41,11 +41,8 @@ void write(const boost::filesystem::path &path, const SegmentDataContainer &segm
const auto fingerprint = storage::io::FileWriter::HasNoFingerprint; const auto fingerprint = storage::io::FileWriter::HasNoFingerprint;
storage::io::FileWriter writer{path, fingerprint}; storage::io::FileWriter writer{path, fingerprint};
// FIXME this _should_ just be size and the senitel below need to be removed writer.WriteElementCount32(segment_data.index.size());
writer.WriteElementCount32(segment_data.index.size() + 1); writer.WriteFrom(segment_data.index);
writer.WriteFrom(segment_data.index.data(), segment_data.index.size());
// FIMXE remove unnecessary senitel
writer.WriteElementCount32(segment_data.nodes.size());
writer.WriteElementCount32(segment_data.nodes.size()); writer.WriteElementCount32(segment_data.nodes.size());
writer.WriteFrom(segment_data.nodes); writer.WriteFrom(segment_data.nodes);

5
include/storage/io.hpp
View File

@ -284,7 +284,10 @@ class FileWriter
} }
} }
template <typename T> void WriteFrom(const std::vector<T> &src) { WriteFrom(src.data(), src.size()); } template <typename T> void WriteFrom(const std::vector<T> &src)
{
WriteFrom(src.data(), src.size());
}
template <typename T> void WriteFrom(const T &src) { WriteFrom(&src, 1); } template <typename T> void WriteFrom(const T &src) { WriteFrom(&src, 1); }

3
src/extractor/compressed_edge_container.cpp
View File

@ -330,6 +330,9 @@ NodeID CompressedEdgeContainer::GetLastEdgeSourceID(const EdgeID edge_id) const
std::unique_ptr<SegmentDataContainer> CompressedEdgeContainer::ToSegmentData() std::unique_ptr<SegmentDataContainer> CompressedEdgeContainer::ToSegmentData()
{ {
// Finalize the index
segment_data->index.push_back(segment_data->nodes.size());
return std::move(segment_data); return std::move(segment_data);
} }
} }

6
src/updater/updater.cpp
View File

@ -116,6 +116,7 @@ void GetNewWeight(const UpdaterConfig &config,
} }
} }
#if !defined(NDEBUG)
void CheckWeightsConsistency( void CheckWeightsConsistency(
const UpdaterConfig &config, const UpdaterConfig &config,
const std::vector<osrm::extractor::EdgeBasedEdge> &edge_based_edge_list) const std::vector<osrm::extractor::EdgeBasedEdge> &edge_based_edge_list)
@ -159,19 +160,18 @@ void CheckWeightsConsistency(
BOOST_ASSERT(weight <= edge.data.weight); BOOST_ASSERT(weight <= edge.data.weight);
} }
} }
#endif
EdgeID EdgeID
Updater::LoadAndUpdateEdgeExpandedGraph(std::vector<extractor::EdgeBasedEdge> &edge_based_edge_list, Updater::LoadAndUpdateEdgeExpandedGraph(std::vector<extractor::EdgeBasedEdge> &edge_based_edge_list,
std::vector<EdgeWeight> &node_weights) const std::vector<EdgeWeight> &node_weights) const
{ {
double weight_multiplier = 10;
// Propagate profile properties to contractor configuration structure // Propagate profile properties to contractor configuration structure
extractor::ProfileProperties profile_properties; extractor::ProfileProperties profile_properties;
storage::io::FileReader profile_properties_file(config.profile_properties_path, storage::io::FileReader profile_properties_file(config.profile_properties_path,
storage::io::FileReader::HasNoFingerprint); storage::io::FileReader::HasNoFingerprint);
profile_properties_file.ReadInto<extractor::ProfileProperties>(&profile_properties, 1); profile_properties_file.ReadInto<extractor::ProfileProperties>(&profile_properties, 1);
weight_multiplier = profile_properties.GetWeightMultiplier(); auto weight_multiplier = profile_properties.GetWeightMultiplier();
if (config.segment_speed_lookup_paths.size() + config.turn_penalty_lookup_paths.size() > 255) if (config.segment_speed_lookup_paths.size() + config.turn_penalty_lookup_paths.size() > 255)
throw util::exception("Limit of 255 segment speed and turn penalty files each reached" + throw util::exception("Limit of 255 segment speed and turn penalty files each reached" +