From 5e48606e9304616b5ec2761e93306d4cd67cdd4e Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Fri, 4 Oct 2019 10:56:57 +0300 Subject: [PATCH] [routing] Fixing routing_common_tests. --- .../routing_common_tests/vehicle_model_test.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/routing_common/routing_common_tests/vehicle_model_test.cpp b/routing_common/routing_common_tests/vehicle_model_test.cpp index dfe39f5103..632480a1ad 100644 --- a/routing_common/routing_common_tests/vehicle_model_test.cpp +++ b/routing_common/routing_common_tests/vehicle_model_test.cpp @@ -34,6 +34,7 @@ HighwayBasedSpeeds const kDefaultSpeeds = { SpeedKMpH(50.0 /* weight */, 40.0 /* eta */) /* out city */)}}; HighwayBasedFactors const kDefaultFactors = { + {HighwayType::HighwayTrunk, InOutCityFactor(1.0)}, {HighwayType::HighwayPrimary, InOutCityFactor(1.0)}, {HighwayType::HighwaySecondary, InOutCityFactor(1.0)}, {HighwayType::HighwayResidential, InOutCityFactor(0.5)}}; @@ -148,7 +149,7 @@ UNIT_CLASS_TEST(VehicleModelTest, VehicleModel_Speed) {SpeedKMpH(100.0 /* weight */, 100.0 /* eta */) /* in city */, SpeedKMpH(150.0 /* weight */, 150.0 /* eta */) /* out of city */}); CheckSpeed({GetType("highway", "primary")}, {SpeedKMpH(90.0, 90.0), SpeedKMpH(120.0, 120.0)}); - CheckSpeed({GetType("highway", "residential")}, {SpeedKMpH(45.0, 55.0), SpeedKMpH(50.0, 60.0)}); + CheckSpeed({GetType("highway", "residential")}, {SpeedKMpH(22.5, 27.5), SpeedKMpH(25.0, 30.0)}); } UNIT_CLASS_TEST(VehicleModelTest, VehicleModel_Speed_MultiTypes) @@ -210,10 +211,10 @@ UNIT_CLASS_TEST(VehicleModelTest, VehicleModel_SpeedFactor) CheckSpeed({secondary, unpavedGood}, {SpeedKMpH(48.0, 56.0), SpeedKMpH(48.0, 56.0)}); CheckSpeed({secondary, unpavedBad}, {SpeedKMpH(16.0, 14.0), SpeedKMpH(16.0, 14.0)}); - CheckSpeed({residential, pavedGood}, {SpeedKMpH(36.0, 49.5), SpeedKMpH(40.0, 54.0)}); - CheckSpeed({residential, pavedBad}, {SpeedKMpH(18.0, 27.5), SpeedKMpH(20.0, 30.0)}); - CheckSpeed({residential, unpavedGood}, {SpeedKMpH(27.0, 44.0), SpeedKMpH(30.0, 48.0)}); - CheckSpeed({residential, unpavedBad}, {SpeedKMpH(9.0, 11.0), SpeedKMpH(10.0, 12.0)}); + CheckSpeed({residential, pavedGood}, {SpeedKMpH(18.0, 24.75), SpeedKMpH(20.0, 27.0)}); + CheckSpeed({residential, pavedBad}, {SpeedKMpH(9.0, 13.75), SpeedKMpH(10.0, 15.0)}); + CheckSpeed({residential, unpavedGood}, {SpeedKMpH(13.5, 22.0), SpeedKMpH(15.0, 24.0)}); + CheckSpeed({residential, unpavedBad}, {SpeedKMpH(4.5, 5.5), SpeedKMpH(5.0, 6.0)}); } UNIT_CLASS_TEST(VehicleModelTest, VehicleModel_MaxspeedFactor)