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

If traffic CSV has an empty 4th column, preserve the weight on an edge while updating the duration.

Browse Source
This commit is contained in:
Daniel Patterson
2017-08-31 14:51:05 -07:00
parent 7702ebde61
commit b17f40862c
4 changed files with 61 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/updater/csv_source.cpp
+3 -1
View File
@@ -34,7 +34,9 @@ namespace csv
SegmentLookupTable readSegmentValues(const std::vector<std::string> &paths)
{
CSVFilesParser<Segment, SpeedSource> parser(
1, qi::ulong_long >> ',' >> qi::ulong_long, qi::uint_ >> -(',' >> qi::double_));
1,
qi::ulong_long >> ',' >> qi::ulong_long,
qi::uint_ >> -(',' >> (qi::double_ | qi::attr(std::numeric_limits<double>::quiet_NaN()))));
// Check consistency of keys in the result lookup table
auto result = parser(paths);
src/updater/updater.cpp
+23 -6
View File
@@ -162,13 +162,28 @@ updateSegmentData(const UpdaterConfig &config,
// closure to convert SpeedSource value to weight and count fallbacks to durations
std::atomic<std::uint32_t> fallbacks_to_duration{0};
auto convertToWeight = [&profile_properties, &fallbacks_to_duration](
const SpeedSource &value, double distance_in_meters) {
double rate = value.rate;
if (!std::isfinite(rate))
{ // use speed value in meters per second as the rate
const SegmentWeight &existing_weight, const SpeedSource &value, double distance_in_meters) {
double rate = std::numeric_limits<double>::quiet_NaN();
// if value.rate is not set, we fall back to duration
// this happens when there is no 4th column in the input CSV
// if value.rate is set but NaN, we keep the existing weight
// this happens when there is an empty 4th column in the input CSV
// otherwise, we use the value as the new rate
if (!value.rate)
{
++fallbacks_to_duration;
rate = value.speed / 3.6;
}
else
{
rate = *value.rate;
if (!std::isfinite(rate))
{
return existing_weight;
}
}
if (rate <= 0.)
return INVALID_SEGMENT_WEIGHT;
@@ -231,7 +246,8 @@ updateSegmentData(const UpdaterConfig &config,
{
auto segment_length = segment_lengths[segment_offset];
auto new_duration = convertToDuration(value->speed, segment_length);
auto new_weight = convertToWeight(*value, segment_length);
auto new_weight =
convertToWeight(fwd_weights_range[segment_offset], *value, segment_length);
fwd_was_updated = true;
fwd_weights_range[segment_offset] = new_weight;
@@ -270,7 +286,8 @@ updateSegmentData(const UpdaterConfig &config,
{
auto segment_length = segment_lengths[segment_offset];
auto new_duration = convertToDuration(value->speed, segment_length);
auto new_weight = convertToWeight(*value, segment_length);
auto new_weight =
convertToWeight(rev_weights_range[segment_offset], *value, segment_length);
rev_was_updated = true;
rev_weights_range[segment_offset] = new_weight;