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

Fix overflows when handling size_t

Browse Source
This commit is contained in:
Patrick Niklaus 2015-03-08 00:53:15 +01:00
parent 0c735953c9
commit 028fad94af
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data_structures/hidden_markov_model.hpp
View File

@ -41,7 +41,6 @@ namespace osrm
{ {
namespace matching namespace matching
{ {
// FIXME this value should be a table based on samples/meter (or samples/min)
static const double log_2_pi = std::log(2. * M_PI); static const double log_2_pi = std::log(2. * M_PI);
static const double IMPOSSIBLE_LOG_PROB = -std::numeric_limits<double>::infinity(); static const double IMPOSSIBLE_LOG_PROB = -std::numeric_limits<double>::infinity();
static const double MINIMAL_LOG_PROB = std::numeric_limits<double>::lowest(); static const double MINIMAL_LOG_PROB = std::numeric_limits<double>::lowest();

31
routing_algorithms/map_matching.hpp
View File

@ -88,7 +88,7 @@ class MapMatching final : public BasicRoutingInterface<DataFacadeT, MapMatching<
const double gps_precision, const double gps_precision,
osrm::matching::SubMatchingList &sub_matchings) const osrm::matching::SubMatchingList &sub_matchings) const
{ {
BOOST_ASSERT(!candidates_list.empty()); BOOST_ASSERT(!candidates_list.empty() && !trace_coordinates.empty());
// TODO replace default values with table lookup based on sampling frequency // TODO replace default values with table lookup based on sampling frequency
EmissionLogProbability emission_log_probability( EmissionLogProbability emission_log_probability(
@ -98,7 +98,7 @@ class MapMatching final : public BasicRoutingInterface<DataFacadeT, MapMatching<
osrm::matching::HMM model(candidates_list, emission_log_probability); osrm::matching::HMM model(candidates_list, emission_log_probability);
unsigned initial_timestamp = model.initialize(0); std::size_t initial_timestamp = model.initialize(0);
if (initial_timestamp == osrm::matching::INVALID_STATE) if (initial_timestamp == osrm::matching::INVALID_STATE)
{ {
return; return;
@ -107,9 +107,9 @@ class MapMatching final : public BasicRoutingInterface<DataFacadeT, MapMatching<
MatchingDebugInfo matching_debug(osrm::json::Logger::get()); MatchingDebugInfo matching_debug(osrm::json::Logger::get());
matching_debug.initialize(candidates_list); matching_debug.initialize(candidates_list);
unsigned breakage_begin = std::numeric_limits<unsigned>::max(); std::size_t breakage_begin = osrm::matching::INVALID_STATE;
std::vector<unsigned> split_points; std::vector<std::size_t> split_points;
std::vector<unsigned> prev_unbroken_timestamps; std::vector<std::size_t> prev_unbroken_timestamps;
prev_unbroken_timestamps.reserve(candidates_list.size()); prev_unbroken_timestamps.reserve(candidates_list.size());
prev_unbroken_timestamps.push_back(initial_timestamp); prev_unbroken_timestamps.push_back(initial_timestamp);
for (auto t = initial_timestamp + 1; t < candidates_list.size(); ++t) for (auto t = initial_timestamp + 1; t < candidates_list.size(); ++t)
@ -133,22 +133,23 @@ class MapMatching final : public BasicRoutingInterface<DataFacadeT, MapMatching<
if (trace_split) if (trace_split)
{ {
unsigned split_index = t; std::size_t split_index = t;
if (breakage_begin != std::numeric_limits<unsigned>::max()) if (breakage_begin != osrm::matching::INVALID_STATE)
{ {
split_index = breakage_begin; split_index = breakage_begin;
breakage_begin = std::numeric_limits<unsigned>::max(); breakage_begin = osrm::matching::INVALID_STATE;
} }
split_points.push_back(split_index); split_points.push_back(split_index);
// note: this preserves everything before split_index // note: this preserves everything before split_index
model.clear(split_index); model.clear(split_index);
unsigned new_start = model.initialize(split_index); std::size_t new_start = model.initialize(split_index);
// no new start was found -> stop viterbi calculation // no new start was found -> stop viterbi calculation
if (new_start == osrm::matching::INVALID_STATE) if (new_start == osrm::matching::INVALID_STATE)
{ {
break; break;
} }
prev_unbroken_timestamps.clear(); prev_unbroken_timestamps.clear();
prev_unbroken_timestamps.push_back(new_start); prev_unbroken_timestamps.push_back(new_start);
// Important: We potentially go back here! // Important: We potentially go back here!
@ -158,7 +159,7 @@ class MapMatching final : public BasicRoutingInterface<DataFacadeT, MapMatching<
} }
BOOST_ASSERT(!prev_unbroken_timestamps.empty()); BOOST_ASSERT(!prev_unbroken_timestamps.empty());
const unsigned prev_unbroken_timestamp = prev_unbroken_timestamps.back(); const std::size_t prev_unbroken_timestamp = prev_unbroken_timestamps.back();
const auto &prev_viterbi = model.viterbi[prev_unbroken_timestamp]; const auto &prev_viterbi = model.viterbi[prev_unbroken_timestamp];
const auto &prev_pruned = model.pruned[prev_unbroken_timestamp]; const auto &prev_pruned = model.pruned[prev_unbroken_timestamp];
@ -261,14 +262,14 @@ class MapMatching final : public BasicRoutingInterface<DataFacadeT, MapMatching<
split_points.push_back(prev_unbroken_timestamps.back() + 1); split_points.push_back(prev_unbroken_timestamps.back() + 1);
} }
unsigned sub_matching_begin = initial_timestamp; std::size_t sub_matching_begin = initial_timestamp;
for (const unsigned sub_matching_end : split_points) for (const auto sub_matching_end : split_points)
{ {
osrm::matching::SubMatching matching; osrm::matching::SubMatching matching;
// find real end of trace // find real end of trace
// not sure if this is really needed // not sure if this is really needed
unsigned parent_timestamp_index = sub_matching_end - 1; std::size_t parent_timestamp_index = sub_matching_end - 1;
while (parent_timestamp_index >= sub_matching_begin && while (parent_timestamp_index >= sub_matching_begin &&
model.breakage[parent_timestamp_index]) model.breakage[parent_timestamp_index])
{ {
@ -287,10 +288,10 @@ class MapMatching final : public BasicRoutingInterface<DataFacadeT, MapMatching<
std::max_element(model.viterbi[parent_timestamp_index].begin(), std::max_element(model.viterbi[parent_timestamp_index].begin(),
model.viterbi[parent_timestamp_index].end()); model.viterbi[parent_timestamp_index].end());
unsigned parent_candidate_index = std::size_t parent_candidate_index =
std::distance(model.viterbi[parent_timestamp_index].begin(), max_element_iter); std::distance(model.viterbi[parent_timestamp_index].begin(), max_element_iter);
std::deque<std::pair<unsigned, unsigned>> reconstructed_indices; std::deque<std::pair<std::size_t, std::size_t>> reconstructed_indices;
while (parent_timestamp_index > sub_matching_begin) while (parent_timestamp_index > sub_matching_begin)
{ {
if (model.breakage[parent_timestamp_index]) if (model.breakage[parent_timestamp_index])