From 714f2d9afc72cefc84e4a171c04a51f03241efb5 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Fri, 3 Dec 2021 13:54:27 +0100 Subject: [PATCH] adapt pcc testcases --- .../Integration/ADAS/ADASTestsConventional.cs | 12 +++--- .../Integration/ADAS/ADASTestsPEV.cs | 38 ++++++++++--------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs index 5e3c0639d4..d00aed9b90 100644 --- a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs +++ b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs @@ -1232,9 +1232,9 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS public void Class5_PCC123EcoRollEngineStop_CaseA_Conventional() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 4025, OutsideSegment, Accelerate), // len: 4025m (4025, 5309, WithinSegment, Accelerate), // len: 1284m - (5309, 5908, UseCase1, Roll), // len: 599m - (5908, 5932, OutsideSegment, Coast), // len: 24m - (5932, 1e6, OutsideSegment, Accelerate)); + (5309, 5920, UseCase1, Roll), // len: 599m + //(5920, 5932, OutsideSegment, Coast), // len: 24m + (5920, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123EcoRollEngineStop_CaseB_Conventional() => TestPCC(MethodBase.GetCurrentMethod().Name, @@ -1243,7 +1243,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS (5216, 6698, UseCase1, Roll), // len: 1482m (6698, 6757, WithinSegment, Coast), // len: 59m (6757, 7158, WithinSegment, Roll), // len: 401m - (7158, 7170, WithinSegment, Brake), // len: 12m + //(7158, 7170, WithinSegment, Brake), // len: 12m (7170, 7552, WithinSegment, Coast), // len: 382m (7552, 7912, OutsideSegment, Coast), // len: 360m (7912, 1e6, OutsideSegment, Accelerate)); @@ -1370,8 +1370,8 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS (3410, 3468, OutsideSegment, Coast), // len: 58m (3468, 3854, OutsideSegment, Roll), // len: 386m (3854, 3864, OutsideSegment, Brake), // len: 10m - (3864, 3884, OutsideSegment, Coast), // len: 20m - (3884, 5012, OutsideSegment, Brake), // len: 1128m + (3864, 3915, OutsideSegment, Coast), // len: 20m + (3915, 5012, OutsideSegment, Brake), // len: 1128m (5012, 5420, OutsideSegment, Coast), // len: 408m (5420, 1e6, OutsideSegment, Accelerate)); diff --git a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs index 39251c7702..ddfc9432ea 100644 --- a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs +++ b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsPEV.cs @@ -280,19 +280,21 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS (4837, 4845, WithinSegment, Roll), // len: 8m (4845, 4881, WithinSegment, Accelerate), // len: 36m (4881, 4887, WithinSegment, Roll), // len: 6m - (4887, 4903, WithinSegment, Accelerate), // len: 16m - (4903, 4909, WithinSegment, Roll), // len: 6m - (4909, 5041, WithinSegment, Accelerate), // len: 46m - (5041, 5054, WithinSegment, Roll), // len: 7m - (5054, 5087, WithinSegment, Accelerate), // len: 21m - (5087, 5102, WithinSegment, Roll), // len: 8m + (4887, 4900, WithinSegment, Accelerate), // len: 16m + (4900, 4905, WithinSegment, Roll), // len: 6m + (4905, 5082, WithinSegment, Accelerate), // len: 46m + (5082, 5097, WithinSegment, Roll), // len: 7m + (5097, 5135, WithinSegment, Accelerate), // len: 21m + (5135, 5152, WithinSegment, Roll), // len: 8m //(4991, 5015, WithinSegment, Accelerate), // len: 24m //(5015, 5025, WithinSegment, Roll), // len: 10m //(5025, 5053, WithinSegment, Accelerate), // len: 28m //(5053, 5065, WithinSegment, Roll), // len: 12m - (5102, 5356, WithinSegment, Accelerate), // len: 291m + (5152, 5356, WithinSegment, Accelerate), // len: 291m (5356, 5684, UseCase2, Coast), // len: 328m - (5684, 6135, WithinSegment, Coast), // len: 451m + (5684, 6010, WithinSegment, Coast), // len: 451m + (6010, 6072, WithinSegment, Brake), // len: 451m + (6072, 6135, WithinSegment, Coast), // len: 451m (6135, 6473, OutsideSegment, Coast), // len: 338m (6473, 1e6, OutsideSegment, Accelerate)); @@ -309,7 +311,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS //(169, 182, OutsideSegment, Roll), // len: 13m //(182, 278, OutsideSegment, Accelerate), // len: 96m //(278, 295, OutsideSegment, Roll), // len: 17m - (422, 3809, OutsideSegment, Accelerate), // len: 3514m + (500, 3809, OutsideSegment, Accelerate), // len: 3514m (3809, 4568, OutsideSegment, Coast), // len: 759m (4568, 5001, OutsideSegment, Brake), // len: 433m (5001, 5408, OutsideSegment, Coast), // len: 407m @@ -329,7 +331,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS //(169, 182, OutsideSegment, Roll), // len: 13m //(182, 278, OutsideSegment, Accelerate), // len: 96m //(278, 295, OutsideSegment, Roll), // len: 17m - (422, 3615, OutsideSegment, Accelerate), // len: 3320m + (500, 3615, OutsideSegment, Accelerate), // len: 3320m (3615, 4248, OutsideSegment, Coast), // len: 633m (4248, 4509, OutsideSegment, Brake), // len: 261m (4509, 4717, OutsideSegment, Coast), // len: 208m @@ -433,17 +435,17 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS (4837, 4845, WithinSegment, Roll), // len: 8m (4845, 4881, WithinSegment, Accelerate), // len: 36m (4881, 4887, WithinSegment, Roll), // len: 6m - (4887, 4903, WithinSegment, Accelerate), // len: 16m - (4903, 4909, WithinSegment, Roll), // len: 6m - (4909, 5041, WithinSegment, Accelerate), // len: 46m - (5041, 5054, WithinSegment, Roll), // len: 7m - (5054, 5087, WithinSegment, Accelerate), // len: 21m - (5087, 5102, WithinSegment, Roll), // len: 8m + (4887, 4900, WithinSegment, Accelerate), // len: 16m + (4900, 4905, WithinSegment, Roll), // len: 6m + (4905, 5082, WithinSegment, Accelerate), // len: 46m + (5082, 5097, WithinSegment, Roll), // len: 7m + (5097, 5135, WithinSegment, Accelerate), // len: 21m + (5135, 5152, WithinSegment, Roll), // len: 8m //(4991, 5015, WithinSegment, Accelerate), // len: 24m //(5015, 5025, WithinSegment, Roll), // len: 10m //(5025, 5053, WithinSegment, Accelerate), // len: 28m //(5053, 5065, WithinSegment, Roll), // len: 12m - (5065, 5356, WithinSegment, Accelerate), // len: 291m + (5152, 5356, WithinSegment, Accelerate), // len: 291m (5356, 5684, UseCase2, Coast), // len: 328m (5684, 5755, WithinSegment, Coast), // len: 71m (5755, 6080, WithinSegment, Brake), // len: 325m @@ -464,7 +466,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS //(169, 182, OutsideSegment, Roll), // len: 13m //(182, 278, OutsideSegment, Accelerate), // len: 96m //(278, 295, OutsideSegment, Roll), // len: 17m - (422, 3809, OutsideSegment, Accelerate), // len: 3514m + (500, 3809, OutsideSegment, Accelerate), // len: 3514m (3809, 4568, OutsideSegment, Coast), // len: 759m (4568, 5001, OutsideSegment, Brake), // len: 433m (5001, 5408, OutsideSegment, Coast), // len: 407m -- GitLab