Move matching default in route_parameters.cpp

This commit is contained in:
Patrick Niklaus 2015-08-28 01:05:48 +02:00
parent a5ee82b0d1
commit c30c144120
2 changed files with 3 additions and 8 deletions

View File

@ -36,7 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
RouteParameters::RouteParameters()
: zoom_level(18), print_instructions(false), alternate_route(true), geometry(true),
compression(true), deprecatedAPI(false), uturn_default(false), classify(false),
matching_beta(-1.0), gps_precision(-1.0), check_sum(-1), num_results(1)
matching_beta(5), gps_precision(5), check_sum(-1), num_results(1)
{
}

View File

@ -63,9 +63,6 @@ constexpr static const unsigned MAX_BROKEN_STATES = 10;
constexpr static const double MAX_SPEED = 180 / 3.6; // 150km -> m/s
constexpr static const unsigned SUSPICIOUS_DISTANCE_DELTA = 100;
constexpr static const double default_beta = 5.0;
constexpr static const double default_sigma_z = 4.07;
}
}
@ -128,10 +125,8 @@ class MapMatching final : public BasicRoutingInterface<DataFacadeT, MapMatching<
}();
// TODO replace default values with table lookup based on sampling frequency
EmissionLogProbability emission_log_probability(
gps_precision > 0. ? gps_precision : osrm::matching::default_sigma_z);
TransitionLogProbability transition_log_probability(
matching_beta > 0. ? matching_beta : osrm::matching::default_beta);
EmissionLogProbability emission_log_probability(gps_precision);
TransitionLogProbability transition_log_probability(matching_beta);
osrm::matching::HMM model(candidates_list, emission_log_probability);