This commit removes all occurences of unconnected boundary nodes and switches to the simple heuristic of picking U for the forward and V for the backward node. This performs better than several fancy heuristics.
104 lines
3.3 KiB
C++
104 lines
3.3 KiB
C++
#ifndef OSRM_EXTRACTOR_IO_HPP
|
|
#define OSRM_EXTRACTOR_IO_HPP
|
|
|
|
#include "extractor/datasources.hpp"
|
|
#include "extractor/nbg_to_ebg.hpp"
|
|
#include "extractor/segment_data_container.hpp"
|
|
|
|
#include "storage/io.hpp"
|
|
|
|
#include <boost/assert.hpp>
|
|
|
|
namespace osrm
|
|
{
|
|
namespace extractor
|
|
{
|
|
namespace io
|
|
{
|
|
|
|
inline void read(const boost::filesystem::path &path, std::vector<NBGToEBG> &mapping)
|
|
{
|
|
const auto fingerprint = storage::io::FileReader::VerifyFingerprint;
|
|
storage::io::FileReader reader{path, fingerprint};
|
|
|
|
reader.DeserializeVector(mapping);
|
|
}
|
|
|
|
inline void write(const boost::filesystem::path &path, const std::vector<NBGToEBG> &mapping)
|
|
{
|
|
const auto fingerprint = storage::io::FileWriter::GenerateFingerprint;
|
|
storage::io::FileWriter reader{path, fingerprint};
|
|
|
|
reader.SerializeVector(mapping);
|
|
}
|
|
|
|
inline void read(const boost::filesystem::path &path, Datasources &sources)
|
|
{
|
|
const auto fingerprint = storage::io::FileReader::HasNoFingerprint;
|
|
storage::io::FileReader reader{path, fingerprint};
|
|
|
|
reader.ReadInto(sources);
|
|
}
|
|
|
|
inline void write(const boost::filesystem::path &path, Datasources &sources)
|
|
{
|
|
const auto fingerprint = storage::io::FileWriter::HasNoFingerprint;
|
|
storage::io::FileWriter writer{path, fingerprint};
|
|
|
|
writer.WriteFrom(sources);
|
|
}
|
|
|
|
template <>
|
|
inline void read(const boost::filesystem::path &path, SegmentDataContainer &segment_data)
|
|
{
|
|
const auto fingerprint = storage::io::FileReader::HasNoFingerprint;
|
|
storage::io::FileReader reader{path, fingerprint};
|
|
|
|
auto num_indices = reader.ReadElementCount32();
|
|
segment_data.index.resize(num_indices);
|
|
reader.ReadInto(segment_data.index.data(), num_indices);
|
|
|
|
auto num_entries = reader.ReadElementCount32();
|
|
segment_data.nodes.resize(num_entries);
|
|
segment_data.fwd_weights.resize(num_entries);
|
|
segment_data.rev_weights.resize(num_entries);
|
|
segment_data.fwd_durations.resize(num_entries);
|
|
segment_data.rev_durations.resize(num_entries);
|
|
segment_data.datasources.resize(num_entries);
|
|
|
|
reader.ReadInto(segment_data.nodes);
|
|
reader.ReadInto(segment_data.fwd_weights);
|
|
reader.ReadInto(segment_data.rev_weights);
|
|
reader.ReadInto(segment_data.fwd_durations);
|
|
reader.ReadInto(segment_data.rev_durations);
|
|
reader.ReadInto(segment_data.datasources);
|
|
}
|
|
|
|
template <>
|
|
inline void write(const boost::filesystem::path &path, const SegmentDataContainer &segment_data)
|
|
{
|
|
const auto fingerprint = storage::io::FileWriter::HasNoFingerprint;
|
|
storage::io::FileWriter writer{path, fingerprint};
|
|
|
|
writer.WriteElementCount32(segment_data.index.size());
|
|
writer.WriteFrom(segment_data.index);
|
|
|
|
writer.WriteElementCount32(segment_data.nodes.size());
|
|
BOOST_ASSERT(segment_data.fwd_weights.size() == segment_data.nodes.size());
|
|
BOOST_ASSERT(segment_data.rev_weights.size() == segment_data.nodes.size());
|
|
BOOST_ASSERT(segment_data.fwd_durations.size() == segment_data.nodes.size());
|
|
BOOST_ASSERT(segment_data.rev_durations.size() == segment_data.nodes.size());
|
|
BOOST_ASSERT(segment_data.datasources.size() == segment_data.nodes.size());
|
|
writer.WriteFrom(segment_data.nodes);
|
|
writer.WriteFrom(segment_data.fwd_weights);
|
|
writer.WriteFrom(segment_data.rev_weights);
|
|
writer.WriteFrom(segment_data.fwd_durations);
|
|
writer.WriteFrom(segment_data.rev_durations);
|
|
writer.WriteFrom(segment_data.datasources);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#endif
|