diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs index ff91652ccb5a83eac6c6a289e29ed9deb65b417f..7333284a68d6f221bc16bea0d773548f335df82c 100644 --- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs +++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs @@ -1123,7 +1123,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl #region Implementation of IEngineControl - public bool CombustionEngineOn { get; set; } + public bool CombustionEngineOn { get => false; set { } } #endregion } diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs index 29e6547b26fec600561efa3ed11e7725b3b89c77..dd7fc2e80033336cba3336c78c1ac9035d3275f6 100644 --- a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs +++ b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs @@ -994,8 +994,16 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies protected virtual bool AllowICEOff(Second absTime) { - return PreviousState.ICEStartTStmp == null - || (PreviousState.ICEStartTStmp + StrategyParameters.MinICEOnTime).IsSmaller(absTime); + //VECTO-1493 special case for P1: only allow turning ICE off if ESS is activated and PCC is currently active + var isPCC = DataBus.DriverInfo.PCCState.IsOneOf(PCCStates.UseCase1, PCCStates.UseCase2); + var isP1 = DataBus.PowertrainInfo.ElectricMotorPositions.Contains(PowertrainPosition.HybridP1); + if (isP1 && (!ModelData.VehicleData.ADAS.EngineStopStart || !isPCC)) + return false; + + //normal case: only turn of ICE if ESS is activated and the minimal ICE on time is exceeded. + var MinICEonTimeExceeded = PreviousState.ICEStartTStmp is null + || absTime.IsGreaterOrEqual(PreviousState.ICEStartTStmp + StrategyParameters.MinICEOnTime); + return ModelData.VehicleData.ADAS.EngineStopStart && MinICEonTimeExceeded; } protected virtual void HandleBrakeAction(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity, bool dryRun, List<HybridResultEntry> eval) diff --git a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs index e26bbd85a49a2f7061dc12fec1e08bbdf1ed860d..c7cc83e9f2a1e7287afb6ba9311684bc80a1be6a 100644 --- a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs +++ b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs @@ -52,10 +52,10 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS return graphWriter; } - [TestCase] - public void TestVECTO_1484() + [TestCase(@"TestData\Integration\ADAS-HEV\VECTO-1493\P1_CityBus.vecto", TestName = "VECTO-1493_P1Citybus")] + [TestCase(@"TestData\Integration\ADAS-HEV\VECTO-1484\P2_Group5_s2c0_rep_Payload.vecto", TestName = "VECTO-1484_P2Group5")] + public static void RunEngineeringJob(string jobName) { - var jobName = @"TestData\Integration\ADAS-HEV\VECTO-1484\P2_Group5_s2c0_rep_Payload.vecto"; var inputData = JSONInputDataFactory.ReadJsonJob(jobName); var writer = new FileOutputWriter(Path.Combine(Path.GetDirectoryName(jobName), Path.GetFileName(jobName))); var sumContainer = new SummaryDataContainer(writer); @@ -195,96 +195,82 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS [TestCase] public void Class5_PCC123_CaseA_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (0, 4130, OutsideSegment, Accelerate), // len: 4130m + (500, 4130, OutsideSegment, Accelerate), // len: 4130m (4130, 5472, WithinSegment, Accelerate), // len: 1342m - (5472, 5765, UseCase1, Coast), // len: 293m - (5765, 5812, WithinSegment, Coast), // len: 47m - (5812, 6037, OutsideSegment, Coast), // len: 225m - (6037, 1e6, OutsideSegment, Accelerate)); + (5472, 5809, UseCase1, Coast), // len: 337m + (5809, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123_CaseB_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (0, 4655, OutsideSegment, Accelerate), // len: 4655m + (500, 4655, OutsideSegment, Accelerate), // len: 4655m (4655, 5496, WithinSegment, Accelerate), // len: 841m - (5496, 6461, UseCase1, Coast), // len: 965m - (6461, 6872, WithinSegment, Coast), // len: 411m - (6872, 7256, WithinSegment, Brake), // len: 384m - (7256, 7466, OutsideSegment, Brake), // len: 210m - (7466, 8025, OutsideSegment, Coast), // len: 559m - (8025, 1e6, OutsideSegment, Accelerate)); + (5496, 7252, UseCase1, Coast), // len: 1756m + (7252, 7486, OutsideSegment, Coast), // len: 234m + (7486, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123_CaseC_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (0, 3979, OutsideSegment, Accelerate), // len: 3979m + (500, 3979, OutsideSegment, Accelerate), // len: 3979m (3979, 4936, WithinSegment, Accelerate), // len: 957m - (4936, 5878, UseCase1, Coast), // len: 942m - (5878, 6047, WithinSegment, Coast), // len: 169m - (6047, 7160, WithinSegment, Brake), // len: 1113m - (7160, 7234, OutsideSegment, Brake), // len: 74m - (7234, 7658, OutsideSegment, Coast), // len: 424m - (7658, 1e6, OutsideSegment, Accelerate)); + (4936, 6104, UseCase1, Coast), // len: 1168m + (6104, 6298, WithinSegment, Coast), // len: 194m + (6298, 7139, WithinSegment, Brake), // len: 841m + (7139, 7151, WithinSegment, Coast), // len: 12m + (7151, 7563, OutsideSegment, Coast), // len: 412m + (7563, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123_CaseD_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 654, OutsideSegment, Accelerate), // len: 654m (654, 1902, WithinSegment, Accelerate), // len: 1248m - (1902, 2378, UseCase1, Coast), // len: 476m - (2378, 2486, WithinSegment, Coast), // len: 108m - (2486, 2629, OutsideSegment, Coast), // len: 143m - (2629, 4041, OutsideSegment, Accelerate), // len: 1412m - (4041, 4951, WithinSegment, Accelerate), // len: 910m - (4951, 5939, UseCase1, Coast), // len: 988m - (5939, 6145, WithinSegment, Coast), // len: 206m - (6145, 6689, WithinSegment, Brake), // len: 544m - (6689, 6763, OutsideSegment, Brake), // len: 74m - (6763, 7152, OutsideSegment, Coast), // len: 389m - (7152, 1e6, OutsideSegment, Accelerate)); + (1902, 2487, UseCase1, Coast), // len: 585m + (2487, 2511, OutsideSegment, Coast), // len: 24m + (2511, 4039, OutsideSegment, Accelerate), // len: 1528m + (4039, 4961, WithinSegment, Accelerate), // len: 922m + (4961, 6211, UseCase1, Coast), // len: 1250m + (6211, 6624, WithinSegment, Coast), // len: 413m + (6624, 6673, WithinSegment, Brake), // len: 49m + (6673, 6686, WithinSegment, Coast), // len: 13m + (6686, 7086, OutsideSegment, Coast), // len: 400m + (7086, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123_CaseE_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 689, OutsideSegment, Accelerate), // len: 689m (689, 2077, WithinSegment, Accelerate), // len: 1388m - (2077, 2345, UseCase1, Coast), // len: 268m - (2345, 2499, WithinSegment, Coast), // len: 154m - (2499, 2989, WithinSegment, Accelerate), // len: 490m - (2989, 3694, UseCase1, Coast), // len: 705m - (3694, 3900, WithinSegment, Coast), // len: 206m - (3900, 3974, WithinSegment, Brake), // len: 74m - (3974, 4023, OutsideSegment, Brake), // len: 49m - (4023, 4435, OutsideSegment, Coast), // len: 412m - (4435, 1e6, OutsideSegment, Accelerate)); + (2077, 2378, UseCase1, Coast), // len: 301m + (2378, 2996, WithinSegment, Accelerate), // len: 618m + (2996, 3875, UseCase1, Coast), // len: 879m + (3875, 3970, WithinSegment, Coast), // len: 95m + (3970, 4170, OutsideSegment, Coast), // len: 200m + (4170, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123_CaseF_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 700, OutsideSegment, Accelerate), // len: 700m (700, 2089, WithinSegment, Accelerate), // len: 1389m - (2089, 2346, UseCase1, Coast), // len: 257m - (2346, 2605, WithinSegment, Coast), // len: 259m - (2605, 2652, WithinSegment, Accelerate), // len: 47m - (2652, 3093, UseCase1, Coast), // len: 441m - (3093, 3272, WithinSegment, Coast), // len: 179m - (3272, 3571, OutsideSegment, Coast), // len: 299m - (3571, 1e6, OutsideSegment, Accelerate)); + (2089, 2390, UseCase1, Coast), // len: 301m + (2390, 2647, WithinSegment, Accelerate), // len: 257m + (2647, 3267, UseCase1, Coast), // len: 620m + (3267, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123_CaseG_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (500, 3944, OutsideSegment, Accelerate), // len: 3944m (3944, 5099, WithinSegment, Accelerate), // len: 1155m - (5099, 5728, UseCase1, Coast), // len: 629m - (5728, 5922, WithinSegment, Coast), // len: 194m - (5922, 6564, WithinSegment, Brake), // len: 642m - (6564, 6787, OutsideSegment, Brake), // len: 223m - (6787, 7539, OutsideSegment, Coast), // len: 752m - (7539, 1e6, OutsideSegment, Accelerate)); + (5099, 5901, UseCase1, Coast), // len: 802m + (5901, 6339, WithinSegment, Coast), // len: 438m + (6339, 6537, WithinSegment, Brake), // len: 198m + (6537, 6561, WithinSegment, Coast), // len: 24m + (6561, 7288, OutsideSegment, Coast), // len: 727m + (7288, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123_CaseH_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (500, 3815, OutsideSegment, Accelerate), // len: 3815m (3815, 4854, WithinSegment, Accelerate), // len: 1039m - (4854, 5661, UseCase1, Coast), // len: 807m - (5661, 5988, WithinSegment, Coast), // len: 327m - (5988, 6401, OutsideSegment, Coast), // len: 413m - (6401, 1e6, OutsideSegment, Accelerate)); + (4854, 5987, UseCase1, Coast), // len: 1133m + (5987, 1e6, OutsideSegment, Accelerate)); [TestCase] @@ -294,127 +280,74 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS [TestCase] public void Class5_PCC123_CaseJ_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (500, 3559, OutsideSegment, Accelerate), // len: 3559m - (3559, 4563, WithinSegment, Accelerate), // len: 913m - (4563, 4582, WithinSegment, Roll), // len: 19m - (4582, 4709, WithinSegment, Accelerate), // len: 127m - (4709, 4723, WithinSegment, Roll), // len: 14m - (4723, 4789, WithinSegment, Accelerate), // len: 66m - (4789, 4800, WithinSegment, Roll), // len: 11m - (4800, 4866, WithinSegment, Accelerate), // len: 66m - (4866, 4875, WithinSegment, Roll), // len: 9m - (4875, 4931, WithinSegment, Accelerate), // len: 56m - (4931, 4940, WithinSegment, Roll), // len: 9m - (4940, 5028, WithinSegment, Accelerate), // len: 88m - (5028, 5040, WithinSegment, Roll), // len: 12m - (5040, 5079, WithinSegment, Accelerate), // len: 39m - (5079, 5093, WithinSegment, Roll), // len: 14m - (5093, 5131, WithinSegment, Accelerate), // len: 38m - (5131, 5147, WithinSegment, Roll), // len: 16m - (5147, 5343, WithinSegment, Accelerate), // len: 196m - (5343, 5614, UseCase2, Coast), // len: 271m - (5614, 5771, WithinSegment, Coast), // len: 157m - (5771, 6117, WithinSegment, Brake), // len: 346m - (6117, 6191, OutsideSegment, Brake), // len: 74m - (6191, 6591, OutsideSegment, Coast), // len: 400m - (6591, 1e6, OutsideSegment, Accelerate)); + (3559, 4563, WithinSegment, Accelerate), // len: 1004m + (5146, 5342, WithinSegment, Accelerate), // len: 196m + (5342, 5669, UseCase2, Coast), // len: 327m + (5669, 5923, WithinSegment, Coast), // len: 254m + (5923, 6109, WithinSegment, Brake), // len: 186m + (6109, 6121, WithinSegment, Coast), // len: 12m + (6121, 6509, OutsideSegment, Coast), // len: 388m + (6509, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123_CrestCoast1_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - //(0, 0, OutsideSegment, Halt), // len: 0m - //(0, 4, OutsideSegment, Accelerate), // len: 4m - //(4, 6, OutsideSegment, Roll), // len: 2m - //(6, 15, OutsideSegment, Accelerate), // len: 9m - //(15, 20, OutsideSegment, Roll), // len: 5m - //(20, 35, OutsideSegment, Accelerate), // len: 15m - //(35, 42, OutsideSegment, Roll), // len: 7m - //(42, 71, OutsideSegment, Accelerate), // len: 29m - //(71, 81, OutsideSegment, Roll), // len: 10m - //(81, 139, OutsideSegment, Accelerate), // len: 58m - //(139, 153, OutsideSegment, Roll), // len: 14m - //(153, 242, OutsideSegment, Accelerate), // len: 89m - //(242, 258, OutsideSegment, Roll), // len: 16m - //(258, 392, OutsideSegment, Accelerate), // len: 134m - //(392, 411, OutsideSegment, Roll), // len: 19m - (500, 3406, OutsideSegment, Accelerate), // len: 2995m - (3406, 3870, OutsideSegment, Coast), // len: 464m - (3870, 5210, OutsideSegment, Brake), // len: 1340m - (5210, 5509, OutsideSegment, Coast), // len: 299m - (5509, 1e6, OutsideSegment, Accelerate)); + (500, 3804, OutsideSegment, Accelerate), // len: 3393m + (3804, 4533, OutsideSegment, Coast), // len: 729m + (4533, 5006, OutsideSegment, Brake), // len: 473m + (5006, 5413, OutsideSegment, Coast), // len: 407m + (5413, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123_CrestCoast2_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - //(0, 0, OutsideSegment, Halt), // len: 0m - //(0, 4, OutsideSegment, Accelerate), // len: 4m - //(4, 6, OutsideSegment, Roll), // len: 2m - //(6, 15, OutsideSegment, Accelerate), // len: 9m - //(15, 20, OutsideSegment, Roll), // len: 5m - //(20, 35, OutsideSegment, Accelerate), // len: 15m - //(35, 42, OutsideSegment, Roll), // len: 7m - //(42, 71, OutsideSegment, Accelerate), // len: 29m - //(71, 81, OutsideSegment, Roll), // len: 10m - //(81, 139, OutsideSegment, Accelerate), // len: 58m - //(139, 153, OutsideSegment, Roll), // len: 14m - //(153, 242, OutsideSegment, Accelerate), // len: 89m - //(242, 258, OutsideSegment, Roll), // len: 16m - //(258, 392, OutsideSegment, Accelerate), // len: 134m - //(392, 411, OutsideSegment, Roll), // len: 19m - (500, 3415, OutsideSegment, Accelerate), // len: 3004m - (3415, 3848, OutsideSegment, Coast), // len: 433m - (3848, 4513, OutsideSegment, Brake), // len: 665m - (4513, 4781, OutsideSegment, Coast), // len: 268m - (4781, 1e6, OutsideSegment, Accelerate)); + (500, 3609, OutsideSegment, Accelerate), // len: 3198m + (3609, 4202, OutsideSegment, Coast), // len: 593m + (4202, 4504, OutsideSegment, Brake), // len: 302m + (4504, 4722, OutsideSegment, Coast), // len: 218m + (4722, 1e6, OutsideSegment, Accelerate)); + [TestCase] public void Class5_PCC12_CaseA_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 4130, OutsideSegment, Accelerate), // len: 4130m (4130, 5472, WithinSegment, Accelerate), // len: 1342m - (5472, 5765, UseCase1, Coast), // len: 293m - (5765, 5812, WithinSegment, Coast), // len: 47m - (5812, 6037, OutsideSegment, Coast), // len: 225m - (6037, 1e6, OutsideSegment, Accelerate)); + (5472, 5809, UseCase1, Coast), // len: 337m + (5809, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC12_CaseB_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 4655, OutsideSegment, Accelerate), // len: 4655m (4655, 5496, WithinSegment, Accelerate), // len: 841m - (5496, 6461, UseCase1, Coast), // len: 965m - (6461, 6604, WithinSegment, Coast), // len: 143m - (6604, 7253, WithinSegment, Brake), // len: 649m - (7253, 7481, OutsideSegment, Brake), // len: 228m - (7481, 7874, OutsideSegment, Coast), // len: 393m - (7874, 1e6, OutsideSegment, Accelerate)); + (5496, 7252, UseCase1, Coast), // len: 1756m + (7252, 7486, OutsideSegment, Coast), // len: 234m + (7486, 1e6, OutsideSegment, Accelerate)); + [TestCase] public void Class5_PCC12_CaseC_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 3979, OutsideSegment, Accelerate), // len: 3979m (3979, 4936, WithinSegment, Accelerate), // len: 957m - (4936, 5878, UseCase1, Coast), // len: 942m - (5878, 5938, WithinSegment, Coast), // len: 60m - (5938, 7151, WithinSegment, Brake), // len: 1213m - (7151, 7247, OutsideSegment, Brake), // len: 96m - (7247, 7510, OutsideSegment, Coast), // len: 263m - (7510, 1e6, OutsideSegment, Accelerate)); + (4936, 6104, UseCase1, Coast), // len: 1168m + (6104, 6164, WithinSegment, Coast), // len: 60m + (6164, 7149, WithinSegment, Brake), // len: 985m + (7149, 7447, OutsideSegment, Coast), // len: 298m + (7447, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC12_CaseD_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 654, OutsideSegment, Accelerate), // len: 654m (654, 1902, WithinSegment, Accelerate), // len: 1248m - (1902, 2378, UseCase1, Coast), // len: 476m - (2378, 2437, WithinSegment, Coast), // len: 59m - (2437, 2485, WithinSegment, Brake), // len: 48m - (2485, 2497, OutsideSegment, Brake), // len: 12m - (2497, 2616, OutsideSegment, Coast), // len: 119m - (2616, 4040, OutsideSegment, Accelerate), // len: 1424m - (4040, 4950, WithinSegment, Accelerate), // len: 910m - (4950, 5938, UseCase1, Coast), // len: 988m - (5938, 6010, WithinSegment, Coast), // len: 72m - (6010, 6695, WithinSegment, Brake), // len: 685m - (6695, 6779, OutsideSegment, Brake), // len: 84m - (6779, 7029, OutsideSegment, Coast), // len: 250m - (7029, 1e6, OutsideSegment, Accelerate)); + (1902, 2487, UseCase1, Coast), // len: 585m + (2487, 2511, OutsideSegment, Coast), // len: 24m + (2511, 4039, OutsideSegment, Accelerate), // len: 1528m + (4039, 4961, WithinSegment, Accelerate), // len: 922m + (4961, 6211, UseCase1, Coast), // len: 1250m + (6211, 6306, WithinSegment, Coast), // len: 95m + (6306, 6690, WithinSegment, Brake), // len: 384m + (6690, 6976, OutsideSegment, Coast), // len: 286m + (6976, 1e6, OutsideSegment, Accelerate)); @@ -422,52 +355,39 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS public void Class5_PCC12_CaseE_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 689, OutsideSegment, Accelerate), // len: 689m (689, 2077, WithinSegment, Accelerate), // len: 1388m - (2077, 2345, UseCase1, Coast), // len: 268m - (2345, 2511, WithinSegment, Coast), // len: 166m - (2511, 2989, WithinSegment, Accelerate), // len: 478m - (2989, 3694, UseCase1, Coast), // len: 705m - (3694, 3741, WithinSegment, Coast), // len: 47m - (3741, 3970, WithinSegment, Brake), // len: 229m - (3970, 4030, OutsideSegment, Brake), // len: 60m - (4030, 4303, OutsideSegment, Coast), // len: 273m - (4303, 1e6, OutsideSegment, Accelerate)); + (2077, 2378, UseCase1, Coast), // len: 301m + (2378, 2996, WithinSegment, Accelerate), // len: 618m + (2996, 3875, UseCase1, Coast), // len: 879m + (3875, 3970, WithinSegment, Coast), // len: 95m + (3970, 4170, OutsideSegment, Coast), // len: 200m + (4170, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC12_CaseF_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 700, OutsideSegment, Accelerate), // len: 700m (700, 2089, WithinSegment, Accelerate), // len: 1389m - (2089, 2346, UseCase1, Coast), // len: 257m - (2346, 2605, WithinSegment, Coast), // len: 259m - (2605, 2652, WithinSegment, Accelerate), // len: 47m - (2652, 3093, UseCase1, Coast), // len: 441m - (3093, 3260, WithinSegment, Coast), // len: 167m - (3260, 3272, WithinSegment, Brake), // len: 12m - (3272, 3332, OutsideSegment, Brake), // len: 60m - (3332, 3558, OutsideSegment, Coast), // len: 226m - (3558, 1e6, OutsideSegment, Accelerate)); + (2089, 2390, UseCase1, Coast), // len: 301m + (2390, 2647, WithinSegment, Accelerate), // len: 257m + (2647, 3267, UseCase1, Coast), // len: 620m + (3267, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC12_CaseG_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (500, 3944, OutsideSegment, Accelerate), // len: 3944m (3944, 5099, WithinSegment, Accelerate), // len: 1155m - (5099, 5728, UseCase1, Coast), // len: 629m - (5728, 5787, WithinSegment, Coast), // len: 59m - (5787, 6556, WithinSegment, Brake), // len: 769m - (6556, 6821, OutsideSegment, Brake), // len: 265m - (6821, 7344, OutsideSegment, Coast), // len: 523m - (7344, 1e6, OutsideSegment, Accelerate)); + (5099, 5901, UseCase1, Coast), // len: 802m + (5901, 5997, WithinSegment, Coast), // len: 96m + (5997, 6561, WithinSegment, Brake), // len: 564m + (6561, 7073, OutsideSegment, Coast), // len: 512m + (7073, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC12_CaseH_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (500, 3815, OutsideSegment, Accelerate), // len: 3815m (3815, 4854, WithinSegment, Accelerate), // len: 1039m - (4854, 5661, UseCase1, Coast), // len: 807m - (5661, 5757, WithinSegment, Coast), // len: 96m - (5757, 5997, WithinSegment, Brake), // len: 240m - (5997, 6069, OutsideSegment, Brake), // len: 72m - (6069, 6307, OutsideSegment, Coast), // len: 238m - (6307, 1e6, OutsideSegment, Accelerate)); + (4854, 5987, UseCase1, Coast), // len: 1133m + (5987, 1e6, OutsideSegment, Accelerate)); [TestCase] @@ -477,147 +397,100 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS [TestCase] public void Class5_PCC12_CaseJ_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (500, 3559, OutsideSegment, Accelerate), // len: 3559m - (3559, 4563, WithinSegment, Accelerate), // len: 913m - (4563, 4582, WithinSegment, Roll), // len: 19m - (4582, 4709, WithinSegment, Accelerate), // len: 127m - (4709, 4723, WithinSegment, Roll), // len: 14m - (4723, 4789, WithinSegment, Accelerate), // len: 66m - (4789, 4800, WithinSegment, Roll), // len: 11m - (4800, 4866, WithinSegment, Accelerate), // len: 66m - (4866, 4875, WithinSegment, Roll), // len: 9m - (4875, 4931, WithinSegment, Accelerate), // len: 56m - (4931, 4940, WithinSegment, Roll), // len: 9m - (4940, 5028, WithinSegment, Accelerate), // len: 88m - (5028, 5040, WithinSegment, Roll), // len: 12m - (5040, 5079, WithinSegment, Accelerate), // len: 39m - (5079, 5093, WithinSegment, Roll), // len: 14m - (5093, 5131, WithinSegment, Accelerate), // len: 38m - (5131, 5147, WithinSegment, Roll), // len: 16m - (5147, 5343, WithinSegment, Accelerate), // len: 196m - (5343, 5614, UseCase2, Coast), // len: 271m - (5614, 5661, WithinSegment, Coast), // len: 47m - (5661, 6118, WithinSegment, Brake), // len: 457m - (6118, 6202, OutsideSegment, Brake), // len: 84m - (6202, 6464, OutsideSegment, Coast), // len: 262m - (6464, 1e6, OutsideSegment, Accelerate)); + (3559, 4563, WithinSegment, Accelerate), // len: 1004m + (5146, 5342, WithinSegment, Accelerate), // len: 196m + (5342, 5669, UseCase2, Coast), // len: 327m + (5669, 5740, WithinSegment, Coast), // len: 71m + (5740, 6113, WithinSegment, Brake), // len: 373m + (6113, 6125, WithinSegment, Coast), // len: 12m + (6125, 6398, OutsideSegment, Coast), // len: 273m + (6398, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC12_CrestCoast1_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - //(0, 0, OutsideSegment, Halt), // len: 0m - //(0, 4, OutsideSegment, Accelerate), // len: 4m - //(4, 6, OutsideSegment, Roll), // len: 2m - //(6, 15, OutsideSegment, Accelerate), // len: 9m - //(15, 20, OutsideSegment, Roll), // len: 5m - //(20, 35, OutsideSegment, Accelerate), // len: 15m - //(35, 42, OutsideSegment, Roll), // len: 7m - //(42, 71, OutsideSegment, Accelerate), // len: 29m - //(71, 81, OutsideSegment, Roll), // len: 10m - //(81, 139, OutsideSegment, Accelerate), // len: 58m - //(139, 153, OutsideSegment, Roll), // len: 14m - //(153, 242, OutsideSegment, Accelerate), // len: 89m - //(242, 258, OutsideSegment, Roll), // len: 16m - //(258, 392, OutsideSegment, Accelerate), // len: 134m - //(392, 411, OutsideSegment, Roll), // len: 19m - (500, 3406, OutsideSegment, Accelerate), // len: 2995m - (3406, 3870, OutsideSegment, Coast), // len: 464m - (3870, 5210, OutsideSegment, Brake), // len: 1340m - (5210, 5509, OutsideSegment, Coast), // len: 299m - (5509, 1e6, OutsideSegment, Accelerate)); + (500, 3804, OutsideSegment, Accelerate), // len: 3393m + (3804, 4533, OutsideSegment, Coast), // len: 729m + (4533, 5006, OutsideSegment, Brake), // len: 473m + (5006, 5413, OutsideSegment, Coast), // len: 407m + (5413, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC12_CrestCoast2_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - //(0, 0, OutsideSegment, Halt), // len: 0m - //(0, 4, OutsideSegment, Accelerate), // len: 4m - //(4, 6, OutsideSegment, Roll), // len: 2m - //(6, 15, OutsideSegment, Accelerate), // len: 9m - //(15, 20, OutsideSegment, Roll), // len: 5m - //(20, 35, OutsideSegment, Accelerate), // len: 15m - //(35, 42, OutsideSegment, Roll), // len: 7m - //(42, 71, OutsideSegment, Accelerate), // len: 29m - //(71, 81, OutsideSegment, Roll), // len: 10m - //(81, 139, OutsideSegment, Accelerate), // len: 58m - //(139, 153, OutsideSegment, Roll), // len: 14m - //(153, 242, OutsideSegment, Accelerate), // len: 89m - //(242, 258, OutsideSegment, Roll), // len: 16m - //(258, 392, OutsideSegment, Accelerate), // len: 134m - //(392, 411, OutsideSegment, Roll), // len: 19m - (500, 3415, OutsideSegment, Accelerate), // len: 3004m - (3415, 3848, OutsideSegment, Coast), // len: 433m - (3848, 4513, OutsideSegment, Brake), // len: 665m - (4513, 4781, OutsideSegment, Coast), // len: 268m - (4781, 1e6, OutsideSegment, Accelerate)); + (500, 3609, OutsideSegment, Accelerate), // len: 3198m + (3609, 4202, OutsideSegment, Coast), // len: 593m + (4202, 4504, OutsideSegment, Brake), // len: 302m + (4504, 4722, OutsideSegment, Coast), // len: 218m + (4722, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_NoADAS_CaseA_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (0, 5531, OutsideSegment, Accelerate), // len: 5531m - (5531, 6062, OutsideSegment, Coast), // len: 531m - (6062, 1e6, OutsideSegment, Accelerate)); + (0, 5612, OutsideSegment, Accelerate), // len: 5612m + (5612, 5916, OutsideSegment, Coast), // len: 304m + (5916, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_NoADAS_CaseB_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (0, 5892, OutsideSegment, Accelerate), // len: 5892m - (5892, 6387, OutsideSegment, Coast), // len: 495m - (6387, 7481, OutsideSegment, Brake), // len: 1094m - (7481, 7874, OutsideSegment, Coast), // len: 393m - (7874, 1e6, OutsideSegment, Accelerate)); + (0, 6114, OutsideSegment, Accelerate), // len: 6114m + (6114, 6787, OutsideSegment, Coast), // len: 673m + (6787, 7255, OutsideSegment, Brake), // len: 468m + (7255, 7731, OutsideSegment, Coast), // len: 476m + (7731, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_NoADAS_CaseC_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (0, 5367, OutsideSegment, Accelerate), // len: 5367m - (5367, 5685, OutsideSegment, Coast), // len: 318m - (5685, 7247, OutsideSegment, Brake), // len: 1562m - (7247, 7509, OutsideSegment, Coast), // len: 262m - (7509, 1e6, OutsideSegment, Accelerate)); + (0, 5461, OutsideSegment, Accelerate), // len: 5461m + (5461, 5802, OutsideSegment, Coast), // len: 341m + (5802, 7148, OutsideSegment, Brake), // len: 1346m + (7148, 7446, OutsideSegment, Coast), // len: 298m + (7446, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_NoADAS_CaseD_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (0, 2124, OutsideSegment, Accelerate), // len: 2124m - (2124, 2265, OutsideSegment, Coast), // len: 141m - (2265, 2494, OutsideSegment, Brake), // len: 229m - (2494, 2613, OutsideSegment, Coast), // len: 119m - (2613, 5424, OutsideSegment, Accelerate), // len: 2811m - (5424, 5742, OutsideSegment, Coast), // len: 318m - (5742, 6776, OutsideSegment, Brake), // len: 1034m - (6776, 7026, OutsideSegment, Coast), // len: 250m - (7026, 1e6, OutsideSegment, Accelerate)); + (0, 2147, OutsideSegment, Accelerate), // len: 2147m + (2147, 2301, OutsideSegment, Coast), // len: 154m + (2301, 2481, OutsideSegment, Brake), // len: 180m + (2481, 2600, OutsideSegment, Coast), // len: 119m + (2600, 5516, OutsideSegment, Accelerate), // len: 2916m + (5516, 5870, OutsideSegment, Coast), // len: 354m + (5870, 6687, OutsideSegment, Brake), // len: 817m + (6687, 6973, OutsideSegment, Coast), // len: 286m + (6973, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_NoADAS_CaseE_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (0, 2159, OutsideSegment, Accelerate), // len: 2159m - (2159, 2525, OutsideSegment, Coast), // len: 366m - (2525, 3284, OutsideSegment, Accelerate), // len: 759m - (3284, 3508, OutsideSegment, Coast), // len: 224m - (3508, 4024, OutsideSegment, Brake), // len: 516m - (4024, 4286, OutsideSegment, Coast), // len: 262m - (4286, 1e6, OutsideSegment, Accelerate)); + (0, 2182, OutsideSegment, Accelerate), // len: 2182m + (2182, 2464, OutsideSegment, Coast), // len: 282m + (2464, 3327, OutsideSegment, Accelerate), // len: 863m + (3327, 3575, OutsideSegment, Coast), // len: 248m + (3575, 3971, OutsideSegment, Brake), // len: 396m + (3971, 4233, OutsideSegment, Coast), // len: 262m + (4233, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_NoADAS_CaseF_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (0, 2159, OutsideSegment, Accelerate), // len: 2159m - (2159, 2643, OutsideSegment, Coast), // len: 484m - (2643, 2818, OutsideSegment, Accelerate), // len: 175m - (2818, 3137, OutsideSegment, Coast), // len: 319m - (3137, 3329, OutsideSegment, Brake), // len: 192m - (3329, 3567, OutsideSegment, Coast), // len: 238m - (3567, 1e6, OutsideSegment, Accelerate)); + (0, 2194, OutsideSegment, Accelerate), // len: 2194m + (2194, 2499, OutsideSegment, Coast), // len: 305m + (2499, 2884, OutsideSegment, Accelerate), // len: 385m + (2884, 3450, OutsideSegment, Coast), // len: 566m + (3450, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_NoADAS_CaseG_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (500, 5414, OutsideSegment, Accelerate), // len: 5414m - (5414, 5567, OutsideSegment, Coast), // len: 153m - (5567, 6817, OutsideSegment, Brake), // len: 1250m - (6817, 7352, OutsideSegment, Coast), // len: 535m - (7352, 1e6, OutsideSegment, Accelerate)); + (0, 5437, OutsideSegment, Accelerate), // len: 5437m + (5437, 5603, OutsideSegment, Coast), // len: 166m + (5603, 6564, OutsideSegment, Brake), // len: 961m + (6564, 7075, OutsideSegment, Coast), // len: 511m + (7075, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_NoADAS_CaseH_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (500, 5227, OutsideSegment, Accelerate), // len: 5227m - (5227, 5522, OutsideSegment, Coast), // len: 295m - (5522, 6063, OutsideSegment, Brake), // len: 541m - (6063, 6289, OutsideSegment, Coast), // len: 226m - (6289, 1e6, OutsideSegment, Accelerate)); + (0, 5297, OutsideSegment, Accelerate), // len: 5297m + (5297, 5651, OutsideSegment, Coast), // len: 354m + (5651, 5987, OutsideSegment, Brake), // len: 336m + (5987, 6249, OutsideSegment, Coast), // len: 262m + (6249, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_NoADAS_CaseI_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, @@ -625,165 +498,107 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS [TestCase] public void Class5_NoADAS_CaseJ_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (500, 4563, OutsideSegment, Accelerate), // len: 4472m - (4563, 4582, OutsideSegment, Roll), // len: 19m - (4582, 4709, OutsideSegment, Accelerate), // len: 127m - (4709, 4723, OutsideSegment, Roll), // len: 14m - (4723, 4789, OutsideSegment, Accelerate), // len: 66m - (4789, 4800, OutsideSegment, Roll), // len: 11m - (4800, 4866, OutsideSegment, Accelerate), // len: 66m - (4866, 4875, OutsideSegment, Roll), // len: 9m - (4875, 4931, OutsideSegment, Accelerate), // len: 56m - (4931, 4940, OutsideSegment, Roll), // len: 9m - (4940, 5028, OutsideSegment, Accelerate), // len: 88m - (5028, 5040, OutsideSegment, Roll), // len: 12m - (5040, 5079, OutsideSegment, Accelerate), // len: 39m - (5079, 5093, OutsideSegment, Roll), // len: 14m - (5093, 5131, OutsideSegment, Accelerate), // len: 38m - (5131, 5147, OutsideSegment, Roll), // len: 16m - (5147, 5444, OutsideSegment, Accelerate), // len: 297m - (5444, 5539, OutsideSegment, Coast), // len: 95m - (5539, 6116, OutsideSegment, Brake), // len: 577m - (6116, 6401, OutsideSegment, Coast), // len: 285m - (6401, 1e6, OutsideSegment, Accelerate)); + (0, 4563, OutsideSegment, Accelerate), // len: 4563m + (5146, 5443, OutsideSegment, Accelerate), // len: 297m + (5443, 5538, OutsideSegment, Coast), // len: 95m + (5538, 6115, OutsideSegment, Brake), // len: 577m + (6115, 6400, OutsideSegment, Coast), // len: 285m + (6400, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_NoADAS_CrestCoast1_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - //(0, 0, OutsideSegment, Halt), // len: 0m - //(0, 4, OutsideSegment, Accelerate), // len: 4m - //(4, 6, OutsideSegment, Roll), // len: 2m - //(6, 15, OutsideSegment, Accelerate), // len: 9m - //(15, 20, OutsideSegment, Roll), // len: 5m - //(20, 35, OutsideSegment, Accelerate), // len: 15m - //(35, 42, OutsideSegment, Roll), // len: 7m - //(42, 71, OutsideSegment, Accelerate), // len: 29m - //(71, 81, OutsideSegment, Roll), // len: 10m - //(81, 139, OutsideSegment, Accelerate), // len: 58m - //(139, 153, OutsideSegment, Roll), // len: 14m - //(153, 242, OutsideSegment, Accelerate), // len: 89m - //(242, 258, OutsideSegment, Roll), // len: 16m - //(258, 392, OutsideSegment, Accelerate), // len: 134m - //(392, 411, OutsideSegment, Roll), // len: 19m - (500, 3406, OutsideSegment, Accelerate), // len: 2995m - (3406, 3870, OutsideSegment, Coast), // len: 464m - (3870, 5210, OutsideSegment, Brake), // len: 1340m - (5210, 5509, OutsideSegment, Coast), // len: 299m - (5509, 1e6, OutsideSegment, Accelerate)); + (500, 3804, OutsideSegment, Accelerate), // len: 3393m + (3804, 4533, OutsideSegment, Coast), // len: 729m + (4533, 5006, OutsideSegment, Brake), // len: 473m + (5006, 5413, OutsideSegment, Coast), // len: 407m + (5413, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_NoADAS_CrestCoast2_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - //(0, 0, OutsideSegment, Halt), // len: 0m - //(0, 4, OutsideSegment, Accelerate), // len: 4m - //(4, 6, OutsideSegment, Roll), // len: 2m - //(6, 15, OutsideSegment, Accelerate), // len: 9m - //(15, 20, OutsideSegment, Roll), // len: 5m - //(20, 35, OutsideSegment, Accelerate), // len: 15m - //(35, 42, OutsideSegment, Roll), // len: 7m - //(42, 71, OutsideSegment, Accelerate), // len: 29m - //(71, 81, OutsideSegment, Roll), // len: 10m - //(81, 139, OutsideSegment, Accelerate), // len: 58m - //(139, 153, OutsideSegment, Roll), // len: 14m - //(153, 242, OutsideSegment, Accelerate), // len: 89m - //(242, 258, OutsideSegment, Roll), // len: 16m - //(258, 392, OutsideSegment, Accelerate), // len: 134m - //(392, 411, OutsideSegment, Roll), // len: 19m - (500, 3415, OutsideSegment, Accelerate), // len: 3004m - (3415, 3848, OutsideSegment, Coast), // len: 433m - (3848, 4513, OutsideSegment, Brake), // len: 665m - (4513, 4781, OutsideSegment, Coast), // len: 268m - (4781, 1e6, OutsideSegment, Accelerate)); + (500, 3609, OutsideSegment, Accelerate), // len: 3198m + (3609, 4202, OutsideSegment, Coast), // len: 593m + (4202, 4504, OutsideSegment, Brake), // len: 302m + (4504, 4722, OutsideSegment, Coast), // len: 218m + (4722, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P3_PCC123EcoRollEngineStop_CaseA_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 4130, OutsideSegment, Accelerate), // len: 4130m (4130, 5472, WithinSegment, Accelerate), // len: 1342m - (5472, 5765, UseCase1, Coast), // len: 293m - (5765, 5812, WithinSegment, Coast), // len: 47m - (5812, 6037, OutsideSegment, Coast), // len: 225m - (6037, 1e6, OutsideSegment, Accelerate)); + (5472, 5809, UseCase1, Coast), // len: 337m + (5809, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P3_PCC123EcoRollEngineStop_CaseB_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 4655, OutsideSegment, Accelerate), // len: 4655m (4655, 5496, WithinSegment, Accelerate), // len: 841m - (5496, 6461, UseCase1, Coast), // len: 965m - (6461, 6872, WithinSegment, Coast), // len: 411m - (6872, 7256, WithinSegment, Brake), // len: 384m - (7256, 7466, OutsideSegment, Brake), // len: 210m - (7466, 8025, OutsideSegment, Coast), // len: 559m - (8025, 1e6, OutsideSegment, Accelerate)); + (5496, 7252, UseCase1, Coast), // len: 1756m + (7252, 7486, OutsideSegment, Coast), // len: 234m + (7486, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P3_PCC123EcoRollEngineStop_CaseC_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 3979, OutsideSegment, Accelerate), // len: 3979m (3979, 4936, WithinSegment, Accelerate), // len: 957m - (4936, 5878, UseCase1, Coast), // len: 942m - (5878, 6047, WithinSegment, Coast), // len: 169m - (6047, 7160, WithinSegment, Brake), // len: 1113m - (7160, 7234, OutsideSegment, Brake), // len: 74m - (7234, 7647, OutsideSegment, Coast), // len: 413m - (7647, 1e6, OutsideSegment, Accelerate)); + (4936, 6104, UseCase1, Coast), // len: 1168m + (6104, 6298, WithinSegment, Coast), // len: 194m + (6298, 7139, WithinSegment, Brake), // len: 841m + (7139, 7151, WithinSegment, Coast), // len: 12m + (7151, 7563, OutsideSegment, Coast), // len: 412m + (7563, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P3_PCC123EcoRollEngineStop_CaseD_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 654, OutsideSegment, Accelerate), // len: 654m (654, 1902, WithinSegment, Accelerate), // len: 1248m - (1902, 2378, UseCase1, Coast), // len: 476m - (2378, 2486, WithinSegment, Coast), // len: 108m - (2486, 2629, OutsideSegment, Coast), // len: 143m - (2629, 4041, OutsideSegment, Accelerate), // len: 1412m - (4041, 4951, WithinSegment, Accelerate), // len: 910m - (4951, 5939, UseCase1, Coast), // len: 988m - (5939, 6145, WithinSegment, Coast), // len: 206m - (6145, 6689, WithinSegment, Brake), // len: 544m - (6689, 6763, OutsideSegment, Brake), // len: 74m - (6763, 7152, OutsideSegment, Coast), // len: 389m - (7152, 1e6, OutsideSegment, Accelerate)); + (1902, 2487, UseCase1, Coast), // len: 585m + (2487, 2511, OutsideSegment, Coast), // len: 24m + (2511, 4039, OutsideSegment, Accelerate), // len: 1528m + (4039, 4961, WithinSegment, Accelerate), // len: 922m + (4961, 6211, UseCase1, Coast), // len: 1250m + (6211, 6624, WithinSegment, Coast), // len: 413m + (6624, 6673, WithinSegment, Brake), // len: 49m + (6673, 6686, WithinSegment, Coast), // len: 13m + (6686, 7086, OutsideSegment, Coast), // len: 400m + (7086, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P3_PCC123EcoRollEngineStop_CaseE_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 689, OutsideSegment, Accelerate), // len: 689m (689, 2077, WithinSegment, Accelerate), // len: 1388m - (2077, 2345, UseCase1, Coast), // len: 268m - (2345, 2499, WithinSegment, Coast), // len: 154m - (2499, 2989, WithinSegment, Accelerate), // len: 490m - (2989, 3694, UseCase1, Coast), // len: 705m - (3694, 3900, WithinSegment, Coast), // len: 206m - (3900, 3974, WithinSegment, Brake), // len: 74m - (3974, 4023, OutsideSegment, Brake), // len: 49m - (4023, 4435, OutsideSegment, Coast), // len: 412m - (4435, 1e6, OutsideSegment, Accelerate)); + (2077, 2378, UseCase1, Coast), // len: 301m + (2378, 2996, WithinSegment, Accelerate), // len: 618m + (2996, 3875, UseCase1, Coast), // len: 879m + (3875, 3970, WithinSegment, Coast), // len: 95m + (3970, 4170, OutsideSegment, Coast), // len: 200m + (4170, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P3_PCC123EcoRollEngineStop_CaseF_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 700, OutsideSegment, Accelerate), // len: 700m (700, 2089, WithinSegment, Accelerate), // len: 1389m - (2089, 2346, UseCase1, Coast), // len: 257m - (2346, 2605, WithinSegment, Coast), // len: 259m - (2605, 2640, WithinSegment, Accelerate), // len: 35m - (2640, 3104, UseCase1, Coast), // len: 464m - (3104, 3271, WithinSegment, Coast), // len: 167m - (3271, 3569, OutsideSegment, Coast), // len: 298m - (3569, 1e6, OutsideSegment, Accelerate)); + (2089, 2390, UseCase1, Coast), // len: 301m + (2390, 2647, WithinSegment, Accelerate), // len: 257m + (2647, 3267, UseCase1, Coast), // len: 620m + (3267, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P3_PCC123EcoRollEngineStop_CaseG_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (500, 3944, OutsideSegment, Accelerate), // len: 3944m + (0, 3944, OutsideSegment, Accelerate), // len: 3944m (3944, 5099, WithinSegment, Accelerate), // len: 1155m - (5099, 5728, UseCase1, Coast), // len: 629m - (5728, 5922, WithinSegment, Coast), // len: 194m - (5922, 6564, WithinSegment, Brake), // len: 642m - (6564, 6787, OutsideSegment, Brake), // len: 223m - (6787, 7539, OutsideSegment, Coast), // len: 752m - (7539, 1e6, OutsideSegment, Accelerate)); + (5099, 5901, UseCase1, Coast), // len: 802m + (5901, 6339, WithinSegment, Coast), // len: 438m + (6339, 6537, WithinSegment, Brake), // len: 198m + (6537, 6561, WithinSegment, Coast), // len: 24m + (6561, 7288, OutsideSegment, Coast), // len: 727m + (7288, 1e6, OutsideSegment, Accelerate)); + [TestCase] public void Class5_P3_PCC123EcoRollEngineStop_CaseH_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (500, 3815, OutsideSegment, Accelerate), // len: 3815m + (0, 3815, OutsideSegment, Accelerate), // len: 3815m (3815, 4854, WithinSegment, Accelerate), // len: 1039m - (4854, 5661, UseCase1, Coast), // len: 807m - (5661, 5988, WithinSegment, Coast), // len: 327m - (5988, 6401, OutsideSegment, Coast), // len: 413m - (6401, 1e6, OutsideSegment, Accelerate)); + (4854, 5987, UseCase1, Coast), // len: 1133m + (5987, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P3_PCC123EcoRollEngineStop_CaseI_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, @@ -791,175 +606,111 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS [TestCase] public void Class5_P3_PCC123EcoRollEngineStop_CaseJ_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (500, 3559, OutsideSegment, Accelerate), // len: 3559m - (3559, 4563, WithinSegment, Accelerate), // len: 913m - (4563, 4582, WithinSegment, Roll), // len: 19m - (4582, 4708, WithinSegment, Accelerate), // len: 126m - (4708, 4722, WithinSegment, Roll), // len: 14m - (4722, 4774, WithinSegment, Accelerate), // len: 52m - (4774, 4785, WithinSegment, Roll), // len: 11m - (4785, 4826, WithinSegment, Accelerate), // len: 41m - (4826, 4834, WithinSegment, Roll), // len: 8m - (4834, 4873, WithinSegment, Accelerate), // len: 39m - (4873, 4880, WithinSegment, Roll), // len: 7m - (4880, 4923, WithinSegment, Accelerate), // len: 43m - (4923, 4929, WithinSegment, Roll), // len: 6m - (4929, 4945, WithinSegment, Accelerate), // len: 16m - (4945, 4951, WithinSegment, Roll), // len: 6m - (4951, 4999, WithinSegment, Accelerate), // len: 48m - (4999, 5008, WithinSegment, Roll), // len: 9m - (5008, 5050, WithinSegment, Accelerate), // len: 42m - (5050, 5062, WithinSegment, Roll), // len: 12m - (5062, 5094, WithinSegment, Accelerate), // len: 32m - (5094, 5107, WithinSegment, Roll), // len: 13m - (5107, 5144, WithinSegment, Accelerate), // len: 37m - (5144, 5159, WithinSegment, Roll), // len: 15m - (5159, 5373, WithinSegment, Accelerate), // len: 214m - (5373, 5632, UseCase2, Coast), // len: 259m - (5632, 5801, WithinSegment, Coast), // len: 169m - (5801, 6123, WithinSegment, Brake), // len: 322m - (6123, 6185, OutsideSegment, Brake), // len: 62m - (6185, 6596, OutsideSegment, Coast), // len: 411m - (6596, 1e6, OutsideSegment, Accelerate)); + (0, 3559, OutsideSegment, Accelerate), // len: 3559m + (3559, 4563, WithinSegment, Accelerate), // len: 1004m + (5158, 5371, WithinSegment, Accelerate), // len: 213m + (5371, 5698, UseCase2, Coast), // len: 327m + (5698, 6002, WithinSegment, Coast), // len: 304m + (6002, 6101, WithinSegment, Brake), // len: 99m + (6101, 6126, WithinSegment, Coast), // len: 25m + (6126, 6501, OutsideSegment, Coast), // len: 375m + (6501, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P3_PCC123EcoRollEngineStop_CrestCoast1_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - //(0, 0, OutsideSegment, Halt), // len: 0m - //(0, 4, OutsideSegment, Accelerate), // len: 4m - //(4, 6, OutsideSegment, Roll), // len: 2m - //(6, 15, OutsideSegment, Accelerate), // len: 9m - //(15, 19, OutsideSegment, Roll), // len: 4m - //(19, 37, OutsideSegment, Accelerate), // len: 18m - //(37, 44, OutsideSegment, Roll), // len: 7m - //(44, 88, OutsideSegment, Accelerate), // len: 44m - //(88, 98, OutsideSegment, Roll), // len: 10m - //(98, 164, OutsideSegment, Accelerate), // len: 66m - //(164, 178, OutsideSegment, Roll), // len: 14m - //(178, 260, OutsideSegment, Accelerate), // len: 82m - //(260, 276, OutsideSegment, Roll), // len: 16m - //(276, 427, OutsideSegment, Accelerate), // len: 151m - //(427, 446, OutsideSegment, Roll), // len: 19m - (500, 3411, OutsideSegment, Accelerate), // len: 2965m - (3411, 3876, OutsideSegment, Coast), // len: 465m - (3876, 5205, OutsideSegment, Brake), // len: 1329m - (5205, 5515, OutsideSegment, Coast), // len: 310m - (5515, 1e6, OutsideSegment, Accelerate)); + (500, 3803, OutsideSegment, Accelerate), // len: 3344m + (3803, 4533, OutsideSegment, Coast), // len: 730m + (4533, 5006, OutsideSegment, Brake), // len: 473m + (5006, 5413, OutsideSegment, Coast), // len: 407m + (5413, 1e6, OutsideSegment, Accelerate)); + [TestCase] public void Class5_P3_PCC123EcoRollEngineStop_CrestCoast2_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - //(0, 0, OutsideSegment, Halt), // len: 0m - //(0, 4, OutsideSegment, Accelerate), // len: 4m - //(4, 6, OutsideSegment, Roll), // len: 2m - //(6, 15, OutsideSegment, Accelerate), // len: 9m - //(15, 19, OutsideSegment, Roll), // len: 4m - //(19, 37, OutsideSegment, Accelerate), // len: 18m - //(37, 44, OutsideSegment, Roll), // len: 7m - //(44, 88, OutsideSegment, Accelerate), // len: 44m - //(88, 98, OutsideSegment, Roll), // len: 10m - //(98, 164, OutsideSegment, Accelerate), // len: 66m - //(164, 178, OutsideSegment, Roll), // len: 14m - //(178, 260, OutsideSegment, Accelerate), // len: 82m - //(260, 276, OutsideSegment, Roll), // len: 16m - //(276, 427, OutsideSegment, Accelerate), // len: 151m - //(427, 446, OutsideSegment, Roll), // len: 19m - (500, 3421, OutsideSegment, Accelerate), // len: 2975m - (3421, 3844, OutsideSegment, Coast), // len: 423m - (3844, 4508, OutsideSegment, Brake), // len: 664m - (4508, 4777, OutsideSegment, Coast), // len: 269m - (4777, 1e6, OutsideSegment, Accelerate)); + (500, 3609, OutsideSegment, Accelerate), // len: 3150m + (3609, 4202, OutsideSegment, Coast), // len: 593m + (4202, 4504, OutsideSegment, Brake), // len: 302m + (4504, 4722, OutsideSegment, Coast), // len: 218m + (4722, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P4_PCC123EcoRollEngineStop_CaseA_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 4130, OutsideSegment, Accelerate), // len: 4130m (4130, 5461, WithinSegment, Accelerate), // len: 1331m - (5461, 5765, UseCase1, Coast), // len: 304m - (5765, 5812, WithinSegment, Coast), // len: 47m - (5812, 6049, OutsideSegment, Coast), // len: 237m - (6049, 1e6, OutsideSegment, Accelerate)); + (5461, 5808, UseCase1, Coast), // len: 347m + (5808, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P4_PCC123EcoRollEngineStop_CaseB_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 4655, OutsideSegment, Accelerate), // len: 4655m (4655, 5472, WithinSegment, Accelerate), // len: 817m - (5472, 6459, UseCase1, Coast), // len: 987m - (6459, 6870, WithinSegment, Coast), // len: 411m - (6870, 7254, WithinSegment, Brake), // len: 384m - (7254, 7476, OutsideSegment, Brake), // len: 222m - (7476, 8047, OutsideSegment, Coast), // len: 571m - (8047, 1e6, OutsideSegment, Accelerate)); + (5472, 7247, UseCase1, Coast), // len: 1775m + (7247, 7493, OutsideSegment, Coast), // len: 246m + (7493, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P4_PCC123EcoRollEngineStop_CaseC_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 3979, OutsideSegment, Accelerate), // len: 3979m (3979, 4936, WithinSegment, Accelerate), // len: 957m - (4936, 5868, UseCase1, Coast), // len: 932m - (5868, 6037, WithinSegment, Coast), // len: 169m - (6037, 7150, WithinSegment, Brake), // len: 1113m - (7150, 7236, OutsideSegment, Brake), // len: 86m - (7236, 7649, OutsideSegment, Coast), // len: 413m - (7649, 1e6, OutsideSegment, Accelerate)); + (4936, 6094, UseCase1, Coast), // len: 1158m + (6094, 6288, WithinSegment, Coast), // len: 194m + (6288, 7141, WithinSegment, Brake), // len: 853m + (7141, 7153, WithinSegment, Coast), // len: 12m + (7153, 7566, OutsideSegment, Coast), // len: 413m + (7566, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P4_PCC123EcoRollEngineStop_CaseD_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 654, OutsideSegment, Accelerate), // len: 654m (654, 1891, WithinSegment, Accelerate), // len: 1237m - (1891, 2376, UseCase1, Coast), // len: 485m - (2376, 2484, WithinSegment, Coast), // len: 108m - (2484, 2639, OutsideSegment, Coast), // len: 155m - (2639, 4039, OutsideSegment, Accelerate), // len: 1400m - (4039, 4949, WithinSegment, Accelerate), // len: 910m - (4949, 5927, UseCase1, Coast), // len: 978m - (5927, 6133, WithinSegment, Coast), // len: 206m - (6133, 6689, WithinSegment, Brake), // len: 556m - (6689, 6775, OutsideSegment, Brake), // len: 86m - (6775, 7163, OutsideSegment, Coast), // len: 388m - (7163, 1e6, OutsideSegment, Accelerate)); + (1891, 2485, UseCase1, Coast), // len: 594m + (2485, 2497, OutsideSegment, Coast), // len: 12m + (2497, 4037, OutsideSegment, Accelerate), // len: 1540m + (4037, 4947, WithinSegment, Accelerate), // len: 910m + (4947, 6205, UseCase1, Coast), // len: 1258m + (6205, 6606, WithinSegment, Coast), // len: 401m + (6606, 6680, WithinSegment, Brake), // len: 74m + (6680, 6692, WithinSegment, Coast), // len: 12m + (6692, 7092, OutsideSegment, Coast), // len: 400m + (7092, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P4_PCC123EcoRollEngineStop_CaseE_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 689, OutsideSegment, Accelerate), // len: 689m (689, 2077, WithinSegment, Accelerate), // len: 1388m - (2077, 2345, UseCase1, Coast), // len: 268m - (2345, 2511, WithinSegment, Coast), // len: 166m - (2511, 2989, WithinSegment, Accelerate), // len: 478m - (2989, 3683, UseCase1, Coast), // len: 694m - (3683, 3889, WithinSegment, Coast), // len: 206m - (3889, 3976, WithinSegment, Brake), // len: 87m - (3976, 4025, OutsideSegment, Brake), // len: 49m - (4025, 4449, OutsideSegment, Coast), // len: 424m - (4449, 1e6, OutsideSegment, Accelerate)); + (2077, 2378, UseCase1, Coast), // len: 301m + (2378, 2985, WithinSegment, Accelerate), // len: 607m + (2985, 3906, UseCase1, Coast), // len: 921m + (3906, 3977, WithinSegment, Coast), // len: 71m + (3977, 4153, OutsideSegment, Coast), // len: 176m + (4153, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P4_PCC123EcoRollEngineStop_CaseF_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 700, OutsideSegment, Accelerate), // len: 700m (700, 2077, WithinSegment, Accelerate), // len: 1377m - (2077, 2357, UseCase1, Coast), // len: 280m - (2357, 2581, WithinSegment, Coast), // len: 224m - (2581, 2628, WithinSegment, Accelerate), // len: 47m - (2628, 3103, UseCase1, Coast), // len: 475m - (3103, 3270, WithinSegment, Coast), // len: 167m - (3270, 3568, OutsideSegment, Coast), // len: 298m - (3568, 1e6, OutsideSegment, Accelerate)); + (2077, 2389, UseCase1, Coast), // len: 312m + (2389, 2634, WithinSegment, Accelerate), // len: 245m + (2634, 3266, UseCase1, Coast), // len: 632m + (3266, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P4_PCC123EcoRollEngineStop_CaseG_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 3944, OutsideSegment, Accelerate), // len: 3944m (3944, 5099, WithinSegment, Accelerate), // len: 1155m - (5099, 5728, UseCase1, Coast), // len: 629m - (5728, 5910, WithinSegment, Coast), // len: 182m - (5910, 6565, WithinSegment, Brake), // len: 655m - (6565, 6800, OutsideSegment, Brake), // len: 235m - (6800, 7564, OutsideSegment, Coast), // len: 764m - (7564, 1e6, OutsideSegment, Accelerate)); + (5099, 5890, UseCase1, Coast), // len: 791m + (5890, 6291, WithinSegment, Coast), // len: 401m + (6291, 6538, WithinSegment, Brake), // len: 247m + (6538, 6563, WithinSegment, Coast), // len: 25m + (6563, 7290, OutsideSegment, Coast), // len: 727m + (7290, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P4_PCC123EcoRollEngineStop_CaseH_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 3815, OutsideSegment, Accelerate), // len: 3815m (3815, 4842, WithinSegment, Accelerate), // len: 1027m - (4842, 5660, UseCase1, Coast), // len: 818m - (5660, 6000, WithinSegment, Coast), // len: 340m - (6000, 6413, OutsideSegment, Coast), // len: 413m - (6413, 1e6, OutsideSegment, Accelerate)); + (4842, 5997, UseCase1, Coast), // len: 1155m + (5997, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P4_PCC123EcoRollEngineStop_CaseI_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, @@ -967,310 +718,195 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS [TestCase] public void Class5_P4_PCC123EcoRollEngineStop_CaseJ_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (500, 3559, OutsideSegment, Accelerate), // len: 3559m - (3559, 4505, WithinSegment, Accelerate), // len: 854m - (4505, 4524, WithinSegment, Roll), // len: 19m - (4524, 4641, WithinSegment, Accelerate), // len: 117m - (4641, 4656, WithinSegment, Roll), // len: 15m - (4656, 4709, WithinSegment, Accelerate), // len: 53m - (4709, 4720, WithinSegment, Roll), // len: 11m - (4720, 4761, WithinSegment, Accelerate), // len: 41m - (4761, 4770, WithinSegment, Roll), // len: 9m - (4770, 4801, WithinSegment, Accelerate), // len: 31m - (4801, 4808, WithinSegment, Roll), // len: 7m - (4808, 4840, WithinSegment, Accelerate), // len: 32m - (4840, 4845, WithinSegment, Roll), // len: 5m - (4845, 4879, WithinSegment, Accelerate), // len: 34m - (4879, 4884, WithinSegment, Roll), // len: 5m - (4884, 4911, WithinSegment, Accelerate), // len: 27m - (4911, 4914, WithinSegment, Roll), // len: 3m - (4914, 4949, WithinSegment, Accelerate), // len: 35m - (4949, 4954, WithinSegment, Roll), // len: 5m - (4954, 4986, WithinSegment, Accelerate), // len: 32m - (4986, 4993, WithinSegment, Roll), // len: 7m - (4993, 5028, WithinSegment, Accelerate), // len: 35m - (5028, 5038, WithinSegment, Roll), // len: 10m - (5038, 5074, WithinSegment, Accelerate), // len: 36m - (5074, 5086, WithinSegment, Roll), // len: 12m - (5086, 5118, WithinSegment, Accelerate), // len: 32m - (5118, 5132, WithinSegment, Roll), // len: 14m - (5132, 5169, WithinSegment, Accelerate), // len: 37m - (5169, 5184, WithinSegment, Roll), // len: 15m + (0, 3559, OutsideSegment, Accelerate), // len: 3559m (5184, 5397, WithinSegment, Accelerate), // len: 213m - (5397, 5668, UseCase2, Coast), // len: 271m - (5668, 5837, WithinSegment, Coast), // len: 169m - (5837, 6122, WithinSegment, Brake), // len: 285m - (6122, 6196, OutsideSegment, Brake), // len: 74m - (6196, 6596, OutsideSegment, Coast), // len: 400m - (6596, 1e6, OutsideSegment, Accelerate)); + (5397, 5736, UseCase2, Coast), // len: 339m + (5736, 6126, WithinSegment, Coast), // len: 390m + (6126, 6501, OutsideSegment, Coast), // len: 375m + (6501, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P4_PCC123EcoRollEngineStop_CrestCoast1_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - //(0, 0, OutsideSegment, Halt), // len: 0m - //(0, 4, OutsideSegment, Accelerate), // len: 4m - //(4, 6, OutsideSegment, Roll), // len: 2m - //(6, 15, OutsideSegment, Accelerate), // len: 9m - //(15, 19, OutsideSegment, Roll), // len: 4m - //(19, 34, OutsideSegment, Accelerate), // len: 15m - //(34, 40, OutsideSegment, Roll), // len: 6m - //(40, 59, OutsideSegment, Accelerate), // len: 19m - //(59, 68, OutsideSegment, Roll), // len: 9m - //(68, 101, OutsideSegment, Accelerate), // len: 33m - //(101, 112, OutsideSegment, Roll), // len: 11m - //(112, 185, OutsideSegment, Accelerate), // len: 73m - //(185, 198, OutsideSegment, Roll), // len: 13m - //(198, 346, OutsideSegment, Accelerate), // len: 148m - //(346, 363, OutsideSegment, Roll), // len: 17m - //(363, 492, OutsideSegment, Accelerate), // len: 129m - //(492, 511, OutsideSegment, Roll), // len: 19m - (511, 3409, OutsideSegment, Accelerate), // len: 2898m - (3409, 3854, OutsideSegment, Coast), // len: 445m - (3854, 5213, OutsideSegment, Brake), // len: 1359m - (5213, 5513, OutsideSegment, Coast), // len: 300m - (5513, 1e6, OutsideSegment, Accelerate)); + (600, 3415, OutsideSegment, Accelerate), // len: 2887m + (3415, 4504, OutsideSegment, Coast), // len: 1089m + (4504, 5008, OutsideSegment, Brake), // len: 504m + (5008, 5415, OutsideSegment, Coast), // len: 407m + (5415, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P4_PCC123EcoRollEngineStop_CrestCoast2_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - //(0, 0, OutsideSegment, Halt), // len: 0m - //(0, 4, OutsideSegment, Accelerate), // len: 4m - //(4, 6, OutsideSegment, Roll), // len: 2m - //(6, 15, OutsideSegment, Accelerate), // len: 9m - //(15, 19, OutsideSegment, Roll), // len: 4m - //(19, 34, OutsideSegment, Accelerate), // len: 15m - //(34, 40, OutsideSegment, Roll), // len: 6m - //(40, 59, OutsideSegment, Accelerate), // len: 19m - //(59, 68, OutsideSegment, Roll), // len: 9m - //(68, 101, OutsideSegment, Accelerate), // len: 33m - //(101, 112, OutsideSegment, Roll), // len: 11m - //(112, 185, OutsideSegment, Accelerate), // len: 73m - //(185, 198, OutsideSegment, Roll), // len: 13m - //(198, 346, OutsideSegment, Accelerate), // len: 148m - //(346, 363, OutsideSegment, Roll), // len: 17m - //(363, 492, OutsideSegment, Accelerate), // len: 129m - //(492, 511, OutsideSegment, Roll), // len: 19m - (511, 3418, OutsideSegment, Accelerate), // len: 2907m - (3418, 3842, OutsideSegment, Coast), // len: 424m - (3842, 4506, OutsideSegment, Brake), // len: 664m - (4506, 4785, OutsideSegment, Coast), // len: 279m - (4785, 1e6, OutsideSegment, Accelerate)); + (600, 3610, OutsideSegment, Accelerate), // len: 3082m + (3610, 4173, OutsideSegment, Coast), // len: 563m + (4173, 4505, OutsideSegment, Brake), // len: 332m + (4505, 4723, OutsideSegment, Coast), // len: 218m + (4723, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P25_PCC123EcoRollEngineStop_CaseA_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 4130, OutsideSegment, Accelerate), // len: 4130m (4130, 5612, WithinSegment, Accelerate), // len: 1482m - (5612, 5811, UseCase1, Coast), // len: 199m - (5811, 5976, OutsideSegment, Coast), // len: 165m - (5976, 1e6, OutsideSegment, Accelerate)); + (5612, 5810, UseCase1, Coast), // len: 198m + (5810, 1e6, OutsideSegment, Accelerate)); + [TestCase] public void Class5_P25_PCC123EcoRollEngineStop_CaseB_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 4655, OutsideSegment, Accelerate), // len: 4655m (4655, 5682, WithinSegment, Accelerate), // len: 1027m - (5682, 6551, UseCase1, Coast), // len: 869m - (6551, 7253, WithinSegment, Coast), // len: 702m - (7253, 7933, OutsideSegment, Coast), // len: 680m - (7933, 1e6, OutsideSegment, Accelerate)); + (5682, 7253, UseCase1, Coast), // len: 1571m + (7253, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P25_PCC123EcoRollEngineStop_CaseC_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 3979, OutsideSegment, Accelerate), // len: 3979m (3979, 4994, WithinSegment, Accelerate), // len: 1015m - (4994, 5948, UseCase1, Coast), // len: 954m - (5948, 6141, WithinSegment, Coast), // len: 193m - (6141, 7155, WithinSegment, Brake), // len: 1014m - (7155, 7180, OutsideSegment, Brake), // len: 25m - (7180, 7592, OutsideSegment, Coast), // len: 412m - (7592, 1e6, OutsideSegment, Accelerate)); + (4994, 6176, UseCase1, Coast), // len: 1182m + (6176, 6394, WithinSegment, Coast), // len: 218m + (6394, 7086, WithinSegment, Brake), // len: 692m + (7086, 7160, WithinSegment, Coast), // len: 74m + (7160, 7523, OutsideSegment, Coast), // len: 363m + (7523, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P25_PCC123EcoRollEngineStop_CaseD_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 654, OutsideSegment, Accelerate), // len: 654m (654, 1949, WithinSegment, Accelerate), // len: 1295m - (1949, 2381, UseCase1, Coast), // len: 432m - (2381, 2489, WithinSegment, Coast), // len: 108m - (2489, 2607, OutsideSegment, Coast), // len: 118m - (2607, 4042, OutsideSegment, Accelerate), // len: 1435m - (4042, 5011, WithinSegment, Accelerate), // len: 969m - (5011, 6022, UseCase1, Coast), // len: 1011m - (6022, 6276, WithinSegment, Coast), // len: 254m - (6276, 6684, WithinSegment, Brake), // len: 408m - (6684, 6709, OutsideSegment, Brake), // len: 25m - (6709, 7109, OutsideSegment, Coast), // len: 400m - (7109, 1e6, OutsideSegment, Accelerate)); + (1949, 2481, UseCase1, Coast), // len: 532m + (2481, 2504, OutsideSegment, Coast), // len: 23m + (2504, 4044, OutsideSegment, Accelerate), // len: 1540m + (4044, 5012, WithinSegment, Accelerate), // len: 968m + (5012, 6353, UseCase1, Coast), // len: 1341m + (6353, 6688, WithinSegment, Coast), // len: 335m + (6688, 6938, OutsideSegment, Coast), // len: 250m + (6938, 1e6, OutsideSegment, Accelerate)); + [TestCase] public void Class5_P25_PCC123EcoRollEngineStop_CaseE_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 689, OutsideSegment, Accelerate), // len: 689m (689, 2112, WithinSegment, Accelerate), // len: 1423m - (2112, 2381, UseCase1, Coast), // len: 269m - (2381, 2475, WithinSegment, Coast), // len: 94m - (2475, 3035, WithinSegment, Accelerate), // len: 560m - (3035, 3700, UseCase1, Coast), // len: 665m - (3700, 3978, WithinSegment, Coast), // len: 278m - (3978, 4352, OutsideSegment, Coast), // len: 374m - (4352, 1e6, OutsideSegment, Accelerate)); + (2112, 2379, UseCase1, Coast), // len: 267m + (2379, 3032, WithinSegment, Accelerate), // len: 653m + (3032, 3974, UseCase1, Coast), // len: 942m + (3974, 4056, OutsideSegment, Coast), // len: 82m + (4056, 1e6, OutsideSegment, Accelerate)); + [TestCase] public void Class5_P25_PCC123EcoRollEngineStop_CaseF_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 700, OutsideSegment, Accelerate), // len: 700m (700, 2124, WithinSegment, Accelerate), // len: 1424m - (2124, 2393, UseCase1, Coast), // len: 269m - (2393, 2522, WithinSegment, Coast), // len: 129m - (2522, 2744, WithinSegment, Accelerate), // len: 222m - (2744, 3129, UseCase1, Coast), // len: 385m - (3129, 3272, WithinSegment, Coast), // len: 143m - (3272, 3485, OutsideSegment, Coast), // len: 213m - (3485, 1e6, OutsideSegment, Accelerate)); + (2124, 2391, UseCase1, Coast), // len: 267m + (2391, 2741, WithinSegment, Accelerate), // len: 350m + (2741, 3273, UseCase1, Coast), // len: 532m + (3273, 1e6, OutsideSegment, Accelerate)); + [TestCase] public void Class5_P25_PCC123EcoRollEngineStop_CaseG_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (500, 3944, OutsideSegment, Accelerate), // len: 3944m + (0, 3944, OutsideSegment, Accelerate), // len: 3944m (3944, 5134, WithinSegment, Accelerate), // len: 1190m - (5134, 5785, UseCase1, Coast), // len: 651m - (5785, 6027, WithinSegment, Coast), // len: 242m - (6027, 6559, WithinSegment, Brake), // len: 532m - (6559, 6633, OutsideSegment, Brake), // len: 74m - (6633, 7384, OutsideSegment, Coast), // len: 751m - (7384, 1e6, OutsideSegment, Accelerate)); + (5134, 5994, UseCase1, Coast), // len: 860m + (5994, 6559, WithinSegment, Coast), // len: 565m + (6559, 6999, OutsideSegment, Coast), // len: 440m + (6999, 1e6, OutsideSegment, Accelerate)); + [TestCase] public void Class5_P25_PCC123EcoRollEngineStop_CaseH_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (500, 3815, OutsideSegment, Accelerate), // len: 3815m + (0, 3815, OutsideSegment, Accelerate), // len: 3815m (3815, 4982, WithinSegment, Accelerate), // len: 1167m - (4982, 5682, UseCase1, Coast), // len: 700m - (5682, 5995, WithinSegment, Coast), // len: 313m - (5995, 6319, OutsideSegment, Coast), // len: 324m - (6319, 1e6, OutsideSegment, Accelerate)); + (4982, 5992, UseCase1, Coast), // len: 1010m + (5992, 1e6, OutsideSegment, Accelerate)); + [TestCase] public void Class5_P25_PCC123EcoRollEngineStop_CaseI_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (500, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P25_PCC123EcoRollEngineStop_CaseJ_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (500, 3559, OutsideSegment, Accelerate), // len: 3559m - (3559, 4519, WithinSegment, Accelerate), // len: 860m - (4519, 4538, WithinSegment, Roll), // len: 19m - (4538, 4735, WithinSegment, Accelerate), // len: 197m - (4735, 4748, WithinSegment, Roll), // len: 13m - (4748, 4786, WithinSegment, Accelerate), // len: 38m - (4786, 4797, WithinSegment, Roll), // len: 11m - (4797, 5000, WithinSegment, Accelerate), // len: 203m - (5000, 5012, WithinSegment, Roll), // len: 12m - (5012, 5044, WithinSegment, Accelerate), // len: 32m - (5044, 5057, WithinSegment, Roll), // len: 13m - (5057, 5313, WithinSegment, Accelerate), // len: 256m - (5313, 5617, UseCase2, Coast), // len: 304m - (5617, 5799, WithinSegment, Coast), // len: 182m - (5799, 6120, WithinSegment, Brake), // len: 321m - (6120, 6145, OutsideSegment, Brake), // len: 25m - (6145, 6533, OutsideSegment, Coast), // len: 388m - (6533, 1e6, OutsideSegment, Accelerate)); + (0, 3559, OutsideSegment, Accelerate), // len: 3559m + (3559, 4519, WithinSegment, Accelerate), // len: 960m + (5057, 5312, WithinSegment, Accelerate), // len: 255m + (5312, 5673, UseCase2, Coast), // len: 361m + (5673, 6123, WithinSegment, Coast), // len: 450m + (6123, 6448, OutsideSegment, Coast), // len: 325m + (6448, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P25_PCC123EcoRollEngineStop_CrestCoast1_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - //(0, 0, OutsideSegment, Halt), // len: 0m - //(0, 4, OutsideSegment, Accelerate), // len: 4m - //(4, 6, OutsideSegment, Roll), // len: 2m - //(6, 15, OutsideSegment, Accelerate), // len: 9m - //(15, 20, OutsideSegment, Roll), // len: 5m - //(20, 35, OutsideSegment, Accelerate), // len: 15m - //(35, 42, OutsideSegment, Roll), // len: 7m - //(42, 105, OutsideSegment, Accelerate), // len: 63m - //(105, 117, OutsideSegment, Roll), // len: 12m - //(117, 149, OutsideSegment, Accelerate), // len: 32m - //(149, 162, OutsideSegment, Roll), // len: 13m - //(162, 368, OutsideSegment, Accelerate), // len: 206m - //(368, 387, OutsideSegment, Roll), // len: 19m - (500, 3411, OutsideSegment, Accelerate), // len: 3024m - (3411, 4160, OutsideSegment, Coast), // len: 749m - (4160, 5016, OutsideSegment, Brake), // len: 856m - (5016, 5455, OutsideSegment, Coast), // len: 439m - (5455, 1e6, OutsideSegment, Accelerate)); + (500, 4012, OutsideSegment, Accelerate), // len: 3636m + (4012, 5192, OutsideSegment, Coast), // len: 1180m + (5192, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_P25_PCC123EcoRollEngineStop_CrestCoast2_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - //(0, 0, OutsideSegment, Halt), // len: 0m - //(0, 4, OutsideSegment, Accelerate), // len: 4m - //(4, 6, OutsideSegment, Roll), // len: 2m - //(6, 15, OutsideSegment, Accelerate), // len: 9m - //(15, 20, OutsideSegment, Roll), // len: 5m - //(20, 35, OutsideSegment, Accelerate), // len: 15m - //(35, 42, OutsideSegment, Roll), // len: 7m - //(42, 105, OutsideSegment, Accelerate), // len: 63m - //(105, 117, OutsideSegment, Roll), // len: 12m - //(117, 149, OutsideSegment, Accelerate), // len: 32m - //(149, 162, OutsideSegment, Roll), // len: 13m - //(162, 368, OutsideSegment, Accelerate), // len: 206m - //(368, 387, OutsideSegment, Roll), // len: 19m - (500, 3605, OutsideSegment, Accelerate), // len: 3218m - (3605, 3990, OutsideSegment, Coast), // len: 385m - (3990, 4514, OutsideSegment, Brake), // len: 524m - (4514, 4742, OutsideSegment, Coast), // len: 228m - (4742, 1e6, OutsideSegment, Accelerate)); + (500, 3711, OutsideSegment, Accelerate), // len: 3335m + (3711, 4636, OutsideSegment, Coast), // len: 925m + (4636, 1e6, OutsideSegment, Accelerate)); + [TestCase] public void Class5_EcoRollWithoutEngineStop_CaseA_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (0, 5531, OutsideSegment, Accelerate), // len: 5531m - (5531, 6062, OutsideSegment, Coast), // len: 531m - (6062, 1e6, OutsideSegment, Accelerate)); + (0, 5612, OutsideSegment, Accelerate), // len: 5612m + (5612, 5916, OutsideSegment, Coast), // len: 304m + (5916, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_EcoRollWithoutEngineStop_CaseB_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (0, 5892, OutsideSegment, Accelerate), // len: 5892m - (5892, 6387, OutsideSegment, Coast), // len: 495m - (6387, 7481, OutsideSegment, Brake), // len: 1094m - (7481, 7874, OutsideSegment, Coast), // len: 393m - (7874, 1e6, OutsideSegment, Accelerate)); + (0, 6114, OutsideSegment, Accelerate), // len: 6114m + (6114, 6787, OutsideSegment, Coast), // len: 673m + (6787, 7255, OutsideSegment, Brake), // len: 468m + (7255, 7731, OutsideSegment, Coast), // len: 476m + (7731, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_EcoRollWithoutEngineStop_CaseC_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (0, 5367, OutsideSegment, Accelerate), // len: 5367m - (5367, 5685, OutsideSegment, Coast), // len: 318m - (5685, 7247, OutsideSegment, Brake), // len: 1562m - (7247, 7509, OutsideSegment, Coast), // len: 262m - (7509, 1e6, OutsideSegment, Accelerate)); + (0, 5461, OutsideSegment, Accelerate), // len: 5461m + (5461, 5802, OutsideSegment, Coast), // len: 341m + (5802, 7148, OutsideSegment, Brake), // len: 1346m + (7148, 7446, OutsideSegment, Coast), // len: 298m + (7446, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_EcoRollWithoutEngineStop_CaseD_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (0, 2124, OutsideSegment, Accelerate), // len: 2124m - (2124, 2265, OutsideSegment, Coast), // len: 141m - (2265, 2494, OutsideSegment, Brake), // len: 229m - (2494, 2613, OutsideSegment, Coast), // len: 119m - (2613, 5424, OutsideSegment, Accelerate), // len: 2811m - (5424, 5742, OutsideSegment, Coast), // len: 318m - (5742, 6776, OutsideSegment, Brake), // len: 1034m - (6776, 7026, OutsideSegment, Coast), // len: 250m - (7026, 1e6, OutsideSegment, Accelerate)); + (0, 2147, OutsideSegment, Accelerate), // len: 2147m + (2147, 2301, OutsideSegment, Coast), // len: 154m + (2301, 2481, OutsideSegment, Brake), // len: 180m + (2481, 2600, OutsideSegment, Coast), // len: 119m + (2600, 5516, OutsideSegment, Accelerate), // len: 2916m + (5516, 5870, OutsideSegment, Coast), // len: 354m + (5870, 6687, OutsideSegment, Brake), // len: 817m + (6687, 6973, OutsideSegment, Coast), // len: 286m + (6973, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_EcoRollWithoutEngineStop_CaseE_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (0, 2159, OutsideSegment, Accelerate), // len: 2159m - (2159, 2525, OutsideSegment, Coast), // len: 366m - (2525, 3284, OutsideSegment, Accelerate), // len: 759m - (3284, 3508, OutsideSegment, Coast), // len: 224m - (3508, 4024, OutsideSegment, Brake), // len: 516m - (4024, 4286, OutsideSegment, Coast), // len: 262m - (4286, 1e6, OutsideSegment, Accelerate)); + (0, 2182, OutsideSegment, Accelerate), // len: 2182m + (2182, 2464, OutsideSegment, Coast), // len: 282m + (2464, 3327, OutsideSegment, Accelerate), // len: 863m + (3327, 3575, OutsideSegment, Coast), // len: 248m + (3575, 3971, OutsideSegment, Brake), // len: 396m + (3971, 4233, OutsideSegment, Coast), // len: 262m + (4233, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_EcoRollWithoutEngineStop_CaseF_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (0, 2159, OutsideSegment, Accelerate), // len: 2159m - (2159, 2643, OutsideSegment, Coast), // len: 484m - (2643, 2818, OutsideSegment, Accelerate), // len: 175m - (2818, 3137, OutsideSegment, Coast), // len: 319m - (3137, 3329, OutsideSegment, Brake), // len: 192m - (3329, 3567, OutsideSegment, Coast), // len: 238m - (3567, 1e6, OutsideSegment, Accelerate)); + (0, 2194, OutsideSegment, Accelerate), // len: 2194m + (2194, 2499, OutsideSegment, Coast), // len: 305m + (2499, 2884, OutsideSegment, Accelerate), // len: 385m + (2884, 3450, OutsideSegment, Coast), // len: 566m + (3450, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_EcoRollWithoutEngineStop_CaseG_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (500, 5414, OutsideSegment, Accelerate), // len: 5414m - (5414, 5567, OutsideSegment, Coast), // len: 153m - (5567, 6817, OutsideSegment, Brake), // len: 1250m - (6817, 7352, OutsideSegment, Coast), // len: 535m - (7352, 1e6, OutsideSegment, Accelerate)); + (0, 5437, OutsideSegment, Accelerate), // len: 5437m + (5437, 5603, OutsideSegment, Coast), // len: 166m + (5603, 6564, OutsideSegment, Brake), // len: 961m + (6564, 7075, OutsideSegment, Coast), // len: 511m + (7075, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_EcoRollWithoutEngineStop_CaseH_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (500, 5227, OutsideSegment, Accelerate), // len: 5227m - (5227, 5522, OutsideSegment, Coast), // len: 295m - (5522, 6063, OutsideSegment, Brake), // len: 541m - (6063, 6289, OutsideSegment, Coast), // len: 226m - (6289, 1e6, OutsideSegment, Accelerate)); + (0, 5297, OutsideSegment, Accelerate), // len: 5297m + (5297, 5651, OutsideSegment, Coast), // len: 354m + (5651, 5987, OutsideSegment, Brake), // len: 336m + (5987, 6249, OutsideSegment, Coast), // len: 262m + (6249, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_EcoRollWithoutEngineStop_CaseI_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, @@ -1278,145 +914,94 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS [TestCase] public void Class5_EcoRollWithoutEngineStop_CaseJ_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (500, 4563, OutsideSegment, Accelerate), // len: 4472m - (4563, 4582, OutsideSegment, Roll), // len: 19m - (4582, 4709, OutsideSegment, Accelerate), // len: 127m - (4709, 4723, OutsideSegment, Roll), // len: 14m - (4723, 4789, OutsideSegment, Accelerate), // len: 66m - (4789, 4800, OutsideSegment, Roll), // len: 11m - (4800, 4866, OutsideSegment, Accelerate), // len: 66m - (4866, 4875, OutsideSegment, Roll), // len: 9m - (4875, 4931, OutsideSegment, Accelerate), // len: 56m - (4931, 4940, OutsideSegment, Roll), // len: 9m - (4940, 5028, OutsideSegment, Accelerate), // len: 88m - (5028, 5040, OutsideSegment, Roll), // len: 12m - (5040, 5079, OutsideSegment, Accelerate), // len: 39m - (5079, 5093, OutsideSegment, Roll), // len: 14m - (5093, 5131, OutsideSegment, Accelerate), // len: 38m - (5131, 5147, OutsideSegment, Roll), // len: 16m - (5147, 5444, OutsideSegment, Accelerate), // len: 297m - (5444, 5539, OutsideSegment, Coast), // len: 95m - (5539, 6116, OutsideSegment, Brake), // len: 577m - (6116, 6401, OutsideSegment, Coast), // len: 285m - (6401, 1e6, OutsideSegment, Accelerate)); + (0, 4563, OutsideSegment, Accelerate), // len: 4563m + (6400, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_EcoRollWithoutEngineStop_CrestCoast1_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - //(0, 0, OutsideSegment, Halt), // len: 0m - //(0, 4, OutsideSegment, Accelerate), // len: 4m - //(4, 6, OutsideSegment, Roll), // len: 2m - //(6, 15, OutsideSegment, Accelerate), // len: 9m - //(15, 20, OutsideSegment, Roll), // len: 5m - //(20, 35, OutsideSegment, Accelerate), // len: 15m - //(35, 42, OutsideSegment, Roll), // len: 7m - //(42, 71, OutsideSegment, Accelerate), // len: 29m - //(71, 81, OutsideSegment, Roll), // len: 10m - //(81, 139, OutsideSegment, Accelerate), // len: 58m - //(139, 153, OutsideSegment, Roll), // len: 14m - //(153, 242, OutsideSegment, Accelerate), // len: 89m - //(242, 258, OutsideSegment, Roll), // len: 16m - //(258, 392, OutsideSegment, Accelerate), // len: 134m - //(392, 411, OutsideSegment, Roll), // len: 19m - (500, 3406, OutsideSegment, Accelerate), // len: 2995m - (3406, 3870, OutsideSegment, Coast), // len: 464m - (3870, 5210, OutsideSegment, Brake), // len: 1340m - (5210, 5509, OutsideSegment, Coast), // len: 299m - (5509, 1e6, OutsideSegment, Accelerate)); + (500, 3804, OutsideSegment, Accelerate), // len: 3393m + (3804, 4533, OutsideSegment, Coast), // len: 729m + (4533, 5006, OutsideSegment, Brake), // len: 473m + (5006, 5413, OutsideSegment, Coast), // len: 407m + (5413, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_EcoRollWithoutEngineStop_CrestCoast2_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - //(0, 0, OutsideSegment, Halt), // len: 0m - //(0, 4, OutsideSegment, Accelerate), // len: 4m - //(4, 6, OutsideSegment, Roll), // len: 2m - //(6, 15, OutsideSegment, Accelerate), // len: 9m - //(15, 20, OutsideSegment, Roll), // len: 5m - //(20, 35, OutsideSegment, Accelerate), // len: 15m - //(35, 42, OutsideSegment, Roll), // len: 7m - //(42, 71, OutsideSegment, Accelerate), // len: 29m - //(71, 81, OutsideSegment, Roll), // len: 10m - //(81, 139, OutsideSegment, Accelerate), // len: 58m - //(139, 153, OutsideSegment, Roll), // len: 14m - //(153, 242, OutsideSegment, Accelerate), // len: 89m - //(242, 258, OutsideSegment, Roll), // len: 16m - //(258, 392, OutsideSegment, Accelerate), // len: 134m - //(392, 411, OutsideSegment, Roll), // len: 19m - (500, 3415, OutsideSegment, Accelerate), // len: 3004m - (3415, 3848, OutsideSegment, Coast), // len: 433m - (3848, 4513, OutsideSegment, Brake), // len: 665m - (4513, 4781, OutsideSegment, Coast), // len: 268m - (4781, 1e6, OutsideSegment, Accelerate)); + (500, 3609, OutsideSegment, Accelerate), // len: 3198m + (3609, 4202, OutsideSegment, Coast), // len: 593m + (4202, 4504, OutsideSegment, Brake), // len: 302m + (4504, 4722, OutsideSegment, Coast), // len: 218m + (4722, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_EcoRollEngineStop_CaseA_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (0, 5531, OutsideSegment, Accelerate), // len: 5531m - (5531, 6062, OutsideSegment, Coast), // len: 531m - (6062, 1e6, OutsideSegment, Accelerate)); + (0, 5612, OutsideSegment, Accelerate), // len: 5612m + (5612, 5916, OutsideSegment, Coast), // len: 304m + (5916, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_EcoRollEngineStop_CaseB_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (0, 5892, OutsideSegment, Accelerate), // len: 5892m - (5892, 6387, OutsideSegment, Coast), // len: 495m - (6387, 7481, OutsideSegment, Brake), // len: 1094m - (7481, 7874, OutsideSegment, Coast), // len: 393m - (7874, 1e6, OutsideSegment, Accelerate)); + (0, 6114, OutsideSegment, Accelerate), // len: 6114m + (6114, 6787, OutsideSegment, Coast), // len: 673m + (6787, 7255, OutsideSegment, Brake), // len: 468m + (7255, 7731, OutsideSegment, Coast), // len: 476m + (7731, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_EcoRollEngineStop_CaseC_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (0, 5367, OutsideSegment, Accelerate), // len: 5367m - (5367, 5685, OutsideSegment, Coast), // len: 318m - (5685, 7247, OutsideSegment, Brake), // len: 1562m - (7247, 7509, OutsideSegment, Coast), // len: 262m - (7509, 1e6, OutsideSegment, Accelerate)); + (0, 5461, OutsideSegment, Accelerate), // len: 5461m + (5461, 5802, OutsideSegment, Coast), // len: 341m + (5802, 7148, OutsideSegment, Brake), // len: 1346m + (7148, 7446, OutsideSegment, Coast), // len: 298m + (7446, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_EcoRollEngineStop_CaseD_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (0, 2124, OutsideSegment, Accelerate), // len: 2124m - (2124, 2265, OutsideSegment, Coast), // len: 141m - (2265, 2494, OutsideSegment, Brake), // len: 229m - (2494, 2613, OutsideSegment, Coast), // len: 119m - (2613, 5424, OutsideSegment, Accelerate), // len: 2811m - (5424, 5742, OutsideSegment, Coast), // len: 318m - (5742, 6776, OutsideSegment, Brake), // len: 1034m - (6776, 7026, OutsideSegment, Coast), // len: 250m - (7026, 1e6, OutsideSegment, Accelerate)); + (0, 2147, OutsideSegment, Accelerate), // len: 2147m + (2147, 2301, OutsideSegment, Coast), // len: 154m + (2301, 2481, OutsideSegment, Brake), // len: 180m + (2481, 2600, OutsideSegment, Coast), // len: 119m + (2600, 5516, OutsideSegment, Accelerate), // len: 2916m + (5516, 5870, OutsideSegment, Coast), // len: 354m + (5870, 6687, OutsideSegment, Brake), // len: 817m + (6687, 6973, OutsideSegment, Coast), // len: 286m + (6973, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_EcoRollEngineStop_CaseE_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (0, 2159, OutsideSegment, Accelerate), // len: 2159m - (2159, 2525, OutsideSegment, Coast), // len: 366m - (2525, 3284, OutsideSegment, Accelerate), // len: 759m - (3284, 3508, OutsideSegment, Coast), // len: 224m - (3508, 4024, OutsideSegment, Brake), // len: 516m - (4024, 4286, OutsideSegment, Coast), // len: 262m - (4286, 1e6, OutsideSegment, Accelerate)); + (0, 2182, OutsideSegment, Accelerate), // len: 2182m + (2182, 2464, OutsideSegment, Coast), // len: 282m + (2464, 3327, OutsideSegment, Accelerate), // len: 863m + (3327, 3575, OutsideSegment, Coast), // len: 248m + (3575, 3971, OutsideSegment, Brake), // len: 396m + (3971, 4233, OutsideSegment, Coast), // len: 262m + (4233, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_EcoRollEngineStop_CaseF_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (0, 2159, OutsideSegment, Accelerate), // len: 2159m - (2159, 2643, OutsideSegment, Coast), // len: 484m - (2643, 2818, OutsideSegment, Accelerate), // len: 175m - (2818, 3137, OutsideSegment, Coast), // len: 319m - (3137, 3329, OutsideSegment, Brake), // len: 192m - (3329, 3567, OutsideSegment, Coast), // len: 238m - (3567, 1e6, OutsideSegment, Accelerate)); + (0, 2194, OutsideSegment, Accelerate), // len: 2194m + (2194, 2499, OutsideSegment, Coast), // len: 305m + (2499, 2884, OutsideSegment, Accelerate), // len: 385m + (2884, 3450, OutsideSegment, Coast), // len: 566m + (3450, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_EcoRollEngineStop_CaseG_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (500, 5414, OutsideSegment, Accelerate), // len: 5414m - (5414, 5567, OutsideSegment, Coast), // len: 153m - (5567, 6817, OutsideSegment, Brake), // len: 1250m - (6817, 7352, OutsideSegment, Coast), // len: 535m - (7352, 1e6, OutsideSegment, Accelerate)); + (0, 5437, OutsideSegment, Accelerate), // len: 5437m + (5437, 5603, OutsideSegment, Coast), // len: 166m + (5603, 6564, OutsideSegment, Brake), // len: 961m + (6564, 7075, OutsideSegment, Coast), // len: 511m + (7075, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_EcoRollEngineStop_CaseH_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (500, 5227, OutsideSegment, Accelerate), // len: 5227m - (5227, 5522, OutsideSegment, Coast), // len: 295m - (5522, 6063, OutsideSegment, Brake), // len: 541m - (6063, 6289, OutsideSegment, Coast), // len: 226m - (6289, 1e6, OutsideSegment, Accelerate)); + (0, 5297, OutsideSegment, Accelerate), // len: 5297m + (5297, 5651, OutsideSegment, Coast), // len: 354m + (5651, 5987, OutsideSegment, Brake), // len: 336m + (5987, 6249, OutsideSegment, Coast), // len: 262m + (6249, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_EcoRollEngineStop_CaseI_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, @@ -1424,170 +1009,111 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS [TestCase] public void Class5_EcoRollEngineStop_CaseJ_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (500, 4563, OutsideSegment, Accelerate), // len: 4472m - (4563, 4582, OutsideSegment, Roll), // len: 19m - (4582, 4709, OutsideSegment, Accelerate), // len: 127m - (4709, 4723, OutsideSegment, Roll), // len: 14m - (4723, 4789, OutsideSegment, Accelerate), // len: 66m - (4789, 4800, OutsideSegment, Roll), // len: 11m - (4800, 4866, OutsideSegment, Accelerate), // len: 66m - (4866, 4875, OutsideSegment, Roll), // len: 9m - (4875, 4931, OutsideSegment, Accelerate), // len: 56m - (4931, 4940, OutsideSegment, Roll), // len: 9m - (4940, 5028, OutsideSegment, Accelerate), // len: 88m - (5028, 5040, OutsideSegment, Roll), // len: 12m - (5040, 5079, OutsideSegment, Accelerate), // len: 39m - (5079, 5093, OutsideSegment, Roll), // len: 14m - (5093, 5131, OutsideSegment, Accelerate), // len: 38m - (5131, 5147, OutsideSegment, Roll), // len: 16m - (5147, 5444, OutsideSegment, Accelerate), // len: 297m - (5444, 5539, OutsideSegment, Coast), // len: 95m - (5539, 6116, OutsideSegment, Brake), // len: 577m - (6116, 6401, OutsideSegment, Coast), // len: 285m - (6401, 1e6, OutsideSegment, Accelerate)); + (0, 4563, OutsideSegment, Accelerate), // len: 4563m + (5146, 5443, OutsideSegment, Accelerate), // len: 297m + (5443, 5538, OutsideSegment, Coast), // len: 95m + (5538, 6115, OutsideSegment, Brake), // len: 577m + (6115, 6400, OutsideSegment, Coast), // len: 285m + (6400, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_EcoRollEngineStop_CrestCoast1_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - //(0, 0, OutsideSegment, Halt), // len: 0m - //(0, 4, OutsideSegment, Accelerate), // len: 4m - //(4, 6, OutsideSegment, Roll), // len: 2m - //(6, 15, OutsideSegment, Accelerate), // len: 9m - //(15, 20, OutsideSegment, Roll), // len: 5m - //(20, 35, OutsideSegment, Accelerate), // len: 15m - //(35, 42, OutsideSegment, Roll), // len: 7m - //(42, 71, OutsideSegment, Accelerate), // len: 29m - //(71, 81, OutsideSegment, Roll), // len: 10m - //(81, 139, OutsideSegment, Accelerate), // len: 58m - //(139, 153, OutsideSegment, Roll), // len: 14m - //(153, 242, OutsideSegment, Accelerate), // len: 89m - //(242, 258, OutsideSegment, Roll), // len: 16m - //(258, 392, OutsideSegment, Accelerate), // len: 134m - //(392, 411, OutsideSegment, Roll), // len: 19m - (500, 3406, OutsideSegment, Accelerate), // len: 2995m - (3406, 3870, OutsideSegment, Coast), // len: 464m - (3870, 5210, OutsideSegment, Brake), // len: 1340m - (5210, 5509, OutsideSegment, Coast), // len: 299m - (5509, 1e6, OutsideSegment, Accelerate)); + (500, 3804, OutsideSegment, Accelerate), // len: 3393m + (3804, 4533, OutsideSegment, Coast), // len: 729m + (4533, 5006, OutsideSegment, Brake), // len: 473m + (5006, 5413, OutsideSegment, Coast), // len: 407m + (5413, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_EcoRollEngineStop_CrestCoast2_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - //(0, 0, OutsideSegment, Halt), // len: 0m - //(0, 4, OutsideSegment, Accelerate), // len: 4m - //(4, 6, OutsideSegment, Roll), // len: 2m - //(6, 15, OutsideSegment, Accelerate), // len: 9m - //(15, 20, OutsideSegment, Roll), // len: 5m - //(20, 35, OutsideSegment, Accelerate), // len: 15m - //(35, 42, OutsideSegment, Roll), // len: 7m - //(42, 71, OutsideSegment, Accelerate), // len: 29m - //(71, 81, OutsideSegment, Roll), // len: 10m - //(81, 139, OutsideSegment, Accelerate), // len: 58m - //(139, 153, OutsideSegment, Roll), // len: 14m - //(153, 242, OutsideSegment, Accelerate), // len: 89m - //(242, 258, OutsideSegment, Roll), // len: 16m - //(258, 392, OutsideSegment, Accelerate), // len: 134m - //(392, 411, OutsideSegment, Roll), // len: 19m - (500, 3415, OutsideSegment, Accelerate), // len: 3004m - (3415, 3848, OutsideSegment, Coast), // len: 433m - (3848, 4513, OutsideSegment, Brake), // len: 665m - (4513, 4781, OutsideSegment, Coast), // len: 268m - (4781, 1e6, OutsideSegment, Accelerate)); + (500, 3609, OutsideSegment, Accelerate), // len: 3198m + (3609, 4202, OutsideSegment, Coast), // len: 593m + (4202, 4504, OutsideSegment, Brake), // len: 302m + (4504, 4722, OutsideSegment, Coast), // len: 218m + (4722, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123EcoRollWithoutEngineStop_CaseA_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 4130, OutsideSegment, Accelerate), // len: 4130m (4130, 5472, WithinSegment, Accelerate), // len: 1342m - (5472, 5765, UseCase1, Coast), // len: 293m - (5765, 5812, WithinSegment, Coast), // len: 47m - (5812, 6037, OutsideSegment, Coast), // len: 225m - (6037, 1e6, OutsideSegment, Accelerate)); + (5472, 5809, UseCase1, Coast), // len: 337m + (5809, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123EcoRollWithoutEngineStop_CaseB_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 4655, OutsideSegment, Accelerate), // len: 4655m (4655, 5496, WithinSegment, Accelerate), // len: 841m - (5496, 6461, UseCase1, Coast), // len: 965m - (6461, 6872, WithinSegment, Coast), // len: 411m - (6872, 7256, WithinSegment, Brake), // len: 384m - (7256, 7466, OutsideSegment, Brake), // len: 210m - (7466, 8025, OutsideSegment, Coast), // len: 559m - (8025, 1e6, OutsideSegment, Accelerate)); + (5496, 7252, UseCase1, Coast), // len: 1756m + (7252, 7486, OutsideSegment, Coast), // len: 234m + (7486, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123EcoRollWithoutEngineStop_CaseC_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 3979, OutsideSegment, Accelerate), // len: 3979m (3979, 4936, WithinSegment, Accelerate), // len: 957m - (4936, 5878, UseCase1, Coast), // len: 942m - (5878, 6047, WithinSegment, Coast), // len: 169m - (6047, 7160, WithinSegment, Brake), // len: 1113m - (7160, 7234, OutsideSegment, Brake), // len: 74m - (7234, 7658, OutsideSegment, Coast), // len: 424m - (7658, 1e6, OutsideSegment, Accelerate)); + (4936, 6104, UseCase1, Coast), // len: 1168m + (6104, 6298, WithinSegment, Coast), // len: 194m + (6298, 7139, WithinSegment, Brake), // len: 841m + (7139, 7151, WithinSegment, Coast), // len: 12m + (7151, 7563, OutsideSegment, Coast), // len: 412m + (7563, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123EcoRollWithoutEngineStop_CaseD_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 654, OutsideSegment, Accelerate), // len: 654m (654, 1902, WithinSegment, Accelerate), // len: 1248m - (1902, 2378, UseCase1, Coast), // len: 476m - (2378, 2486, WithinSegment, Coast), // len: 108m - (2486, 2629, OutsideSegment, Coast), // len: 143m - (2629, 4041, OutsideSegment, Accelerate), // len: 1412m - (4041, 4951, WithinSegment, Accelerate), // len: 910m - (4951, 5939, UseCase1, Coast), // len: 988m - (5939, 6145, WithinSegment, Coast), // len: 206m - (6145, 6689, WithinSegment, Brake), // len: 544m - (6689, 6763, OutsideSegment, Brake), // len: 74m - (6763, 7152, OutsideSegment, Coast), // len: 389m - (7152, 1e6, OutsideSegment, Accelerate)); + (1902, 2487, UseCase1, Coast), // len: 585m + (2487, 2511, OutsideSegment, Coast), // len: 24m + (2511, 4039, OutsideSegment, Accelerate), // len: 1528m + (4039, 4961, WithinSegment, Accelerate), // len: 922m + (4961, 6211, UseCase1, Coast), // len: 1250m + (6211, 6624, WithinSegment, Coast), // len: 413m + (6624, 6673, WithinSegment, Brake), // len: 49m + (6673, 6686, WithinSegment, Coast), // len: 13m + (6686, 7086, OutsideSegment, Coast), // len: 400m + (7086, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123EcoRollWithoutEngineStop_CaseE_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 689, OutsideSegment, Accelerate), // len: 689m (689, 2077, WithinSegment, Accelerate), // len: 1388m - (2077, 2345, UseCase1, Coast), // len: 268m - (2345, 2499, WithinSegment, Coast), // len: 154m - (2499, 2989, WithinSegment, Accelerate), // len: 490m - (2989, 3694, UseCase1, Coast), // len: 705m - (3694, 3900, WithinSegment, Coast), // len: 206m - (3900, 3974, WithinSegment, Brake), // len: 74m - (3974, 4023, OutsideSegment, Brake), // len: 49m - (4023, 4435, OutsideSegment, Coast), // len: 412m - (4435, 1e6, OutsideSegment, Accelerate)); + (2077, 2378, UseCase1, Coast), // len: 301m + (2378, 2996, WithinSegment, Accelerate), // len: 618m + (2996, 3875, UseCase1, Coast), // len: 879m + (3875, 3970, WithinSegment, Coast), // len: 95m + (3970, 4170, OutsideSegment, Coast), // len: 200m + (4170, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123EcoRollWithoutEngineStop_CaseF_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 700, OutsideSegment, Accelerate), // len: 700m (700, 2089, WithinSegment, Accelerate), // len: 1389m - (2089, 2346, UseCase1, Coast), // len: 257m - (2346, 2605, WithinSegment, Coast), // len: 259m - (2605, 2652, WithinSegment, Accelerate), // len: 47m - (2652, 3093, UseCase1, Coast), // len: 441m - (3093, 3272, WithinSegment, Coast), // len: 179m - (3272, 3571, OutsideSegment, Coast), // len: 299m - (3571, 1e6, OutsideSegment, Accelerate)); + (2089, 2390, UseCase1, Coast), // len: 301m + (2390, 2647, WithinSegment, Accelerate), // len: 257m + (2647, 3267, UseCase1, Coast), // len: 620m + (3267, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123EcoRollWithoutEngineStop_CaseG_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (500, 3944, OutsideSegment, Accelerate), // len: 3944m (3944, 5099, WithinSegment, Accelerate), // len: 1155m - (5099, 5728, UseCase1, Coast), // len: 629m - (5728, 5922, WithinSegment, Coast), // len: 194m - (5922, 6564, WithinSegment, Brake), // len: 642m - (6564, 6787, OutsideSegment, Brake), // len: 223m - (6787, 7539, OutsideSegment, Coast), // len: 752m - (7539, 1e6, OutsideSegment, Accelerate)); + (5099, 5901, UseCase1, Coast), // len: 802m + (5901, 6339, WithinSegment, Coast), // len: 438m + (6339, 6537, WithinSegment, Brake), // len: 198m + (6537, 6561, WithinSegment, Coast), // len: 24m + (6561, 7288, OutsideSegment, Coast), // len: 727m + (7288, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123EcoRollWithoutEngineStop_CaseH_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (500, 3815, OutsideSegment, Accelerate), // len: 3815m (3815, 4854, WithinSegment, Accelerate), // len: 1039m - (4854, 5661, UseCase1, Coast), // len: 807m - (5661, 5988, WithinSegment, Coast), // len: 327m - (5988, 6401, OutsideSegment, Coast), // len: 413m - (6401, 1e6, OutsideSegment, Accelerate)); + (4854, 5987, UseCase1, Coast), // len: 1133m + (5987, 1e6, OutsideSegment, Accelerate)); [TestCase] @@ -1596,174 +1122,115 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS [TestCase] public void Class5_PCC123EcoRollWithoutEngineStop_CaseJ_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (500, 3559, OutsideSegment, Accelerate), // len: 3559m - (3559, 4563, WithinSegment, Accelerate), // len: 913m - (4563, 4582, WithinSegment, Roll), // len: 19m - (4582, 4709, WithinSegment, Accelerate), // len: 127m - (4709, 4723, WithinSegment, Roll), // len: 14m - (4723, 4789, WithinSegment, Accelerate), // len: 66m - (4789, 4800, WithinSegment, Roll), // len: 11m - (4800, 4866, WithinSegment, Accelerate), // len: 66m - (4866, 4875, WithinSegment, Roll), // len: 9m - (4875, 4931, WithinSegment, Accelerate), // len: 56m - (4931, 4940, WithinSegment, Roll), // len: 9m - (4940, 5028, WithinSegment, Accelerate), // len: 88m - (5028, 5040, WithinSegment, Roll), // len: 12m - (5040, 5079, WithinSegment, Accelerate), // len: 39m - (5079, 5093, WithinSegment, Roll), // len: 14m - (5093, 5131, WithinSegment, Accelerate), // len: 38m - (5131, 5147, WithinSegment, Roll), // len: 16m - (5147, 5343, WithinSegment, Accelerate), // len: 196m - (5343, 5614, UseCase2, Coast), // len: 271m - (5614, 5771, WithinSegment, Coast), // len: 157m - (5771, 6117, WithinSegment, Brake), // len: 346m - (6117, 6191, OutsideSegment, Brake), // len: 74m - (6191, 6591, OutsideSegment, Coast), // len: 400m - (6591, 1e6, OutsideSegment, Accelerate)); + (0, 3559, OutsideSegment, Accelerate), // len: 3559m + (3559, 4500, WithinSegment, Accelerate), // len: 1004m + (5146, 5342, WithinSegment, Accelerate), // len: 196m + (5342, 5669, UseCase2, Coast), // len: 327m + (5669, 5923, WithinSegment, Coast), // len: 254m + (5923, 6109, WithinSegment, Brake), // len: 186m + (6109, 6121, WithinSegment, Coast), // len: 12m + (6121, 6509, OutsideSegment, Coast), // len: 388m + (6509, 1e6, OutsideSegment, Accelerate)); + [TestCase] public void Class5_PCC123EcoRollWithoutEngineStop_CrestCoast1_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - //(0, 0, OutsideSegment, Halt), // len: 0m - //(0, 4, OutsideSegment, Accelerate), // len: 4m - //(4, 6, OutsideSegment, Roll), // len: 2m - //(6, 15, OutsideSegment, Accelerate), // len: 9m - //(15, 20, OutsideSegment, Roll), // len: 5m - //(20, 35, OutsideSegment, Accelerate), // len: 15m - //(35, 42, OutsideSegment, Roll), // len: 7m - //(42, 71, OutsideSegment, Accelerate), // len: 29m - //(71, 81, OutsideSegment, Roll), // len: 10m - //(81, 139, OutsideSegment, Accelerate), // len: 58m - //(139, 153, OutsideSegment, Roll), // len: 14m - //(153, 242, OutsideSegment, Accelerate), // len: 89m - //(242, 258, OutsideSegment, Roll), // len: 16m - //(258, 392, OutsideSegment, Accelerate), // len: 134m - //(392, 411, OutsideSegment, Roll), // len: 19m - (500, 3406, OutsideSegment, Accelerate), // len: 2995m - (3406, 3870, OutsideSegment, Coast), // len: 464m - (3870, 5210, OutsideSegment, Brake), // len: 1340m - (5210, 5509, OutsideSegment, Coast), // len: 299m - (5509, 1e6, OutsideSegment, Accelerate)); + (500, 3804, OutsideSegment, Accelerate), // len: 3393m + (3804, 4533, OutsideSegment, Coast), // len: 729m + (4533, 5006, OutsideSegment, Brake), // len: 473m + (5006, 5413, OutsideSegment, Coast), // len: 407m + (5413, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123EcoRollWithoutEngineStop_CrestCoast2_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - //(0, 0, OutsideSegment, Halt), // len: 0m - //(0, 4, OutsideSegment, Accelerate), // len: 4m - //(4, 6, OutsideSegment, Roll), // len: 2m - //(6, 15, OutsideSegment, Accelerate), // len: 9m - //(15, 20, OutsideSegment, Roll), // len: 5m - //(20, 35, OutsideSegment, Accelerate), // len: 15m - //(35, 42, OutsideSegment, Roll), // len: 7m - //(42, 71, OutsideSegment, Accelerate), // len: 29m - //(71, 81, OutsideSegment, Roll), // len: 10m - //(81, 139, OutsideSegment, Accelerate), // len: 58m - //(139, 153, OutsideSegment, Roll), // len: 14m - //(153, 242, OutsideSegment, Accelerate), // len: 89m - //(242, 258, OutsideSegment, Roll), // len: 16m - //(258, 392, OutsideSegment, Accelerate), // len: 134m - //(392, 411, OutsideSegment, Roll), // len: 19m - (500, 3415, OutsideSegment, Accelerate), // len: 3004m - (3415, 3848, OutsideSegment, Coast), // len: 433m - (3848, 4513, OutsideSegment, Brake), // len: 665m - (4513, 4781, OutsideSegment, Coast), // len: 268m - (4781, 1e6, OutsideSegment, Accelerate)); - - + (500, 3609, OutsideSegment, Accelerate), // len: 3198m + (3609, 4202, OutsideSegment, Coast), // len: 593m + (4202, 4504, OutsideSegment, Brake), // len: 302m + (4504, 4722, OutsideSegment, Coast), // len: 218m + (4722, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123EcoRollEngineStop_CaseA_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 4130, OutsideSegment, Accelerate), // len: 4130m (4130, 5472, WithinSegment, Accelerate), // len: 1342m - (5472, 5765, UseCase1, Coast), // len: 293m - (5765, 5812, WithinSegment, Coast), // len: 47m - (5812, 6037, OutsideSegment, Coast), // len: 225m - (6037, 1e6, OutsideSegment, Accelerate)); + (5472, 5809, UseCase1, Coast), // len: 337m + (5809, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123EcoRollEngineStop_CaseB_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 4655, OutsideSegment, Accelerate), // len: 4655m (4655, 5496, WithinSegment, Accelerate), // len: 841m - (5496, 6461, UseCase1, Coast), // len: 965m - (6461, 6872, WithinSegment, Coast), // len: 411m - (6872, 7256, WithinSegment, Brake), // len: 384m - (7256, 7466, OutsideSegment, Brake), // len: 210m - (7466, 8025, OutsideSegment, Coast), // len: 559m - (8025, 1e6, OutsideSegment, Accelerate)); + (5496, 7252, UseCase1, Coast), // len: 1756m + (7252, 7486, OutsideSegment, Coast), // len: 234m + (7486, 1e6, OutsideSegment, Accelerate)); + [TestCase] public void Class5_PCC123EcoRollEngineStop_CaseC_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 3979, OutsideSegment, Accelerate), // len: 3979m (3979, 4936, WithinSegment, Accelerate), // len: 957m - (4936, 5878, UseCase1, Coast), // len: 942m - (5878, 6047, WithinSegment, Coast), // len: 169m - (6047, 7160, WithinSegment, Brake), // len: 1113m - (7160, 7234, OutsideSegment, Brake), // len: 74m - (7234, 7658, OutsideSegment, Coast), // len: 424m - (7658, 1e6, OutsideSegment, Accelerate)); + (4936, 6104, UseCase1, Coast), // len: 1168m + (6104, 6298, WithinSegment, Coast), // len: 194m + (6298, 7139, WithinSegment, Brake), // len: 841m + (7139, 7151, WithinSegment, Coast), // len: 12m + (7151, 7563, OutsideSegment, Coast), // len: 412m + (7563, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123EcoRollEngineStop_CaseD_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 654, OutsideSegment, Accelerate), // len: 654m (654, 1902, WithinSegment, Accelerate), // len: 1248m - (1902, 2378, UseCase1, Coast), // len: 476m - (2378, 2486, WithinSegment, Coast), // len: 108m - (2486, 2629, OutsideSegment, Coast), // len: 143m - (2629, 4041, OutsideSegment, Accelerate), // len: 1412m - (4041, 4951, WithinSegment, Accelerate), // len: 910m - (4951, 5939, UseCase1, Coast), // len: 988m - (5939, 6145, WithinSegment, Coast), // len: 206m - (6145, 6689, WithinSegment, Brake), // len: 544m - (6689, 6763, OutsideSegment, Brake), // len: 74m - (6763, 7152, OutsideSegment, Coast), // len: 389m - (7152, 1e6, OutsideSegment, Accelerate)); + (1902, 2487, UseCase1, Coast), // len: 585m + (2487, 2511, OutsideSegment, Coast), // len: 24m + (2511, 4039, OutsideSegment, Accelerate), // len: 1528m + (4039, 4961, WithinSegment, Accelerate), // len: 922m + (4961, 6211, UseCase1, Coast), // len: 1250m + (6211, 6624, WithinSegment, Coast), // len: 413m + (6624, 6673, WithinSegment, Brake), // len: 49m + (6673, 6686, WithinSegment, Coast), // len: 13m + (6686, 7086, OutsideSegment, Coast), // len: 400m + (7086, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123EcoRollEngineStop_CaseE_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 689, OutsideSegment, Accelerate), // len: 689m (689, 2077, WithinSegment, Accelerate), // len: 1388m - (2077, 2345, UseCase1, Coast), // len: 268m - (2345, 2499, WithinSegment, Coast), // len: 154m - (2499, 2989, WithinSegment, Accelerate), // len: 490m - (2989, 3694, UseCase1, Coast), // len: 705m - (3694, 3900, WithinSegment, Coast), // len: 206m - (3900, 3974, WithinSegment, Brake), // len: 74m - (3974, 4023, OutsideSegment, Brake), // len: 49m - (4023, 4435, OutsideSegment, Coast), // len: 412m - (4435, 1e6, OutsideSegment, Accelerate)); + (2077, 2378, UseCase1, Coast), // len: 301m + (2378, 2996, WithinSegment, Accelerate), // len: 618m + (2996, 3875, UseCase1, Coast), // len: 879m + (3875, 3970, WithinSegment, Coast), // len: 95m + (3970, 4170, OutsideSegment, Coast), // len: 200m + (4170, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123EcoRollEngineStop_CaseF_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, (0, 700, OutsideSegment, Accelerate), // len: 700m (700, 2089, WithinSegment, Accelerate), // len: 1389m - (2089, 2346, UseCase1, Coast), // len: 257m - (2346, 2605, WithinSegment, Coast), // len: 259m - (2605, 2652, WithinSegment, Accelerate), // len: 47m - (2652, 3093, UseCase1, Coast), // len: 441m - (3093, 3272, WithinSegment, Coast), // len: 179m - (3272, 3571, OutsideSegment, Coast), // len: 299m - (3571, 1e6, OutsideSegment, Accelerate)); + (2089, 2390, UseCase1, Coast), // len: 301m + (2390, 2647, WithinSegment, Accelerate), // len: 257m + (2647, 3267, UseCase1, Coast), // len: 620m + (3267, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123EcoRollEngineStop_CaseG_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (500, 3944, OutsideSegment, Accelerate), // len: 3944m + (0, 3944, OutsideSegment, Accelerate), // len: 3944m (3944, 5099, WithinSegment, Accelerate), // len: 1155m - (5099, 5728, UseCase1, Coast), // len: 629m - (5728, 5922, WithinSegment, Coast), // len: 194m - (5922, 6564, WithinSegment, Brake), // len: 642m - (6564, 6787, OutsideSegment, Brake), // len: 223m - (6787, 7539, OutsideSegment, Coast), // len: 752m - (7539, 1e6, OutsideSegment, Accelerate)); + (5099, 5901, UseCase1, Coast), // len: 802m + (5901, 6339, WithinSegment, Coast), // len: 438m + (6339, 6537, WithinSegment, Brake), // len: 198m + (6537, 6561, WithinSegment, Coast), // len: 24m + (6561, 7288, OutsideSegment, Coast), // len: 727m + (7288, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123EcoRollEngineStop_CaseH_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (500, 3815, OutsideSegment, Accelerate), // len: 3815m + (0, 3815, OutsideSegment, Accelerate), // len: 3815m (3815, 4854, WithinSegment, Accelerate), // len: 1039m - (4854, 5661, UseCase1, Coast), // len: 807m - (5661, 5988, WithinSegment, Coast), // len: 327m - (5988, 6401, OutsideSegment, Coast), // len: 413m - (6401, 1e6, OutsideSegment, Accelerate)); + (4854, 5987, UseCase1, Coast), // len: 1133m + (5987, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123EcoRollEngineStop_CaseI_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, @@ -1771,79 +1238,34 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS [TestCase] public void Class5_PCC123EcoRollEngineStop_CaseJ_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - (500, 3559, OutsideSegment, Accelerate), // len: 3559m + (0, 3559, OutsideSegment, Accelerate), // len: 3559m (3559, 4563, WithinSegment, Accelerate), // len: 1004m - (4563, 4582, WithinSegment, Roll), // len: 19m - (4582, 4709, WithinSegment, Accelerate), // len: 127m - (4709, 4723, WithinSegment, Roll), // len: 14m - (4723, 4789, WithinSegment, Accelerate), // len: 66m - (4789, 4800, WithinSegment, Roll), // len: 11m - (4800, 4866, WithinSegment, Accelerate), // len: 66m - (4866, 4875, WithinSegment, Roll), // len: 9m - (4875, 4931, WithinSegment, Accelerate), // len: 56m - (4931, 4940, WithinSegment, Roll), // len: 9m - (4940, 5028, WithinSegment, Accelerate), // len: 88m - (5028, 5040, WithinSegment, Roll), // len: 12m - (5040, 5079, WithinSegment, Accelerate), // len: 39m - (5079, 5093, WithinSegment, Roll), // len: 14m - (5093, 5131, WithinSegment, Accelerate), // len: 38m - (5131, 5147, WithinSegment, Roll), // len: 16m - (5147, 5343, WithinSegment, Accelerate), // len: 196m - (5343, 5614, UseCase2, Coast), // len: 271m - (5614, 5771, WithinSegment, Coast), // len: 157m - (5771, 6117, WithinSegment, Brake), // len: 346m - (6117, 6191, OutsideSegment, Brake), // len: 74m - (6191, 6591, OutsideSegment, Coast), // len: 400m - (6591, 1e6, OutsideSegment, Accelerate)); + (5146, 5342, WithinSegment, Accelerate), // len: 196m + (5342, 5669, UseCase2, Coast), // len: 327m + (5669, 5923, WithinSegment, Coast), // len: 254m + (5923, 6109, WithinSegment, Brake), // len: 186m + (6109, 6121, WithinSegment, Coast), // len: 12m + (6121, 6509, OutsideSegment, Coast), // len: 388m + (6509, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123EcoRollEngineStop_CrestCoast1_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - //(0, 0, OutsideSegment, Halt), // len: 0m - //(0, 4, OutsideSegment, Accelerate), // len: 4m - //(4, 6, OutsideSegment, Roll), // len: 2m - //(6, 15, OutsideSegment, Accelerate), // len: 9m - //(15, 20, OutsideSegment, Roll), // len: 5m - //(20, 35, OutsideSegment, Accelerate), // len: 15m - //(35, 42, OutsideSegment, Roll), // len: 7m - //(42, 71, OutsideSegment, Accelerate), // len: 29m - //(71, 81, OutsideSegment, Roll), // len: 10m - //(81, 139, OutsideSegment, Accelerate), // len: 58m - //(139, 153, OutsideSegment, Roll), // len: 14m - //(153, 242, OutsideSegment, Accelerate), // len: 89m - //(242, 258, OutsideSegment, Roll), // len: 16m - //(258, 392, OutsideSegment, Accelerate), // len: 134m - //(392, 411, OutsideSegment, Roll), // len: 19m - (500, 3406, OutsideSegment, Accelerate), // len: 2995m - (3406, 3870, OutsideSegment, Coast), // len: 464m - (3870, 5210, OutsideSegment, Brake), // len: 1340m - (5210, 5509, OutsideSegment, Coast), // len: 299m - (5509, 1e6, OutsideSegment, Accelerate)); + (500, 3804, OutsideSegment, Accelerate), // len: 3393m + (3804, 4533, OutsideSegment, Coast), // len: 729m + (4533, 5006, OutsideSegment, Brake), // len: 473m + (5006, 5413, OutsideSegment, Coast), // len: 407m + (5413, 1e6, OutsideSegment, Accelerate)); [TestCase] public void Class5_PCC123EcoRollEngineStop_CrestCoast2_HEV() => TestPCC(MethodBase.GetCurrentMethod().Name, - //(0, 0, OutsideSegment, Halt), // len: 0m - //(0, 4, OutsideSegment, Accelerate), // len: 4m - //(4, 6, OutsideSegment, Roll), // len: 2m - //(6, 15, OutsideSegment, Accelerate), // len: 9m - //(15, 20, OutsideSegment, Roll), // len: 5m - //(20, 35, OutsideSegment, Accelerate), // len: 15m - //(35, 42, OutsideSegment, Roll), // len: 7m - //(42, 71, OutsideSegment, Accelerate), // len: 29m - //(71, 81, OutsideSegment, Roll), // len: 10m - //(81, 139, OutsideSegment, Accelerate), // len: 58m - //(139, 153, OutsideSegment, Roll), // len: 14m - //(153, 242, OutsideSegment, Accelerate), // len: 89m - //(242, 258, OutsideSegment, Roll), // len: 16m - //(258, 392, OutsideSegment, Accelerate), // len: 134m - //(392, 411, OutsideSegment, Roll), // len: 19m - (500, 3415, OutsideSegment, Accelerate), // len: 3004m - (3415, 3848, OutsideSegment, Coast), // len: 433m - (3848, 4513, OutsideSegment, Brake), // len: 665m - (4513, 4781, OutsideSegment, Coast), // len: 268m - (4781, 1e6, OutsideSegment, Accelerate)); + (500, 3609, OutsideSegment, Accelerate), // len: 3198m + (3609, 4202, OutsideSegment, Coast), // len: 593m + (4202, 4504, OutsideSegment, Brake), // len: 302m + (4504, 4722, OutsideSegment, Coast), // len: 218m + (4722, 1e6, OutsideSegment, Accelerate)); diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/AMT_12.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/AMT_12.vgbx new file mode 100644 index 0000000000000000000000000000000000000000..cf2f7f44882ca5122a2f1d818926fecbcf2576a3 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/AMT_12.vgbx @@ -0,0 +1,117 @@ +{ + "Header": { + "CreatedBy": "", + "Date": "2021-06-15T14:36:23.3474902Z", + "AppVersion": "3", + "FileVersion": 6 + }, + "Body": { + "SavedInDeclMode": false, + "ModelName": "tractor_12gear_example", + "Inertia": 0.0, + "TracInt": 1.0, + "Gears": [ + { + "Ratio": 2.7, + "LossMap": "Axle_4x2_LH.vtlm" + }, + { + "Ratio": 12.33, + "LossMap": "Gear_indirect.vtlm", + "ShiftPolygon": "", + "MaxTorque": "", + "MaxSpeed": "" + }, + { + "Ratio": 9.59, + "LossMap": "Gear_indirect.vtlm", + "ShiftPolygon": "", + "MaxTorque": "", + "MaxSpeed": "" + }, + { + "Ratio": 7.44, + "LossMap": "Gear_indirect.vtlm", + "ShiftPolygon": "", + "MaxTorque": "", + "MaxSpeed": "" + }, + { + "Ratio": 5.78, + "LossMap": "Gear_indirect.vtlm", + "ShiftPolygon": "", + "MaxTorque": "", + "MaxSpeed": "" + }, + { + "Ratio": 4.57, + "LossMap": "Gear_indirect.vtlm", + "ShiftPolygon": "", + "MaxTorque": "", + "MaxSpeed": "" + }, + { + "Ratio": 3.55, + "LossMap": "Gear_indirect.vtlm", + "ShiftPolygon": "", + "MaxTorque": "", + "MaxSpeed": "" + }, + { + "Ratio": 2.70, + "LossMap": "Gear_indirect.vtlm", + "ShiftPolygon": "", + "MaxTorque": "", + "MaxSpeed": "" + }, + { + "Ratio": 2.1, + "LossMap": "Gear_indirect.vtlm", + "ShiftPolygon": "", + "MaxTorque": "", + "MaxSpeed": "" + }, + { + "Ratio": 1.63, + "LossMap": "Gear_indirect.vtlm", + "ShiftPolygon": "", + "MaxTorque": "", + "MaxSpeed": "" + }, + { + "Ratio": 1.27, + "LossMap": "Gear_indirect.vtlm", + "ShiftPolygon": "", + "MaxTorque": "", + "MaxSpeed": "" + }, + { + "Ratio": 1.0, + "LossMap": "Gear_direct.vtlm", + "ShiftPolygon": "", + "MaxTorque": "", + "MaxSpeed": "" + }, + { + "Ratio": 0.78, + "LossMap": "Gear_indirect.vtlm", + "ShiftPolygon": "", + "MaxTorque": "", + "MaxSpeed": "" + } + ], + "TqReserve": 20.0, + "ShiftTime": 2.0, + "StartTqReserve": 20.0, + "StartSpeed": 2.0, + "StartAcc": 0.6, + "GearboxType": "AMT", + "TorqueConverter": { + "Enabled": false + }, + "DownshiftAfterUpshiftDelay": 6, + "UpshiftAfterDownshiftDelay": 6, + "UpshiftMinAcceleration": 0.1, + "PowershiftShiftTime": 0.8 + } +} \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Axle_4x2_LH.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Axle_4x2_LH.vtlm new file mode 100644 index 0000000000000000000000000000000000000000..6b2e07e765296de3803c71694f65e7a793adcbe4 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Axle_4x2_LH.vtlm @@ -0,0 +1,11 @@ +Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm] +0,-50000,1500 +0,-200,6 +0,0,6 +0,200,6 +0,50000,1500 +5000,-50000,1500 +5000,-1253,37.5 +5000,0,37.5 +5000,1253,37.5 +5000,50000,1500 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Bus.vacc b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Bus.vacc new file mode 100644 index 0000000000000000000000000000000000000000..9caf98a39324b3bbfba3b433b2023ace42de4e77 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Bus.vacc @@ -0,0 +1,15 @@ +v [km/h] , acc [m/s�] , dec [m/s�] +0 , 0.88 , -0.94 +10 , 1.00 , -0.94 +13 , 1.00 , -0.94 +20 , 1.00 , -0.88 +30 , 0.97 , -0.81 +40 , 0.80 , -0.73 +50 , 0.63 , -0.66 +58 , 0.50 , -0.52 +60 , 0.46 , -0.50 +70 , 0.39 , -0.50 +80 , 0.39 , -0.50 +90 , 0.39 , -0.50 +100 , 0.39 , -0.50 +120 , 0.39 , -0.50 \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/DEFAULT_2-Cylinder_2-Stage_398ccm.ACMP b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/DEFAULT_2-Cylinder_2-Stage_398ccm.ACMP new file mode 100644 index 0000000000000000000000000000000000000000..57420d82a62b58b211e01598c0aeca71a74a6cb2 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/DEFAULT_2-Cylinder_2-Stage_398ccm.ACMP @@ -0,0 +1,10 @@ +rpm,flowRate [l/min],power on [W],power off [W] +800,209.7130243,2079,160.5 +1200,348.3681702,3160.5,342.4 +1600,411.2603567,4315.5,604.55 +2000,520.8333333,5901,963 +2400,598.4042553,6961.5,1433.8 +2550,618.1318681,7360.5,1637.1 +2800,655.1473124,8127,1968.8 +3200,806.2234795,10043.25,2755.25 +3600,857.9169175,11571,3702.2 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/DRIVER_truck.vacc b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/DRIVER_truck.vacc new file mode 100644 index 0000000000000000000000000000000000000000..ee0222b5f070174eb7d04119b24e793ce8e36095 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/DRIVER_truck.vacc @@ -0,0 +1,22 @@ +v,Acc,Dec +0,1,-1 +5,1,-1 +10,1,-1 +15,1,-1 +20,1,-1 +25,1,-1 +30,0.93,-1 +35,0.86,-1 +40,0.79,-1 +45,0.71,-1 +50,0.64,-1 +55,0.57,-0.75 +60,0.5,-0.5 +65,0.5,-0.5 +70,0.5,-0.5 +75,0.5,-0.5 +80,0.5,-0.5 +85,0.5,-0.5 +90,0.5,-0.5 +95,0.5,-0.5 +100,0.5,-0.5 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/EM_Map.vemo b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/EM_Map.vemo new file mode 100644 index 0000000000000000000000000000000000000000..17ac754c9da3cea8fe80cd11556747e6ebf91e63 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/EM_Map.vemo @@ -0,0 +1,925 @@ +n [rpm] , T [Nm] , P_el [kW] +0.00,-712.50,0.000 +0.00,-676.88,0.000 +0.00,-641.25,0.000 +0.00,-605.63,0.000 +0.00,-570.00,0.000 +0.00,-534.38,0.000 +0.00,-498.75,0.000 +0.00,-463.13,-0.007 +0.00,-427.50,-0.142 +0.00,-391.88,-0.249 +0.00,-356.25,-0.331 +0.00,-320.63,-0.390 +0.00,-285.00,-0.427 +0.00,-249.37,-0.442 +0.00,-213.75,-0.436 +0.00,-178.12,-0.409 +0.00,-142.50,-0.362 +0.00,-106.87,-0.296 +0.00,-71.25,-0.210 +0.00,-35.62,-0.105 +0.00,-7.13,-0.006 +0.00,7.13,0.077 +0.00,35.62,0.316 +0.00,71.25,0.633 +0.00,106.87,0.968 +0.00,142.50,1.321 +0.00,178.12,1.693 +0.00,213.75,2.084 +0.00,249.37,2.492 +0.00,285.00,2.919 +0.00,320.63,3.364 +0.00,356.25,3.828 +0.00,391.88,4.309 +0.00,427.50,4.808 +0.00,463.13,5.325 +0.00,498.75,5.860 +0.00,534.38,6.413 +0.00,570.00,6.984 +0.00,605.63,7.572 +0.00,641.25,8.178 +0.00,676.88,8.801 +0.00,712.50,9.443 +25.46,-712.50,0.000 +25.46,-676.88,0.000 +25.46,-641.25,0.000 +25.46,-605.63,0.000 +25.46,-570.00,0.000 +25.46,-534.38,0.000 +25.46,-498.75,-0.049 +25.46,-463.13,-0.110 +25.46,-427.50,-0.158 +25.46,-391.88,-0.194 +25.46,-356.25,-0.219 +25.46,-320.63,-0.235 +25.46,-285.00,-0.242 +25.46,-249.37,-0.240 +25.46,-213.75,-0.229 +25.46,-178.12,-0.209 +25.46,-142.50,-0.182 +25.46,-106.87,-0.146 +25.46,-71.25,-0.102 +25.46,-35.62,-0.051 +25.46,-7.13,-0.003 +25.46,7.13,0.034 +25.46,35.62,0.140 +25.46,71.25,0.280 +25.46,106.87,0.427 +25.46,142.50,0.582 +25.46,178.12,0.744 +25.46,213.75,0.914 +25.46,249.37,1.092 +25.46,285.00,1.277 +25.46,320.63,1.469 +25.46,356.25,1.669 +25.46,391.88,1.877 +25.46,427.50,2.092 +25.46,463.13,2.314 +25.46,498.75,2.544 +25.46,534.38,2.781 +25.46,570.00,3.025 +25.46,605.63,3.277 +25.46,641.25,3.536 +25.46,676.88,3.802 +25.46,712.50,4.076 +254.65,-712.50,-16.055 +254.65,-676.88,-15.324 +254.65,-641.25,-14.586 +254.65,-605.63,-13.839 +254.65,-570.00,-13.084 +254.65,-534.38,-12.321 +254.65,-498.75,-11.550 +254.65,-463.13,-10.771 +254.65,-427.50,-9.984 +254.65,-391.88,-9.189 +254.65,-356.25,-8.385 +254.65,-320.63,-7.574 +254.65,-285.00,-6.754 +254.65,-249.37,-5.926 +254.65,-213.75,-5.091 +254.65,-178.12,-4.247 +254.65,-142.50,-3.395 +254.65,-106.87,-2.535 +254.65,-71.25,-1.667 +254.65,-35.62,-0.790 +254.65,-7.13,-0.081 +254.65,7.13,0.300 +254.65,35.62,1.118 +254.65,71.25,2.147 +254.65,106.87,3.183 +254.65,142.50,4.228 +254.65,178.12,5.282 +254.65,213.75,6.344 +254.65,249.37,7.415 +254.65,285.00,8.495 +254.65,320.63,9.582 +254.65,356.25,10.679 +254.65,391.88,11.784 +254.65,427.50,12.897 +254.65,463.13,14.019 +254.65,498.75,15.149 +254.65,534.38,16.288 +254.65,570.00,17.436 +254.65,605.63,18.592 +254.65,641.25,19.756 +254.65,676.88,20.929 +254.65,712.50,22.110 +509.30,-712.50,-33.940 +509.30,-676.88,-32.324 +509.30,-641.25,-30.698 +509.30,-605.63,-29.063 +509.30,-570.00,-27.417 +509.30,-534.38,-25.763 +509.30,-498.75,-24.098 +509.30,-463.13,-22.424 +509.30,-427.50,-20.740 +509.30,-391.88,-19.047 +509.30,-356.25,-17.344 +509.30,-320.63,-15.631 +509.30,-285.00,-13.909 +509.30,-249.37,-12.177 +509.30,-213.75,-10.436 +509.30,-178.12,-8.685 +509.30,-142.50,-6.924 +509.30,-106.87,-5.154 +509.30,-71.25,-3.374 +509.30,-35.62,-1.584 +509.30,-7.13,-0.137 +509.30,7.13,0.624 +509.30,35.62,2.234 +509.30,71.25,4.251 +509.30,106.87,6.277 +509.30,142.50,8.314 +509.30,178.12,10.361 +509.30,213.75,12.418 +509.30,249.37,14.486 +509.30,285.00,16.564 +509.30,320.63,18.651 +509.30,356.25,20.750 +509.30,391.88,22.858 +509.30,427.50,24.977 +509.30,463.13,27.105 +509.30,498.75,29.244 +509.30,534.38,31.394 +509.30,570.00,33.553 +509.30,605.63,35.723 +509.30,641.25,37.902 +509.30,676.88,40.093 +509.30,712.50,42.293 +763.94,-712.50,-51.582 +763.94,-676.88,-49.100 +763.94,-641.25,-46.606 +763.94,-605.63,-44.099 +763.94,-570.00,-41.581 +763.94,-534.38,-39.050 +763.94,-498.75,-36.506 +763.94,-463.13,-33.951 +763.94,-427.50,-31.384 +763.94,-391.88,-28.804 +763.94,-356.25,-26.212 +763.94,-320.63,-23.608 +763.94,-285.00,-20.992 +763.94,-249.37,-18.363 +763.94,-213.75,-15.723 +763.94,-178.12,-13.070 +763.94,-142.50,-10.405 +763.94,-106.87,-7.728 +763.94,-71.25,-5.038 +763.94,-35.62,-2.335 +763.94,-7.13,-0.147 +763.94,7.13,0.988 +763.94,35.62,3.393 +763.94,71.25,6.400 +763.94,106.87,9.419 +763.94,142.50,12.451 +763.94,178.12,15.496 +763.94,213.75,18.554 +763.94,249.37,21.625 +763.94,285.00,24.709 +763.94,320.63,27.806 +763.94,356.25,30.916 +763.94,391.88,34.038 +763.94,427.50,37.174 +763.94,463.13,40.323 +763.94,498.75,43.485 +763.94,534.38,46.659 +763.94,570.00,49.847 +763.94,605.63,53.047 +763.94,641.25,56.261 +763.94,676.88,59.487 +763.94,712.50,62.727 +1018.59,-712.50,-68.972 +1018.59,-676.88,-65.644 +1018.59,-641.25,-62.299 +1018.59,-605.63,-58.939 +1018.59,-570.00,-55.564 +1018.59,-534.38,-52.172 +1018.59,-498.75,-48.765 +1018.59,-463.13,-45.342 +1018.59,-427.50,-41.903 +1018.59,-391.88,-38.448 +1018.59,-356.25,-34.978 +1018.59,-320.63,-31.492 +1018.59,-285.00,-27.990 +1018.59,-249.37,-24.472 +1018.59,-213.75,-20.939 +1018.59,-178.12,-17.390 +1018.59,-142.50,-13.825 +1018.59,-106.87,-10.244 +1018.59,-71.25,-6.648 +1018.59,-35.62,-3.033 +1018.59,-7.13,-0.092 +1018.59,7.13,1.405 +1018.59,35.62,4.607 +1018.59,71.25,8.607 +1018.59,106.87,12.622 +1018.59,142.50,16.653 +1018.59,178.12,20.701 +1018.59,213.75,24.765 +1018.59,249.37,28.846 +1018.59,285.00,32.944 +1018.59,320.63,37.059 +1018.59,356.25,41.190 +1018.59,391.88,45.339 +1018.59,427.50,49.504 +1018.59,463.13,53.686 +1018.59,498.75,57.884 +1018.59,534.38,62.100 +1018.59,570.00,66.332 +1018.59,605.63,70.581 +1018.59,641.25,74.846 +1018.59,676.88,79.128 +1018.59,712.50,83.427 +1273.24,-712.50,-86.099 +1273.24,-676.88,-81.943 +1273.24,-641.25,-77.768 +1273.24,-605.63,-73.571 +1273.24,-570.00,-69.355 +1273.24,-534.38,-65.118 +1273.24,-498.75,-60.861 +1273.24,-463.13,-56.584 +1273.24,-427.50,-52.286 +1273.24,-391.88,-47.968 +1273.24,-356.25,-43.630 +1273.24,-320.63,-39.271 +1273.24,-285.00,-34.892 +1273.24,-249.37,-30.493 +1273.24,-213.75,-26.073 +1273.24,-178.12,-21.634 +1273.24,-142.50,-17.173 +1273.24,-106.87,-12.692 +1273.24,-71.25,-8.190 +1273.24,-35.62,-3.665 +1273.24,-7.13,0.000 +1273.24,7.13,1.886 +1273.24,35.62,5.890 +1273.24,71.25,10.884 +1273.24,106.87,15.897 +1273.24,142.50,20.931 +1273.24,178.12,25.986 +1273.24,213.75,31.063 +1273.24,249.37,36.162 +1273.24,285.00,41.282 +1273.24,320.63,46.423 +1273.24,356.25,51.587 +1273.24,391.88,56.772 +1273.24,427.50,61.978 +1273.24,463.13,67.206 +1273.24,498.75,72.456 +1273.24,534.38,77.727 +1273.24,570.00,83.020 +1273.24,605.63,88.335 +1273.24,641.25,93.671 +1273.24,676.88,99.029 +1273.24,712.50,104.408 +1527.89,-712.50,-102.949 +1527.89,-676.88,-97.987 +1527.89,-641.25,-92.998 +1527.89,-605.63,-87.983 +1527.89,-570.00,-82.943 +1527.89,-534.38,-77.876 +1527.89,-498.75,-72.784 +1527.89,-463.13,-67.666 +1527.89,-427.50,-62.522 +1527.89,-391.88,-57.352 +1527.89,-356.25,-52.156 +1527.89,-320.63,-46.934 +1527.89,-285.00,-41.686 +1527.89,-249.37,-36.413 +1527.89,-213.75,-31.113 +1527.89,-178.12,-25.788 +1527.89,-142.50,-20.437 +1527.89,-106.87,-15.059 +1527.89,-71.25,-9.654 +1527.89,-35.62,-4.218 +1527.89,-7.13,0.000 +1527.89,7.13,2.442 +1527.89,35.62,7.252 +1527.89,71.25,13.244 +1527.89,106.87,19.258 +1527.89,142.50,25.299 +1527.89,178.12,31.366 +1527.89,213.75,37.462 +1527.89,249.37,43.584 +1527.89,285.00,49.734 +1527.89,320.63,55.912 +1527.89,356.25,62.117 +1527.89,391.88,68.350 +1527.89,427.50,74.610 +1527.89,463.13,80.898 +1527.89,498.75,87.213 +1527.89,534.38,93.556 +1527.89,570.00,99.926 +1527.89,605.63,106.323 +1527.89,641.25,112.749 +1527.89,676.88,119.201 +1527.89,712.50,125.681 +1782.54,-712.50,-119.513 +1782.54,-676.88,-113.762 +1782.54,-641.25,-107.979 +1782.54,-605.63,-102.163 +1782.54,-570.00,-96.315 +1782.54,-534.38,-90.434 +1782.54,-498.75,-84.521 +1782.54,-463.13,-78.575 +1782.54,-427.50,-72.597 +1782.54,-391.88,-66.586 +1782.54,-356.25,-60.543 +1782.54,-320.63,-54.468 +1782.54,-285.00,-48.360 +1782.54,-249.37,-42.220 +1782.54,-213.75,-36.047 +1782.54,-178.12,-29.842 +1782.54,-142.50,-23.604 +1782.54,-106.87,-17.333 +1782.54,-71.25,-11.027 +1782.54,-35.62,-4.679 +1782.54,-7.13,0.000 +1782.54,7.13,3.083 +1782.54,35.62,8.707 +1782.54,71.25,15.698 +1782.54,106.87,22.717 +1782.54,142.50,29.768 +1782.54,178.12,36.853 +1782.54,213.75,43.973 +1782.54,249.37,51.126 +1782.54,285.00,58.314 +1782.54,320.63,65.537 +1782.54,356.25,72.794 +1782.54,391.88,80.086 +1782.54,427.50,87.412 +1782.54,463.13,94.772 +1782.54,498.75,102.167 +1782.54,534.38,109.596 +1782.54,570.00,117.060 +1782.54,605.63,124.558 +1782.54,641.25,132.091 +1782.54,676.88,139.658 +1782.54,712.50,147.260 +2037.18,-712.50,-135.776 +2037.18,-676.88,-129.256 +2037.18,-641.25,-122.697 +2037.18,-605.63,-116.098 +2037.18,-570.00,-109.458 +2037.18,-534.38,-102.779 +2037.18,-498.75,-96.059 +2037.18,-463.13,-89.300 +2037.18,-427.50,-82.500 +2037.18,-391.88,-75.661 +2037.18,-356.25,-68.781 +2037.18,-320.63,-61.862 +2037.18,-285.00,-54.902 +2037.18,-249.37,-47.902 +2037.18,-213.75,-40.863 +2037.18,-178.12,-33.783 +2037.18,-142.50,-26.662 +2037.18,-106.87,-19.500 +2037.18,-71.25,-12.295 +2037.18,-35.62,-5.035 +2037.18,-7.13,0.000 +2037.18,7.13,3.820 +2037.18,35.62,10.266 +2037.18,71.25,18.260 +2037.18,106.87,26.286 +2037.18,142.50,34.352 +2037.18,178.12,42.460 +2037.18,213.75,50.609 +2037.18,249.37,58.801 +2037.18,285.00,67.035 +2037.18,320.63,75.311 +2037.18,356.25,83.630 +2037.18,391.88,91.992 +2037.18,427.50,100.396 +2037.18,463.13,108.842 +2037.18,498.75,117.331 +2037.18,534.38,125.862 +2037.18,570.00,134.436 +2037.18,605.63,143.052 +2037.18,641.25,151.711 +2037.18,676.88,160.412 +2037.18,712.50,169.155 +2291.83,-712.50,-151.726 +2291.83,-676.88,-144.458 +2291.83,-641.25,-137.141 +2291.83,-605.63,-129.776 +2291.83,-570.00,-122.362 +2291.83,-534.38,-114.899 +2291.83,-498.75,-107.388 +2291.83,-463.13,-99.828 +2291.83,-427.50,-92.219 +2291.83,-391.88,-84.562 +2291.83,-356.25,-76.856 +2291.83,-320.63,-69.102 +2291.83,-285.00,-61.299 +2291.83,-249.37,-53.448 +2291.83,-213.75,-45.547 +2291.83,-178.12,-37.598 +2291.83,-142.50,-29.599 +2291.83,-106.87,-21.550 +2291.83,-71.25,-13.447 +2291.83,-35.62,-5.271 +2291.83,-7.13,0.000 +2291.83,7.13,4.663 +2291.83,35.62,11.940 +2291.83,71.25,20.941 +2291.83,106.87,29.978 +2291.83,142.50,39.063 +2291.83,178.12,48.198 +2291.83,213.75,57.383 +2291.83,249.37,66.620 +2291.83,285.00,75.908 +2291.83,320.63,85.247 +2291.83,356.25,94.638 +2291.83,391.88,104.081 +2291.83,427.50,113.575 +2291.83,463.13,123.120 +2291.83,498.75,132.717 +2291.83,534.38,142.366 +2291.83,570.00,152.066 +2291.83,605.63,161.817 +2291.83,641.25,171.620 +2291.83,676.88,181.475 +2291.83,712.50,191.380 +2546.48,-712.50,-167.352 +2546.48,-676.88,-159.355 +2546.48,-641.25,-151.299 +2546.48,-605.63,-143.185 +2546.48,-570.00,-135.013 +2546.48,-534.38,-126.783 +2546.48,-498.75,-118.494 +2546.48,-463.13,-110.147 +2546.48,-427.50,-101.742 +2546.48,-391.88,-93.279 +2546.48,-356.25,-84.757 +2546.48,-320.63,-76.178 +2546.48,-285.00,-67.540 +2546.48,-249.37,-58.844 +2546.48,-213.75,-50.089 +2546.48,-178.12,-41.276 +2546.48,-142.50,-32.403 +2546.48,-106.87,-23.469 +2546.48,-71.25,-14.470 +2546.48,-35.62,-5.374 +2546.48,-7.13,0.000 +2546.48,7.13,5.621 +2546.48,35.62,13.742 +2546.48,71.25,23.754 +2546.48,106.87,33.805 +2546.48,142.50,43.913 +2546.48,178.12,54.080 +2546.48,213.75,64.307 +2546.48,249.37,74.596 +2546.48,285.00,84.946 +2546.48,320.63,95.357 +2546.48,356.25,105.830 +2546.48,391.88,116.365 +2546.48,427.50,126.961 +2546.48,463.13,137.619 +2546.48,498.75,148.339 +2546.48,534.38,159.120 +2546.48,570.00,169.962 +2546.48,605.63,180.866 +2546.48,641.25,191.832 +2546.48,676.88,202.859 +2546.48,712.50,213.947 +2801.13,-712.50,-182.640 +2801.13,-676.88,-173.933 +2801.13,-641.25,-165.157 +2801.13,-605.63,-156.313 +2801.13,-570.00,-147.399 +2801.13,-534.38,-138.417 +2801.13,-498.75,-129.365 +2801.13,-463.13,-120.245 +2801.13,-427.50,-111.056 +2801.13,-391.88,-101.798 +2801.13,-356.25,-92.471 +2801.13,-320.63,-83.076 +2801.13,-285.00,-73.611 +2801.13,-249.37,-64.078 +2801.13,-213.75,-54.476 +2801.13,-178.12,-44.803 +2801.13,-142.50,-35.061 +2801.13,-106.87,-25.245 +2801.13,-71.25,-15.350 +2801.13,-35.62,-5.328 +2801.13,-7.13,0.000 +2801.13,7.13,6.705 +2801.13,35.62,15.683 +2801.13,71.25,26.710 +2801.13,106.87,37.780 +2801.13,142.50,48.914 +2801.13,178.12,60.119 +2801.13,213.75,71.394 +2801.13,249.37,82.742 +2801.13,285.00,94.161 +2801.13,320.63,105.654 +2801.13,356.25,117.219 +2801.13,391.88,128.857 +2801.13,427.50,140.568 +2801.13,463.13,152.351 +2801.13,498.75,164.207 +2801.13,534.38,176.136 +2801.13,570.00,188.137 +2801.13,605.63,200.211 +2801.13,641.25,212.358 +2801.13,676.88,224.577 +2801.13,712.50,236.869 +3055.77,-712.50,-197.578 +3055.77,-676.88,-188.182 +3055.77,-641.25,-178.704 +3055.77,-605.63,-169.146 +3055.77,-570.00,-159.508 +3055.77,-534.38,-149.789 +3055.77,-498.75,-139.989 +3055.77,-463.13,-130.109 +3055.77,-427.50,-120.149 +3055.77,-391.88,-110.108 +3055.77,-356.25,-99.986 +3055.77,-320.63,-89.784 +3055.77,-285.00,-79.502 +3055.77,-249.37,-69.139 +3055.77,-213.75,-58.695 +3055.77,-178.12,-48.169 +3055.77,-142.50,-37.560 +3055.77,-106.87,-26.865 +3055.77,-71.25,-16.073 +3055.77,-35.62,-5.115 +3055.77,-7.13,0.000 +3055.77,7.13,7.924 +3055.77,35.62,17.773 +3055.77,71.25,29.821 +3055.77,106.87,41.913 +3055.77,142.50,54.079 +3055.77,178.12,66.326 +3055.77,213.75,78.656 +3055.77,249.37,91.069 +3055.77,285.00,103.567 +3055.77,320.63,116.150 +3055.77,356.25,128.817 +3055.77,391.88,141.569 +3055.77,427.50,154.406 +3055.77,463.13,167.328 +3055.77,498.75,180.335 +3055.77,534.38,193.426 +3055.77,570.00,206.603 +3055.77,605.63,219.864 +3055.77,641.25,233.210 +3055.77,676.88,246.641 +3055.77,712.50,260.156 +3310.42,-712.50,-212.154 +3310.42,-676.88,-202.087 +3310.42,-641.25,-191.927 +3310.42,-605.63,-181.673 +3310.42,-570.00,-171.327 +3310.42,-534.38,-160.887 +3310.42,-498.75,-150.353 +3310.42,-463.13,-139.727 +3310.42,-427.50,-129.008 +3310.42,-391.88,-118.195 +3310.42,-356.25,-107.290 +3310.42,-320.63,-96.291 +3310.42,-285.00,-85.199 +3310.42,-249.37,-74.013 +3310.42,-213.75,-62.733 +3310.42,-178.12,-51.359 +3310.42,-142.50,-39.888 +3310.42,-106.87,-28.316 +3310.42,-71.25,-16.627 +3310.42,-35.62,-4.717 +3310.42,-7.13,0.000 +3310.42,7.13,9.286 +3310.42,35.62,20.025 +3310.42,71.25,33.099 +3310.42,106.87,46.218 +3310.42,142.50,59.420 +3310.42,178.12,72.714 +3310.42,213.75,86.104 +3310.42,249.37,99.591 +3310.42,285.00,113.175 +3310.42,320.63,126.856 +3310.42,356.25,140.636 +3310.42,391.88,154.513 +3310.42,427.50,168.489 +3310.42,463.13,182.563 +3310.42,498.75,196.734 +3310.42,534.38,211.004 +3310.42,570.00,225.372 +3310.42,605.63,239.838 +3310.42,641.25,254.401 +3310.42,676.88,269.063 +3310.42,712.50,283.822 +3565.07,-712.50,-226.354 +3565.07,-676.88,-215.637 +3565.07,-641.25,-204.813 +3565.07,-605.63,-193.881 +3565.07,-570.00,-182.843 +3565.07,-534.38,-171.698 +3565.07,-498.75,-160.446 +3565.07,-463.13,-149.087 +3565.07,-427.50,-137.621 +3565.07,-391.88,-126.049 +3565.07,-356.25,-114.369 +3565.07,-320.63,-102.583 +3565.07,-285.00,-90.689 +3565.07,-249.37,-78.688 +3565.07,-213.75,-66.580 +3565.07,-178.12,-54.361 +3565.07,-142.50,-42.032 +3565.07,-106.87,-29.584 +3565.07,-71.25,-16.996 +3565.07,-35.62,-4.111 +3565.07,-7.13,0.000 +3565.07,7.13,10.802 +3565.07,35.62,22.448 +3565.07,71.25,36.556 +3565.07,106.87,50.706 +3565.07,142.50,64.949 +3565.07,178.12,79.296 +3565.07,213.75,93.752 +3565.07,249.37,108.319 +3565.07,285.00,122.997 +3565.07,320.63,137.787 +3565.07,356.25,152.688 +3565.07,391.88,167.702 +3565.07,427.50,182.829 +3565.07,463.13,198.067 +3565.07,498.75,213.418 +3565.07,534.38,228.881 +3565.07,570.00,244.456 +3565.07,605.63,260.144 +3565.07,641.25,275.944 +3565.07,676.88,291.855 +3565.07,712.50,307.879 +3819.72,-712.50,-240.167 +3819.72,-676.88,-228.819 +3819.72,-641.25,-217.349 +3819.72,-605.63,-205.758 +3819.72,-570.00,-194.045 +3819.72,-534.38,-182.210 +3819.72,-498.75,-170.253 +3819.72,-463.13,-158.175 +3819.72,-427.50,-145.976 +3819.72,-391.88,-133.655 +3819.72,-356.25,-121.212 +3819.72,-320.63,-108.648 +3819.72,-285.00,-95.961 +3819.72,-249.37,-83.152 +3819.72,-213.75,-70.220 +3819.72,-178.12,-57.163 +3819.72,-142.50,-43.978 +3819.72,-106.87,-30.656 +3819.72,-71.25,-17.167 +3819.72,-35.62,-3.269 +3819.72,-7.13,0.000 +3819.72,7.13,12.480 +3819.72,35.62,25.054 +3819.72,71.25,40.202 +3819.72,106.87,55.388 +3819.72,142.50,70.677 +3819.72,178.12,86.083 +3819.72,213.75,101.612 +3819.72,249.37,117.266 +3819.72,285.00,133.046 +3819.72,320.63,148.953 +3819.72,356.25,164.987 +3819.72,391.88,181.148 +3819.72,427.50,197.437 +3819.72,463.13,213.854 +3819.72,498.75,230.398 +3819.72,534.38,247.069 +3819.72,570.00,263.868 +3819.72,605.63,280.795 +3819.72,641.25,297.849 +3819.72,676.88,315.030 +3819.72,712.50,332.338 +4074.37,-712.50,-253.578 +4074.37,-676.88,-241.620 +4074.37,-641.25,-229.524 +4074.37,-605.63,-217.290 +4074.37,-570.00,-204.919 +4074.37,-534.38,-192.410 +4074.37,-498.75,-179.764 +4074.37,-463.13,-166.980 +4074.37,-427.50,-154.060 +4074.37,-391.88,-141.002 +4074.37,-356.25,-127.806 +4074.37,-320.63,-114.473 +4074.37,-285.00,-101.002 +4074.37,-249.37,-87.392 +4074.37,-213.75,-73.643 +4074.37,-178.12,-59.752 +4074.37,-142.50,-45.714 +4074.37,-106.87,-31.518 +4074.37,-71.25,-17.122 +4074.37,-35.62,-2.147 +4074.37,-7.13,0.000 +4074.37,7.13,14.328 +4074.37,35.62,27.853 +4074.37,71.25,44.050 +4074.37,106.87,60.277 +4074.37,142.50,76.617 +4074.37,178.12,93.087 +4074.37,213.75,109.695 +4074.37,249.37,126.443 +4074.37,285.00,143.333 +4074.37,320.63,160.367 +4074.37,356.25,177.543 +4074.37,391.88,194.863 +4074.37,427.50,212.327 +4074.37,463.13,229.935 +4074.37,498.75,247.686 +4074.37,534.38,265.581 +4074.37,570.00,283.620 +4074.37,605.63,301.803 +4074.37,641.25,320.129 +4074.37,676.88,338.599 +4074.37,712.50,357.212 +4329.01,-712.50,-266.576 +4329.01,-676.88,-254.027 +4329.01,-641.25,-241.323 +4329.01,-605.63,-228.465 +4329.01,-570.00,-215.452 +4329.01,-534.38,-202.285 +4329.01,-498.75,-188.964 +4329.01,-463.13,-175.489 +4329.01,-427.50,-161.860 +4329.01,-391.88,-148.076 +4329.01,-356.25,-134.138 +4329.01,-320.63,-120.046 +4329.01,-285.00,-105.798 +4329.01,-249.37,-91.395 +4329.01,-213.75,-76.834 +4329.01,-178.12,-62.114 +4329.01,-142.50,-47.226 +4329.01,-106.87,-32.157 +4329.01,-71.25,-16.847 +4329.01,-35.62,-0.644 +4329.01,-7.13,0.000 +4329.01,7.13,16.355 +4329.01,35.62,30.856 +4329.01,71.25,48.110 +4329.01,106.87,65.384 +4329.01,142.50,82.780 +4329.01,178.12,100.320 +4329.01,213.75,118.013 +4329.01,249.37,135.863 +4329.01,285.00,153.872 +4329.01,320.63,172.041 +4329.01,356.25,190.370 +4329.01,391.88,208.859 +4329.01,427.50,227.510 +4329.01,463.13,246.322 +4329.01,498.75,265.295 +4329.01,534.38,284.429 +4329.01,570.00,303.724 +4329.01,605.63,323.180 +4329.01,641.25,342.797 +4329.01,676.88,362.574 +4329.01,712.50,382.513 +4583.66,-712.50,-279.147 +4583.66,-676.88,-266.027 +4583.66,-641.25,-252.734 +4583.66,-605.63,-239.270 +4583.66,-570.00,-225.633 +4583.66,-534.38,-211.823 +4583.66,-498.75,-197.842 +4583.66,-463.13,-183.689 +4583.66,-427.50,-169.363 +4583.66,-391.88,-154.866 +4583.66,-356.25,-140.196 +4583.66,-320.63,-125.353 +4583.66,-285.00,-110.338 +4583.66,-249.37,-95.148 +4583.66,-213.75,-79.782 +4583.66,-178.12,-64.235 +4583.66,-142.50,-48.501 +4583.66,-106.87,-32.557 +4583.66,-71.25,-16.323 +4583.66,-35.62,0.000 +4583.66,-7.13,0.000 +4583.66,7.13,18.571 +4583.66,35.62,34.073 +4583.66,71.25,52.393 +4583.66,106.87,70.721 +4583.66,142.50,89.178 +4583.66,178.12,107.794 +4583.66,213.75,126.579 +4583.66,249.37,145.538 +4583.66,285.00,164.673 +4583.66,320.63,183.987 +4583.66,356.25,203.478 +4583.66,391.88,223.149 +4583.66,427.50,242.999 +4583.66,463.13,263.028 +4583.66,498.75,283.236 +4583.66,534.38,303.624 +4583.66,570.00,324.191 +4583.66,605.63,344.938 +4583.66,641.25,365.863 +4583.66,676.88,386.968 +4583.66,712.50,408.252 +4838.31,-712.50,-291.278 +4838.31,-676.88,-277.607 +4838.31,-641.25,-263.745 +4838.31,-605.63,-249.692 +4838.31,-570.00,-235.447 +4838.31,-534.38,-221.011 +4838.31,-498.75,-206.384 +4838.31,-463.13,-191.566 +4838.31,-427.50,-176.557 +4838.31,-391.88,-161.357 +4838.31,-356.25,-145.966 +4838.31,-320.63,-130.383 +4838.31,-285.00,-114.607 +4838.31,-249.37,-98.637 +4838.31,-213.75,-82.471 +4838.31,-178.12,-66.103 +4838.31,-142.50,-49.523 +4838.31,-106.87,-32.703 +4838.31,-71.25,-15.531 +4838.31,-35.62,0.000 +4838.31,-7.13,0.000 +4838.31,7.13,20.982 +4838.31,35.62,37.514 +4838.31,71.25,56.911 +4838.31,106.87,76.298 +4838.31,142.50,95.823 +4838.31,178.12,115.521 +4838.31,213.75,135.404 +4838.31,249.37,155.479 +4838.31,285.00,175.750 +4838.31,320.63,196.217 +4838.31,356.25,216.881 +4838.31,391.88,237.744 +4838.31,427.50,258.805 +4838.31,463.13,280.064 +4838.31,498.75,301.522 +4838.31,534.38,323.179 +4838.31,570.00,345.035 +4838.31,605.63,367.089 +4838.31,641.25,389.341 +4838.31,676.88,411.792 +4838.31,712.50,434.442 +5092.96,-712.50,-302.956 +5092.96,-676.88,-288.755 +5092.96,-641.25,-274.342 +5092.96,-605.63,-259.717 +5092.96,-570.00,-244.882 +5092.96,-534.38,-229.835 +5092.96,-498.75,-214.578 +5092.96,-463.13,-199.109 +5092.96,-427.50,-183.429 +5092.96,-391.88,-167.538 +5092.96,-356.25,-151.436 +5092.96,-320.63,-135.121 +5092.96,-285.00,-118.594 +5092.96,-249.37,-101.851 +5092.96,-213.75,-84.890 +5092.96,-178.12,-67.704 +5092.96,-142.50,-50.280 +5092.96,-106.87,-32.579 +5092.96,-71.25,-14.451 +5092.96,-35.62,0.000 +5092.96,-7.13,0.000 +5092.96,7.13,23.599 +5092.96,35.62,41.189 +5092.96,71.25,61.674 +5092.96,106.87,82.128 +5092.96,142.50,102.726 +5092.96,178.12,123.512 +5092.96,213.75,144.500 +5092.96,249.37,165.700 +5092.96,285.00,187.113 +5092.96,320.63,208.743 +5092.96,356.25,230.590 +5092.96,391.88,252.656 +5092.96,427.50,274.940 +5092.96,463.13,297.443 +5092.96,498.75,320.165 +5092.96,534.38,343.106 +5092.96,570.00,366.266 +5092.96,605.63,389.645 +5092.96,641.25,413.242 +5092.96,676.88,437.059 +5092.96,712.50,461.094 \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/EM_MapP0vsP1.vemo b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/EM_MapP0vsP1.vemo new file mode 100644 index 0000000000000000000000000000000000000000..2964496dc551f2a01d09509a5b5d057c2d450a2d --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/EM_MapP0vsP1.vemo @@ -0,0 +1,925 @@ +n [rpm] , T [Nm] , P_el [kW] +0, -175, 0.000 +0, -166, 0.000 +0, -158, 0.000 +0, -149, 0.000 +0, -140, 0.000 +0, -131, 0.000 +0, -123, 0.000 +0, -114, 0.000 +0, -105, -0.069 +0, -96, -0.171 +0, -88, -0.253 +0, -79, -0.316 +0, -70, -0.358 +0, -61, -0.381 +0, -52, -0.383 +0, -44, -0.366 +0, -35, -0.328 +0, -26, -0.271 +0, -17, -0.194 +0, -9, -0.097 +0, -2, -0.005 +0, 2, 0.082 +0, 9, 0.331 +0, 17, 0.662 +0, 26, 1.015 +0, 35, 1.389 +0, 44, 1.785 +0, 52, 2.202 +0, 61, 2.641 +0, 70, 3.102 +0, 79, 3.584 +0, 88, 4.088 +0, 96, 4.614 +0, 105, 5.161 +0, 114, 5.730 +0, 123, 6.320 +0, 131, 6.932 +0, 140, 7.566 +0, 149, 8.221 +0, 158, 8.898 +0, 166, 9.597 +0, 175, 10.317 +25, -175, 0.000 +25, -166, 0.000 +25, -158, 0.000 +25, -149, 0.000 +25, -140, 0.000 +25, -131, 0.000 +25, -123, -0.008 +25, -114, -0.021 +25, -105, -0.031 +25, -96, -0.039 +25, -88, -0.046 +25, -79, -0.050 +25, -70, -0.052 +25, -61, -0.053 +25, -52, -0.051 +25, -44, -0.047 +25, -35, -0.041 +25, -26, -0.033 +25, -17, -0.023 +25, -9, -0.012 +25, -2, -0.001 +25, 2, 0.009 +25, 9, 0.036 +25, 17, 0.072 +25, 26, 0.110 +25, 35, 0.150 +25, 44, 0.192 +25, 52, 0.237 +25, 61, 0.283 +25, 70, 0.332 +25, 79, 0.383 +25, 88, 0.437 +25, 96, 0.492 +25, 105, 0.550 +25, 114, 0.609 +25, 123, 0.671 +25, 131, 0.736 +25, 140, 0.802 +25, 149, 0.871 +25, 158, 0.942 +25, 166, 1.015 +25, 175, 1.090 +255, -175, -3.870 +255, -166, -3.696 +255, -158, -3.520 +255, -149, -3.341 +255, -140, -3.161 +255, -131, -2.978 +255, -123, -2.793 +255, -114, -2.606 +255, -105, -2.416 +255, -96, -2.225 +255, -88, -2.031 +255, -79, -1.835 +255, -70, -1.637 +255, -61, -1.437 +255, -52, -1.235 +255, -44, -1.030 +255, -35, -0.823 +255, -26, -0.615 +255, -17, -0.403 +255, -9, -0.190 +255, -2, -0.018 +255, 2, 0.078 +255, 9, 0.280 +255, 17, 0.534 +255, 26, 0.792 +255, 35, 1.051 +255, 44, 1.313 +255, 52, 1.577 +255, 61, 1.843 +255, 70, 2.112 +255, 79, 2.384 +255, 88, 2.657 +255, 96, 2.933 +255, 105, 3.211 +255, 114, 3.492 +255, 123, 3.775 +255, 131, 4.061 +255, 140, 4.348 +255, 149, 4.638 +255, 158, 4.931 +255, 166, 5.226 +255, 175, 5.523 +509, -175, -8.232 +509, -166, -7.842 +509, -158, -7.450 +509, -149, -7.055 +509, -140, -6.657 +509, -131, -6.257 +509, -123, -5.854 +509, -114, -5.449 +509, -105, -5.041 +509, -96, -4.630 +509, -88, -4.217 +509, -79, -3.801 +509, -70, -3.383 +509, -61, -2.962 +509, -52, -2.538 +509, -44, -2.112 +509, -35, -1.683 +509, -26, -1.252 +509, -17, -0.818 +509, -9, -0.381 +509, -2, -0.030 +509, 2, 0.162 +509, 9, 0.559 +509, 17, 1.057 +509, 26, 1.558 +509, 35, 2.063 +509, 44, 2.570 +509, 52, 3.079 +509, 61, 3.592 +509, 70, 4.107 +509, 79, 4.625 +509, 88, 5.147 +509, 96, 5.670 +509, 105, 6.197 +509, 114, 6.727 +509, 123, 7.259 +509, 131, 7.794 +509, 140, 8.332 +509, 149, 8.873 +509, 158, 9.416 +509, 166, 9.963 +509, 175, 10.512 +764, -175, -12.529 +764, -166, -11.929 +764, -158, -11.326 +764, -149, -10.719 +764, -140, -10.109 +764, -131, -9.495 +764, -123, -8.878 +764, -114, -8.258 +764, -105, -7.635 +764, -96, -7.008 +764, -88, -6.378 +764, -79, -5.745 +764, -70, -5.109 +764, -61, -4.469 +764, -52, -3.826 +764, -44, -3.179 +764, -35, -2.530 +764, -26, -1.877 +764, -17, -1.221 +764, -9, -0.561 +764, -2, -0.031 +764, 2, 0.258 +764, 9, 0.850 +764, 17, 1.592 +764, 26, 2.339 +764, 35, 3.088 +764, 44, 3.842 +764, 52, 4.599 +764, 61, 5.359 +764, 70, 6.123 +764, 79, 6.891 +764, 88, 7.662 +764, 96, 8.437 +764, 105, 9.216 +764, 114, 9.997 +764, 123, 10.783 +764, 131, 11.572 +764, 140, 12.365 +764, 149, 13.161 +764, 158, 13.961 +764, 166, 14.764 +764, 175, 15.571 +1019, -175, -16.759 +1019, -166, -15.953 +1019, -158, -15.144 +1019, -149, -14.330 +1019, -140, -13.511 +1019, -131, -12.689 +1019, -123, -11.862 +1019, -114, -11.031 +1019, -105, -10.196 +1019, -96, -9.356 +1019, -88, -8.512 +1019, -79, -7.664 +1019, -70, -6.812 +1019, -61, -5.955 +1019, -52, -5.095 +1019, -44, -4.229 +1019, -35, -3.360 +1019, -26, -2.486 +1019, -17, -1.609 +1019, -9, -0.727 +1019, -2, -0.018 +1019, 2, 0.370 +1019, 9, 1.156 +1019, 17, 2.143 +1019, 26, 3.135 +1019, 35, 4.132 +1019, 44, 5.133 +1019, 52, 6.139 +1019, 61, 7.149 +1019, 70, 8.164 +1019, 79, 9.184 +1019, 88, 10.208 +1019, 96, 11.237 +1019, 105, 12.270 +1019, 114, 13.308 +1019, 123, 14.351 +1019, 131, 15.398 +1019, 140, 16.450 +1019, 149, 17.507 +1019, 158, 18.568 +1019, 166, 19.634 +1019, 175, 20.704 +1273, -175, -20.917 +1273, -166, -19.912 +1273, -158, -18.901 +1273, -149, -17.884 +1273, -140, -16.862 +1273, -131, -15.835 +1273, -123, -14.802 +1273, -114, -13.764 +1273, -105, -12.720 +1273, -96, -11.670 +1273, -88, -10.615 +1273, -79, -9.555 +1273, -70, -8.489 +1273, -61, -7.418 +1273, -52, -6.341 +1273, -44, -5.259 +1273, -35, -4.171 +1273, -26, -3.078 +1273, -17, -1.979 +1273, -9, -0.875 +1273, -2, 0.000 +1273, 2, 0.500 +1273, 9, 1.482 +1273, 17, 2.714 +1273, 26, 3.952 +1273, 35, 5.197 +1273, 44, 6.447 +1273, 52, 7.703 +1273, 61, 8.965 +1273, 70, 10.233 +1273, 79, 11.507 +1273, 88, 12.787 +1273, 96, 14.073 +1273, 105, 15.365 +1273, 114, 16.663 +1273, 123, 17.967 +1273, 131, 19.276 +1273, 140, 20.592 +1273, 149, 21.914 +1273, 158, 23.241 +1273, 166, 24.575 +1273, 175, 25.915 +1528, -175, -25.001 +1528, -166, -23.801 +1528, -158, -22.594 +1528, -149, -21.379 +1528, -140, -20.158 +1528, -131, -18.930 +1528, -123, -17.695 +1528, -114, -16.453 +1528, -105, -15.204 +1528, -96, -13.947 +1528, -88, -12.684 +1528, -79, -11.414 +1528, -70, -10.137 +1528, -61, -8.853 +1528, -52, -7.562 +1528, -44, -6.264 +1528, -35, -4.959 +1528, -26, -3.647 +1528, -17, -2.328 +1528, -9, -1.002 +1528, -2, 0.000 +1528, 2, 0.653 +1528, 9, 1.830 +1528, 17, 3.307 +1528, 26, 4.793 +1528, 35, 6.286 +1528, 44, 7.787 +1528, 52, 9.295 +1528, 61, 10.810 +1528, 70, 12.334 +1528, 79, 13.865 +1528, 88, 15.403 +1528, 96, 16.949 +1528, 105, 18.503 +1528, 114, 20.064 +1528, 123, 21.633 +1528, 131, 23.210 +1528, 140, 24.794 +1528, 149, 26.385 +1528, 158, 27.984 +1528, 166, 29.591 +1528, 175, 31.206 +1783, -175, -29.007 +1783, -166, -27.618 +1783, -158, -26.219 +1783, -149, -24.812 +1783, -140, -23.396 +1783, -131, -21.971 +1783, -123, -20.538 +1783, -114, -19.095 +1783, -105, -17.644 +1783, -96, -16.185 +1783, -88, -14.716 +1783, -79, -13.239 +1783, -70, -11.753 +1783, -61, -10.258 +1783, -52, -8.754 +1783, -44, -7.242 +1783, -35, -5.721 +1783, -26, -4.191 +1783, -17, -2.653 +1783, -9, -1.105 +1783, -2, 0.000 +1783, 2, 0.831 +1783, 9, 2.204 +1783, 17, 3.927 +1783, 26, 5.661 +1783, 35, 7.403 +1783, 44, 9.156 +1783, 52, 10.918 +1783, 61, 12.689 +1783, 70, 14.470 +1783, 79, 16.260 +1783, 88, 18.060 +1783, 96, 19.869 +1783, 105, 21.688 +1783, 114, 23.516 +1783, 123, 25.354 +1783, 131, 27.201 +1783, 140, 29.058 +1783, 149, 30.925 +1783, 158, 32.800 +1783, 166, 34.686 +1783, 175, 36.581 +2037, -175, -32.933 +2037, -166, -31.359 +2037, -158, -29.774 +2037, -149, -28.178 +2037, -140, -26.572 +2037, -131, -24.955 +2037, -123, -23.327 +2037, -114, -21.688 +2037, -105, -20.039 +2037, -96, -18.378 +2037, -88, -16.707 +2037, -79, -15.025 +2037, -70, -13.333 +2037, -61, -11.629 +2037, -52, -9.915 +2037, -44, -8.190 +2037, -35, -6.454 +2037, -26, -4.707 +2037, -17, -2.950 +2037, -9, -1.181 +2037, -2, 0.000 +2037, 2, 1.039 +2037, 9, 2.607 +2037, 17, 4.577 +2037, 26, 6.559 +2037, 35, 8.553 +2037, 44, 10.558 +2037, 52, 12.575 +2037, 61, 14.604 +2037, 70, 16.644 +2037, 79, 18.696 +2037, 88, 20.760 +2037, 96, 22.836 +2037, 105, 24.923 +2037, 114, 27.022 +2037, 123, 29.133 +2037, 131, 31.255 +2037, 140, 33.390 +2037, 149, 35.536 +2037, 158, 37.693 +2037, 166, 39.862 +2037, 175, 42.043 +2292, -175, -36.774 +2292, -166, -35.021 +2292, -158, -33.255 +2292, -149, -31.476 +2292, -140, -29.684 +2292, -131, -27.878 +2292, -123, -26.060 +2292, -114, -24.228 +2292, -105, -22.384 +2292, -96, -20.526 +2292, -88, -18.655 +2292, -79, -16.771 +2292, -70, -14.874 +2292, -61, -12.963 +2292, -52, -11.040 +2292, -44, -9.104 +2292, -35, -7.154 +2292, -26, -5.192 +2292, -17, -3.216 +2292, -9, -1.227 +2292, -2, 0.000 +2292, 2, 1.280 +2292, 9, 3.044 +2292, 17, 5.261 +2292, 26, 7.492 +2292, 35, 9.737 +2292, 44, 11.997 +2292, 52, 14.271 +2292, 61, 16.559 +2292, 70, 18.861 +2292, 79, 21.178 +2292, 88, 23.508 +2292, 96, 25.853 +2292, 105, 28.212 +2292, 114, 30.586 +2292, 123, 32.973 +2292, 131, 35.375 +2292, 140, 37.791 +2292, 149, 40.221 +2292, 158, 42.666 +2292, 166, 45.125 +2292, 175, 47.597 +2546, -175, -40.528 +2546, -166, -38.602 +2546, -158, -36.659 +2546, -149, -34.701 +2546, -140, -32.727 +2546, -131, -30.738 +2546, -123, -28.733 +2546, -114, -26.712 +2546, -105, -24.675 +2546, -96, -22.623 +2546, -88, -20.555 +2546, -79, -18.472 +2546, -70, -16.373 +2546, -61, -14.258 +2546, -52, -12.127 +2546, -44, -9.981 +2546, -35, -7.819 +2546, -26, -5.641 +2546, -17, -3.448 +2546, -9, -1.239 +2546, -2, 0.000 +2546, 2, 1.558 +2546, 9, 3.517 +2546, 17, 5.981 +2546, 26, 8.462 +2546, 35, 10.960 +2546, 44, 13.476 +2546, 52, 16.008 +2546, 61, 18.557 +2546, 70, 21.123 +2546, 79, 23.707 +2546, 88, 26.307 +2546, 96, 28.924 +2546, 105, 31.559 +2546, 114, 34.210 +2546, 123, 36.879 +2546, 131, 39.564 +2546, 140, 42.266 +2546, 149, 44.986 +2546, 158, 47.722 +2546, 166, 50.476 +2546, 175, 53.246 +2801, -175, -44.192 +2801, -166, -42.097 +2801, -158, -39.983 +2801, -149, -37.851 +2801, -140, -35.700 +2801, -131, -33.530 +2801, -123, -31.343 +2801, -114, -29.136 +2801, -105, -26.911 +2801, -96, -24.668 +2801, -88, -22.406 +2801, -79, -20.125 +2801, -70, -17.826 +2801, -61, -15.509 +2801, -52, -13.173 +2801, -44, -10.818 +2801, -35, -8.445 +2801, -26, -6.053 +2801, -17, -3.643 +2801, -9, -1.214 +2801, -2, 0.000 +2801, 2, 1.875 +2801, 9, 4.030 +2801, 17, 6.742 +2801, 26, 9.474 +2801, 35, 12.226 +2801, 44, 14.998 +2801, 52, 17.790 +2801, 61, 20.603 +2801, 70, 23.435 +2801, 79, 26.288 +2801, 88, 29.160 +2801, 96, 32.053 +2801, 105, 34.966 +2801, 114, 37.899 +2801, 123, 40.852 +2801, 131, 43.826 +2801, 140, 46.819 +2801, 149, 49.832 +2801, 158, 52.866 +2801, 166, 55.919 +2801, 175, 58.993 +3056, -175, -47.762 +3056, -166, -45.503 +3056, -158, -43.223 +3056, -149, -40.921 +3056, -140, -38.598 +3056, -131, -36.253 +3056, -123, -33.886 +3056, -114, -31.498 +3056, -105, -29.088 +3056, -96, -26.656 +3056, -88, -24.203 +3056, -79, -21.728 +3056, -70, -19.231 +3056, -61, -16.713 +3056, -52, -14.173 +3056, -44, -11.612 +3056, -35, -9.029 +3056, -26, -6.424 +3056, -17, -3.797 +3056, -9, -1.149 +3056, -2, 0.000 +3056, 2, 2.235 +3056, 9, 4.586 +3056, 17, 7.546 +3056, 26, 10.530 +3056, 35, 13.537 +3056, 44, 16.567 +3056, 52, 19.621 +3056, 61, 22.699 +3056, 70, 25.799 +3056, 79, 28.924 +3056, 88, 32.072 +3056, 96, 35.243 +3056, 105, 38.438 +3056, 114, 41.656 +3056, 123, 44.898 +3056, 131, 48.163 +3056, 140, 51.452 +3056, 149, 54.764 +3056, 158, 58.100 +3056, 166, 61.459 +3056, 175, 64.842 +3310, -175, -51.235 +3310, -166, -48.818 +3310, -158, -46.377 +3310, -149, -43.910 +3310, -140, -41.418 +3310, -131, -38.902 +3310, -123, -36.360 +3310, -114, -33.793 +3310, -105, -31.202 +3310, -96, -28.585 +3310, -88, -25.943 +3310, -79, -23.276 +3310, -70, -20.584 +3310, -61, -17.868 +3310, -52, -15.126 +3310, -44, -12.359 +3310, -35, -9.567 +3310, -26, -6.750 +3310, -17, -3.908 +3310, -9, -1.041 +3310, -2, 0.000 +3310, 2, 2.642 +3310, 9, 5.190 +3310, 17, 8.398 +3310, 26, 11.634 +3310, 35, 14.897 +3310, 44, 18.187 +3310, 52, 21.504 +3310, 61, 24.849 +3310, 70, 28.220 +3310, 79, 31.619 +3310, 88, 35.044 +3310, 96, 38.497 +3310, 105, 41.977 +3310, 114, 45.485 +3310, 123, 49.019 +3310, 131, 52.581 +3310, 140, 56.169 +3310, 149, 59.785 +3310, 158, 63.428 +3310, 166, 67.098 +3310, 175, 70.795 +3565, -175, -54.608 +3565, -166, -52.038 +3565, -158, -49.440 +3565, -149, -46.814 +3565, -140, -44.158 +3565, -131, -41.474 +3565, -123, -38.761 +3565, -114, -36.020 +3565, -105, -33.250 +3565, -96, -30.451 +3565, -88, -27.624 +3565, -79, -24.767 +3565, -70, -21.883 +3565, -61, -18.969 +3565, -52, -16.027 +3565, -44, -13.056 +3565, -35, -10.057 +3565, -26, -7.029 +3565, -17, -3.972 +3565, -9, -0.886 +3565, -2, 0.000 +3565, 2, 3.100 +3565, 9, 5.844 +3565, 17, 9.301 +3565, 26, 12.790 +3565, 35, 16.310 +3565, 44, 19.861 +3565, 52, 23.443 +3565, 61, 27.056 +3565, 70, 30.700 +3565, 79, 34.376 +3565, 88, 38.082 +3565, 96, 41.820 +3565, 105, 45.588 +3565, 114, 49.388 +3565, 123, 53.219 +3565, 131, 57.081 +3565, 140, 60.974 +3565, 149, 64.899 +3565, 158, 68.854 +3565, 166, 72.840 +3565, 175, 76.858 +3820, -175, -57.877 +3820, -166, -55.160 +3820, -158, -52.411 +3820, -149, -49.628 +3820, -140, -46.814 +3820, -131, -43.966 +3820, -123, -41.087 +3820, -114, -38.174 +3820, -105, -35.229 +3820, -96, -32.251 +3820, -88, -29.241 +3820, -79, -26.198 +3820, -70, -23.123 +3820, -61, -20.015 +3820, -52, -16.874 +3820, -44, -13.701 +3820, -35, -10.495 +3820, -26, -7.256 +3820, -17, -3.985 +3820, -9, -0.682 +3820, -2, 0.000 +3820, 2, 3.612 +3820, 9, 6.552 +3820, 17, 10.259 +3820, 26, 14.001 +3820, 35, 17.779 +3820, 44, 21.592 +3820, 52, 25.441 +3820, 61, 29.324 +3820, 70, 33.244 +3820, 79, 37.198 +3820, 88, 41.188 +3820, 96, 45.213 +3820, 105, 49.274 +3820, 114, 53.370 +3820, 123, 57.502 +3820, 131, 61.668 +3820, 140, 65.870 +3820, 149, 70.108 +3820, 158, 74.381 +3820, 166, 78.689 +3820, 175, 83.033 +4074, -175, -61.040 +4074, -166, -58.181 +4074, -158, -55.285 +4074, -149, -52.352 +4074, -140, -49.382 +4074, -131, -46.376 +4074, -123, -43.333 +4074, -114, -40.253 +4074, -105, -37.136 +4074, -96, -33.982 +4074, -88, -30.792 +4074, -79, -27.565 +4074, -70, -24.301 +4074, -61, -21.000 +4074, -52, -17.663 +4074, -44, -14.289 +4074, -35, -10.878 +4074, -26, -7.430 +4074, -17, -3.946 +4074, -9, -0.424 +4074, -2, 0.000 +4074, 2, 4.181 +4074, 9, 7.317 +4074, 17, 11.274 +4074, 26, 15.271 +4074, 35, 19.308 +4074, 44, 23.384 +4074, 52, 27.501 +4074, 61, 31.657 +4074, 70, 35.854 +4074, 79, 40.090 +4074, 88, 44.366 +4074, 96, 48.682 +4074, 105, 53.038 +4074, 114, 57.434 +4074, 123, 61.870 +4074, 131, 66.346 +4074, 140, 70.861 +4074, 149, 75.417 +4074, 158, 80.012 +4074, 166, 84.648 +4074, 175, 89.323 +4329, -175, -64.093 +4329, -166, -61.097 +4329, -158, -58.059 +4329, -149, -54.980 +4329, -140, -51.860 +4329, -131, -48.699 +4329, -123, -45.496 +4329, -114, -42.252 +4329, -105, -38.967 +4329, -96, -35.641 +4329, -88, -32.274 +4329, -79, -28.865 +4329, -70, -25.415 +4329, -61, -21.924 +4329, -52, -18.391 +4329, -44, -14.818 +4329, -35, -11.203 +4329, -26, -7.547 +4329, -17, -3.849 +4329, -9, -0.110 +4329, -2, 0.000 +4329, 2, 4.810 +4329, 9, 8.144 +4329, 17, 12.351 +4329, 26, 16.603 +4329, 35, 20.900 +4329, 44, 25.241 +4329, 52, 29.627 +4329, 61, 34.058 +4329, 70, 38.534 +4329, 79, 43.055 +4329, 88, 47.620 +4329, 96, 52.230 +4329, 105, 56.884 +4329, 114, 61.584 +4329, 123, 66.328 +4329, 131, 71.117 +4329, 140, 75.950 +4329, 149, 80.829 +4329, 158, 85.752 +4329, 166, 90.720 +4329, 175, 95.733 +4584, -175, -67.033 +4584, -166, -63.905 +4584, -158, -60.730 +4584, -149, -57.510 +4584, -140, -54.244 +4584, -131, -50.932 +4584, -123, -47.574 +4584, -114, -44.170 +4584, -105, -40.720 +4584, -96, -37.224 +4584, -88, -33.682 +4584, -79, -30.095 +4584, -70, -26.461 +4584, -61, -22.781 +4584, -52, -19.055 +4584, -44, -15.284 +4584, -35, -11.466 +4584, -26, -7.602 +4584, -17, -3.693 +4584, -9, 0.000 +4584, -2, 0.000 +4584, 2, 5.505 +4584, 9, 9.035 +4584, 17, 13.493 +4584, 26, 18.001 +4584, 35, 22.559 +4584, 44, 27.166 +4584, 52, 31.824 +4584, 61, 36.531 +4584, 70, 41.288 +4584, 79, 46.095 +4584, 88, 50.952 +4584, 96, 55.859 +4584, 105, 60.816 +4584, 114, 65.822 +4584, 123, 70.879 +4584, 131, 75.985 +4584, 140, 81.141 +4584, 149, 86.347 +4584, 158, 91.603 +4584, 166, 96.909 +4584, 175, 102.265 +4838, -175, -69.856 +4838, -166, -66.602 +4838, -158, -63.296 +4838, -149, -59.939 +4838, -140, -56.531 +4838, -131, -53.073 +4838, -123, -49.563 +4838, -114, -46.003 +4838, -105, -42.391 +4838, -96, -38.729 +4838, -88, -35.015 +4838, -79, -31.251 +4838, -70, -27.436 +4838, -61, -23.569 +4838, -52, -19.652 +4838, -44, -15.684 +4838, -35, -11.665 +4838, -26, -7.595 +4838, -17, -3.473 +4838, -9, 0.000 +4838, -2, 0.000 +4838, 2, 6.267 +4838, 9, 9.994 +4838, 17, 14.703 +4838, 26, 19.468 +4838, 35, 24.287 +4838, 44, 29.162 +4838, 52, 34.093 +4838, 61, 39.078 +4838, 70, 44.119 +4838, 79, 49.216 +4838, 88, 54.367 +4838, 96, 59.574 +4838, 105, 64.836 +4838, 114, 70.153 +4838, 123, 75.526 +4838, 131, 80.954 +4838, 140, 86.437 +4838, 149, 91.976 +4838, 158, 97.570 +4838, 166, 103.219 +4838, 175, 108.923 +5093, -175, -72.560 +5093, -166, -69.184 +5093, -158, -65.752 +5093, -149, -62.263 +5093, -140, -58.718 +5093, -131, -55.117 +5093, -123, -51.460 +5093, -114, -47.747 +5093, -105, -43.977 +5093, -96, -40.151 +5093, -88, -36.269 +5093, -79, -32.331 +5093, -70, -28.336 +5093, -61, -24.285 +5093, -52, -20.178 +5093, -44, -16.015 +5093, -35, -11.795 +5093, -26, -7.520 +5093, -17, -3.188 +5093, -9, 0.000 +5093, -2, 0.000 +5093, 2, 7.100 +5093, 9, 11.025 +5093, 17, 15.986 +5093, 26, 21.007 +5093, 35, 26.090 +5093, 44, 31.234 +5093, 52, 36.439 +5093, 61, 41.704 +5093, 70, 47.031 +5093, 79, 52.419 +5093, 88, 57.868 +5093, 96, 63.378 +5093, 105, 68.949 +5093, 114, 74.580 +5093, 123, 80.273 +5093, 131, 86.027 +5093, 140, 91.842 +5093, 149, 97.718 +5093, 158, 103.655 +5093, 166, 109.653 +5093, 175, 115.711 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/EM_drag.vemd b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/EM_drag.vemd new file mode 100644 index 0000000000000000000000000000000000000000..8f19a01f94dafe2c71abc340636925e81d99a404 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/EM_drag.vemd @@ -0,0 +1,24 @@ +n [rpm] , T_drag [Nm] +0, -2.96 +25.4647908947033, -3.09 +254.647908947033, -4.18 +509.295817894065, -5.4 +763.943726841098, -6.62 +1018.59163578813, -7.84 +1273.23954473516, -9.06 +1527.8874536822, -10.28 +1782.53536262923, -11.5 +2037.18327157626, -12.72 +2291.83118052329, -13.94 +2546.47908947033, -15.16 +2801.12699841736, -16.38 +3055.77490736439, -17.6 +3310.42281631142, -18.81 +3565.07072525846, -20.03 +3819.71863420549, -21.25 +4074.36654315252, -22.47 +4329.01445209955, -23.69 +4583.66236104659, -24.91 +4838.31026999362, -26.13 +5092.95817894065, -27.35 + diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/EM_drag_P0vsP1.vemd b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/EM_drag_P0vsP1.vemd new file mode 100644 index 0000000000000000000000000000000000000000..c61509fd5ff68a5cf076cc7783d04dfcb642927e --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/EM_drag_P0vsP1.vemd @@ -0,0 +1,23 @@ +n [rpm] , T_drag [Nm] +0, -0.84 +25.4647908947033, -0.88 +254.647908947033, -1.17 +509.295817894065, -1.49 +763.943726841098, -1.81 +1018.59163578813, -2.13 +1273.23954473516, -2.45 +1527.8874536822, -2.78 +1782.53536262923, -3.1 +2037.18327157626, -3.42 +2291.83118052329, -3.74 +2546.47908947033, -4.06 +2801.12699841736, -4.39 +3055.77490736439, -4.71 +3310.42281631142, -5.03 +3565.07072525846, -5.35 +3819.71863420549, -5.67 +4074.36654315252, -5.99 +4329.01445209955, -6.32 +4583.66236104659, -6.64 +4838.31026999362, -6.96 +5092.95817894065, -7.28 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/EM_fld.vemp b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/EM_fld.vemp new file mode 100644 index 0000000000000000000000000000000000000000..7b37356afc337be13eec9c6a548b4187716b9e55 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/EM_fld.vemp @@ -0,0 +1,23 @@ +n [rpm] , T_drive [Nm] , T_drag [Nm] +0, 712.50, -712.50 +25, 712.50, -712.50 +255, 712.50, -712.50 +509, 712.50, -712.50 +764, 712.50, -712.50 +1019, 712.50, -712.50 +1273, 712.50, -712.50 +1528, 593.75, -593.75 +1783, 508.93, -508.93 +2037, 445.31, -445.31 +2292, 395.83, -395.83 +2546, 356.25, -356.25 +2801, 323.86, -323.86 +3056, 296.88, -296.88 +3310, 274.04, -274.04 +3565, 254.46, -254.46 +3820, 237.50, -237.50 +4074, 222.66, -222.66 +4329, 209.56, -209.56 +4584, 197.92, -197.92 +4838, 187.50, -187.50 +5093, 178.13, -178.13 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/EM_fld_P0vsP1.vemp b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/EM_fld_P0vsP1.vemp new file mode 100644 index 0000000000000000000000000000000000000000..57219ed8cc00d3a22c66032aff7addfd6a012afb --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/EM_fld_P0vsP1.vemp @@ -0,0 +1,23 @@ +n [rpm] , T_drive [Nm] , T_drag [Nm] +0, 175.00, -175.00 +25, 175.00, -175.00 +255, 175.00, -175.00 +509, 175.00, -175.00 +764, 175.00, -175.00 +1019, 175.00, -175.00 +1273, 175.00, -175.00 +1528, 145.83, -145.83 +1783, 125.00, -125.00 +2037, 109.38, -109.38 +2292, 97.22, -97.22 +2546, 87.50, -87.50 +2801, 79.55, -79.55 +3056, 72.92, -72.92 +3310, 67.31, -67.31 +3565, 62.50, -62.50 +3820, 58.33, -58.33 +4074, 54.69, -54.69 +4329, 51.47, -51.47 +4584, 48.61, -48.61 +4838, 46.05, -46.05 +5093, 43.75, -43.75 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/EM_fld_P0vsP1_lim50Nm.vemp b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/EM_fld_P0vsP1_lim50Nm.vemp new file mode 100644 index 0000000000000000000000000000000000000000..aa1894d42cc2fc3d7ff03ab1d49e03f2ad05a9af --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/EM_fld_P0vsP1_lim50Nm.vemp @@ -0,0 +1,23 @@ +n [rpm] , T_drive [Nm] , T_drag [Nm] +0, 50.00, -175.00 +25, 50.00, -175.00 +255, 50.00, -175.00 +509, 50.00, -175.00 +764, 50.00, -175.00 +1019, 50.00, -175.00 +1273, 50.00, -175.00 +1528, 41.67, -145.83 +1783, 35.71, -125.00 +2037, 31.25, -109.38 +2292, 27.78, -97.22 +2546, 25.00, -87.50 +2801, 22.73, -79.55 +3056, 20.83, -72.92 +3310, 19.23, -67.31 +3565, 17.86, -62.50 +3820, 16.67, -58.33 +4074, 15.63, -54.69 +4329, 14.71, -51.47 +4584, 13.89, -48.61 +4838, 13.16, -46.05 +5093, 12.50, -43.75 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Gear_direct.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Gear_direct.vtlm new file mode 100644 index 0000000000000000000000000000000000000000..b3c7d9e45f94cbe8f42cdefca18f041b7cc57b91 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Gear_direct.vtlm @@ -0,0 +1,11 @@ +Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm] +0,-50000,750 +0,-250,3.75 +0,0,0 +0,250,3.75 +0,50000,750 +5000,-50000,750 +5000,-845,12.75 +5000,0,12.75 +5000,845,12.75 +5000,50000,750 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Gear_indirect.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Gear_indirect.vtlm new file mode 100644 index 0000000000000000000000000000000000000000..e0814908e0733ebe234425eeaf6e770348abb2bf --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Gear_indirect.vtlm @@ -0,0 +1,11 @@ +Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm] +0,-50000,1500 +0,-125,3.75 +0,0,0 +0,125,3.75 +0,50000,1500 +5000,-50000,1500 +5000,-780,23.25 +5000,0,23.25 +5000,780,23.25 +5000,50000,1500 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/GenericBattery.vbatr b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/GenericBattery.vbatr new file mode 100644 index 0000000000000000000000000000000000000000..a6939be42acc832210d10b61c2ab817f3cf37334 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/GenericBattery.vbatr @@ -0,0 +1,3 @@ +SoC, Ri +0, 0.024 +100, 0.024 \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/GenericBattery.vbatv b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/GenericBattery.vbatv new file mode 100644 index 0000000000000000000000000000000000000000..1ab0be228cb46b20a8afdff14afabf4298379b31 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/GenericBattery.vbatv @@ -0,0 +1,12 @@ +SOC, V +0, 628.6 +10, 653.5 +20, 667.7 +30, 675.4 +40, 679.2 +50, 681.3 +60, 682.9 +70, 684.9 +80, 687.9 +90, 692.7 +100, 700.2 \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/GenericBattery.vreess b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/GenericBattery.vreess new file mode 100644 index 0000000000000000000000000000000000000000..a0bec6867413cdb5cdfac8265412d12cd34a2fb3 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/GenericBattery.vreess @@ -0,0 +1,19 @@ +{ + "Header": { + "CreatedBy": "", + "Date": "2021-06-16T09:37:48.3166199Z", + "AppVersion": "3", + "FileVersion": 1 + }, + "Body": { + "SavedInDeclMode": false, + "REESSType": "Battery", + "Model": "Generic Battery", + "Capacity": 42.86, + "SOC_min": 25, + "SOC_max": 75, + "MaxCurrentMap": "MaxCurrent.vimax", + "InternalResistanceCurve": "GenericBattery.vbatr", + "SoCCurve": "GenericBattery.vbatv" + } +} \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/GenericBattery_1kWh.vreess b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/GenericBattery_1kWh.vreess new file mode 100644 index 0000000000000000000000000000000000000000..2f943aa9a4fe6c575380808402fa24636e87f02b --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/GenericBattery_1kWh.vreess @@ -0,0 +1,19 @@ +{ + "Header": { + "CreatedBy": "", + "Date": "2021-06-16T09:37:48.3166199Z", + "AppVersion": "3", + "FileVersion": 1 + }, + "Body": { + "SavedInDeclMode": false, + "REESSType": "Battery", + "Model": "Generic Battery", + "Capacity": 2.96, + "SOC_min": 25, + "SOC_max": 75, + "MaxCurrentMap": "MaxCurrent.vimax", + "InternalResistanceCurve": "GenericBattery.vbatr", + "SoCCurve": "GenericBattery.vbatv" + } +} \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/GenericBattery_small.vreess b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/GenericBattery_small.vreess new file mode 100644 index 0000000000000000000000000000000000000000..1fa8e017b9914fbe8767af8da6349ed05db6fb44 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/GenericBattery_small.vreess @@ -0,0 +1,19 @@ +{ + "Header": { + "CreatedBy": "", + "Date": "2021-06-16T09:37:48.3166199Z", + "AppVersion": "3", + "FileVersion": 1 + }, + "Body": { + "SavedInDeclMode": false, + "REESSType": "Battery", + "Model": "Generic Battery", + "Capacity": 20.00, + "SOC_min": 25, + "SOC_max": 75, + "MaxCurrentMap": "MaxCurrent.vimax", + "InternalResistanceCurve": "GenericBattery.vbatr", + "SoCCurve": "GenericBattery.vbatv" + } +} \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/GenericEMotor.vem b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/GenericEMotor.vem new file mode 100644 index 0000000000000000000000000000000000000000..dce48f8a9b1367d9d2d379b048e91703d84fab27 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/GenericEMotor.vem @@ -0,0 +1,33 @@ +{ + "Header": { + "CreatedBy": "", + "Date": "2021-08-05T14:49:40.5920495Z", + "AppVersion": "3", + "FileVersion": 3 + }, + "Body": { + "SavedInDeclMode": false, + "Model": "Generic Electric Motor", + "Inertia": 0.22, + "ContinuousTorque": 475, + "ContinuousTorqueSpeed": 1273.23954473516, + "OverloadTorque": 712.5, + "OverloadTorqueSpeed": 1273.23954473516, + "OverloadTime": 60, + "ThermalOverloadRecoveryFactor": 0.9, + "VoltageLevels": [ + { + "Voltage": 0.0, + "FullLoadCurve": "EM_fld.vemp", + "DragCurve": "EM_drag.vemd", + "EfficiencyMap": "EM_Map.vemo" + }, + { + "Voltage": 1000.0, + "FullLoadCurve": "EM_fld.vemp", + "DragCurve": "EM_drag.vemd", + "EfficiencyMap": "EM_Map.vemo" + } + ] + } +} \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/GenericEMotor_P0vsP1.vem b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/GenericEMotor_P0vsP1.vem new file mode 100644 index 0000000000000000000000000000000000000000..3286ae5ded3db598efbe38c1ce89aede9c53c33c --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/GenericEMotor_P0vsP1.vem @@ -0,0 +1,33 @@ +{ + "Header": { + "CreatedBy": "", + "Date": "2021-12-03T09:41:27.8515448Z", + "AppVersion": "3", + "FileVersion": 3 + }, + "Body": { + "SavedInDeclMode": false, + "Model": "Generic Electric Motor", + "Inertia": 0.22, + "ContinuousTorque": 150.0, + "ContinuousTorqueSpeed": 1273.23954473516, + "OverloadTorque": 175.0, + "OverloadTorqueSpeed": 1273.23954473516, + "OverloadTime": 60.0, + "ThermalOverloadRecoveryFactor": 0.9, + "VoltageLevels": [ + { + "Voltage": 0.0, + "FullLoadCurve": "EM_fld_P0vsP1.vemp", + "DragCurve": "EM_drag_P0vsP1.vemd", + "EfficiencyMap": "EM_MapP0vsP1.vemo" + }, + { + "Voltage": 1000.0, + "FullLoadCurve": "EM_fld_P0vsP1.vemp", + "DragCurve": "EM_drag_P0vsP1.vemd", + "EfficiencyMap": "EM_MapP0vsP1.vemo" + } + ] + } +} \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Group31a_7.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Group31a_7.7l.veng new file mode 100644 index 0000000000000000000000000000000000000000..06f1a27374827b8b2eb7d2ded6b36de10e8e155f --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Group31a_7.7l.veng @@ -0,0 +1,35 @@ +{ + "Header": { + "CreatedBy": "", + "Date": "2021-08-05T14:39:31.3138689Z", + "AppVersion": "3", + "FileVersion": 5 + }, + "Body": { + "SavedInDeclMode": false, + "ModelName": "Generic220kW_7.7l", + "Displacement": "7700", + "IdlingSpeed": 700.0, + "Inertia": 3.195, + "Fuels": [ + { + "WHTC-Urban": 0.0, + "WHTC-Rural": 0.0, + "WHTC-Motorway": 0.0, + "WHTC-Engineering": 1.060275, + "ColdHotBalancingFactor": 0.0, + "CFRegPer": 0.0, + "FuelMap": "Group31a_Map.vmap", + "FuelType": "DieselCI" + } + ], + "RatedPower": 220000, + "RatedSpeed": 2000.0, + "MaxTorque": 1250, + "FullLoadCurve": "Group31a_fld.vfld", + "WHRType": [ + "None" + ], + "WHRCorrectionFactors": {} + } +} \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Group31a_Map.vmap b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Group31a_Map.vmap new file mode 100644 index 0000000000000000000000000000000000000000..ec80b740a51d82563e633a698d390a5e5f902d66 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Group31a_Map.vmap @@ -0,0 +1,171 @@ +engine speed [rpm],torque [Nm],fuel consumption [g/h] +610.34,0.00,611.02 +610.34,71.24,1414.10 +610.34,101.77,1792.47 +610.34,202.28,3057.43 +610.34,304.05,4334.27 +610.34,405.83,5594.85 +610.34,506.33,7266.60 +610.34,608.10,8910.45 +610.34,708.61,10535.90 +610.34,810.38,12066.42 +610.34,912.16,13591.66 +610.34,1012.66,15104.14 +610.34,1114.43,16635.69 +610.34,1216.21,18170.83 +610.34,1407.03,21067.53 +789.66,0.00,847.08 +789.66,73.42,1683.21 +789.66,104.89,2181.66 +789.66,208.46,3798.21 +789.66,313.35,5447.89 +789.66,418.23,7104.24 +789.66,521.81,9229.57 +789.66,626.69,11322.66 +789.66,730.27,13400.68 +789.66,835.15,15390.03 +789.66,940.04,17371.54 +789.66,1043.61,19324.82 +789.66,1148.50,21301.65 +789.66,1253.38,23281.37 +789.66,1450.04,27006.78 +968.97,0.00,1079.46 +968.97,74.79,1992.06 +968.97,106.85,2583.38 +968.97,212.36,4565.53 +968.97,319.20,6604.87 +968.97,426.05,8668.77 +968.97,531.56,11044.72 +968.97,638.40,13332.80 +968.97,743.91,15595.75 +968.97,850.76,17857.81 +968.97,957.60,20137.36 +968.97,1063.11,22419.29 +968.97,1169.96,24694.87 +968.97,1276.80,26981.91 +968.97,1477.14,31298.21 +1148.28,0.00,1310.20 +1148.28,75.74,2203.61 +1148.28,108.19,2872.56 +1148.28,215.03,5158.96 +1148.28,323.23,7520.31 +1148.28,431.42,9919.83 +1148.28,538.26,12434.71 +1148.28,646.45,14808.45 +1148.28,753.29,17136.15 +1148.28,861.49,19564.56 +1148.28,969.68,22029.10 +1148.28,1076.52,24515.99 +1148.28,1184.71,27007.76 +1148.28,1292.91,29913.39 +1148.28,1495.77,35603.91 +1327.59,0.00,1675.02 +1327.59,76.42,2585.48 +1327.59,109.18,3363.34 +1327.59,216.99,5984.99 +1327.59,326.16,8719.48 +1327.59,435.34,11475.30 +1327.59,543.15,14163.91 +1327.59,652.33,16903.18 +1327.59,760.14,19760.92 +1327.59,869.32,22570.43 +1327.59,978.49,25245.34 +1327.59,1086.31,27915.71 +1327.59,1195.48,30685.72 +1327.59,1304.66,33603.81 +1327.59,1509.36,39127.83 +1506.90,0.00,2024.78 +1506.90,76.95,2994.48 +1506.90,109.93,3862.57 +1506.90,218.48,6794.60 +1506.90,328.40,9923.97 +1506.90,438.33,13051.42 +1506.90,546.88,16193.07 +1506.90,656.81,19266.92 +1506.90,765.36,22381.49 +1506.90,875.29,25493.52 +1506.90,985.21,28516.75 +1506.90,1093.76,31447.85 +1506.90,1203.69,34771.87 +1506.90,1313.62,38149.65 +1506.90,1519.73,44575.00 +1686.21,0.00,2411.40 +1686.21,77.36,3491.80 +1686.21,110.52,4441.15 +1686.21,219.65,7649.28 +1686.21,330.17,11175.66 +1686.21,440.68,14668.61 +1686.21,549.82,18158.93 +1686.21,660.33,21528.74 +1686.21,769.47,24955.40 +1686.21,879.98,28559.00 +1686.21,990.50,32114.70 +1686.21,1099.63,35831.61 +1686.21,1210.15,39846.93 +1686.21,1320.67,43938.51 +1686.21,1527.88,51807.64 +1865.52,0.00,2877.01 +1865.52,77.69,4168.30 +1865.52,110.99,5187.51 +1865.52,220.60,8621.68 +1865.52,331.59,12553.20 +1865.52,442.58,16393.69 +1865.52,552.19,20307.63 +1865.52,663.18,24173.08 +1865.52,772.79,27965.62 +1865.52,883.78,32061.81 +1865.52,994.77,36249.12 +1865.52,1104.38,40444.51 +1865.52,1215.37,44498.97 +1865.52,1326.36,48560.63 +1865.52,1534.47,56169.45 +2044.83,0.00,3506.63 +2044.83,77.97,4795.77 +2044.83,111.39,5912.02 +2044.83,221.38,9675.08 +2044.83,332.77,13951.53 +2044.83,444.15,18233.05 +2044.83,554.14,22469.16 +2044.83,665.53,26876.92 +2044.83,775.52,31549.81 +2044.83,886.91,36239.65 +2044.83,998.30,40850.04 +2044.83,1108.29,45487.26 +2044.83,1219.67,50184.79 +2044.83,1331.06,54886.25 +2044.83,1539.91,63755.17 +2224.14,0.00,4122.96 +2224.14,78.20,5409.80 +2224.14,111.72,6639.96 +2224.14,222.03,10817.00 +2224.14,333.75,15403.78 +2224.14,445.47,20267.59 +2224.14,555.78,25325.10 +2224.14,667.50,30435.72 +2224.14,777.82,35913.59 +2224.14,889.53,41453.33 +2224.14,1001.25,46527.17 +2224.14,1111.57,51515.28 +2224.14,1223.28,56515.42 +2224.14,1335.00,61535.22 +2224.14,1544.47,70887.59 +610.34,-76.16,0.00 +789.66,-80.96,0.00 +968.97,-85.01,0.00 +1148.28,-88.32,0.00 +1327.59,-98.55,0.00 +1506.90,-106.01,0.00 +1686.21,-118.71,0.00 +1865.52,-133.71,0.00 +2044.83,-148.82,0.00 +2224.14,-165.24,0.00 +610.34,-86.16,0.00 +789.66,-90.96,0.00 +968.97,-95.01,0.00 +1148.28,-98.32,0.00 +1327.59,-108.55,0.00 +1506.90,-116.01,0.00 +1686.21,-128.71,0.00 +1865.52,-143.71,0.00 +2044.83,-158.82,0.00 +2224.14,-175.24,0.00 \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Group31a_fld.vfld b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Group31a_fld.vfld new file mode 100644 index 0000000000000000000000000000000000000000..8d5b80d0a874893635294aa47155cc4e27d97849 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Group31a_fld.vfld @@ -0,0 +1,6 @@ +engine speed [1/min], full load torque [Nm], motoring torque [Nm] +700.00,437.50,-78.56 +1181.00,1250.00,-88.90 +1545.00,1250.00,-107.92 +2000.00,1050.42,-144.72 +2494.00,0.00,-190.10 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/HEV_Parameter.vhctl b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/HEV_Parameter.vhctl new file mode 100644 index 0000000000000000000000000000000000000000..c11c1f714b36274b2f398f74df6cbb75f8224fb9 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/HEV_Parameter.vhctl @@ -0,0 +1,20 @@ +{ + "Header": { + "CreatedBy": "", + "Date": "2021-06-16T09:26:18.2012105Z", + "AppVersion": "3", + "FileVersion": 1 + }, + "Body": { + "EquivalenceFactorDischarge": 2.53529411764706, + "EquivalenceFactorCharge": 1.83175, + "MinSoC": 25, + "MaxSoC": 75, + "TargetSoC": 50.0, + "AuxBufferTime": 5.0, + "AuxBufferChgTime": 5.0, + "MinICEOnTime": 3.0, + "ICEStartPenaltyFactor": 0.1, + "CostFactorSOCExponent": 1 + } +} \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/MaxCurrent.vimax b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/MaxCurrent.vimax new file mode 100644 index 0000000000000000000000000000000000000000..adf28fb9b5ced83296d2634fc6727e2d1b82357e --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/MaxCurrent.vimax @@ -0,0 +1,3 @@ +SOC, I_charge, I_discharge +0, 1620, 1620 +100, 1620, 1620 \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/NonSmart_BusAux_ESfrom HV.vaux b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/NonSmart_BusAux_ESfrom HV.vaux new file mode 100644 index 0000000000000000000000000000000000000000..6b1ffdf14f0d41b6dafe731f649a83368eb0c22e --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/NonSmart_BusAux_ESfrom HV.vaux @@ -0,0 +1,34 @@ +{ + "Header": { + "CreatedBy": "", + "Date": "2021-11-17T15:08:01.2732788Z", + "AppVersion": "3", + "FileVersion": 1 + }, + "Body": { + "PneumaticSystem": { + "CompressorMap": "DEFAULT_2-Cylinder_2-Stage_398ccm.ACMP", + "AverageAirDemand": 1.4, + "SmartAirCompression": false, + "GearRatio": 1.2 + }, + "ElectricSystem": { + "AlternatorEfficiency": 0.7, + "CurrentDemand": 65.77, + "CurrentDemandEngineOffDriving": 65.77, + "CurrentDemandEngineOffStandstill": 56.46, + "AlternatorType": "None", + "ElectricStorageCapacity": 540.0, + "BatteryEfficiency": 0.93, + "MaxAlternatorPower": 12735.0, + "DCDCConverterEfficiency": 0.97, + "ESSupplyFromHEVREESS": true + }, + "HVAC": { + "ElectricPowerDemand": 765.0, + "MechanicalPowerDemand": 500.0, + "AuxHeaterPower": 0.0, + "AverageHeatingDemand": 0.0 + } + } +} \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/P1_CityBus.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/P1_CityBus.vecto new file mode 100644 index 0000000000000000000000000000000000000000..f091bf02aad0b258a9024c89f0477e0bd1b260a1 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/P1_CityBus.vecto @@ -0,0 +1,54 @@ +{ + "Header": { + "CreatedBy": "", + "Date": "2021-12-20T11:05:15.8021584Z", + "AppVersion": "3", + "FileVersion": 8 + }, + "Body": { + "SavedInDeclMode": false, + "EngineOnlyMode": false, + "VehicleFile": "P1_Group31a.vveh", + "EngineFile": "Group31a_7.7l.veng", + "GearboxFile": "AMT_12.vgbx", + "TCU": "AMT_12.vgbx", + "HybridStrategyParams": "HEV_Parameter.vhctl", + "BusAux": "Smart_BusAux.vaux", + "Padd": 2000.0, + "Paux_ICEOff_Driving": 0.0, + "Paux_ICEOff_Standstill": 0.0, + "Padd_electric": 0.0, + "VACC": "Bus.vacc", + "EngineStopStartAtVehicleStopThreshold": 2.0, + "EngineStopStartMaxOffTimespan": 120.0, + "EngineStopStartUtilityFactor": 0.8, + "EngineStopStartUtilityFactorDriving": 0.8, + "EcoRollMinSpeed": 60.000000000000007, + "EcoRollActivationDelay": 2.0, + "EcoRollUnderspeedThreshold": 0.0, + "EcoRollMaxAcceleration": 0.1, + "PCCEnableSpeed": 80.0, + "PCCMinSpeed": 50.0, + "PCCUnderspeed": 8.0, + "PCCOverSpeed": 5.0, + "PCCPreviewDistanceUC1": 1500.0, + "PCCPreviewDistanceUC2": 1000.0, + "LAC": { + "Enabled": true, + "PreviewDistanceFactor": 10.0, + "DF_offset": 2.5, + "DF_scaling": 1.5, + "DF_targetSpeedLookup": "", + "Df_velocityDropLookup": "", + "MinSpeed": 50.0 + }, + "OverSpeedEcoRoll": { + "Mode": "Off", + "MinSpeed": 50.0, + "OverSpeed": 2.5 + }, + "Cycles": [ + "Urban.vdri" + ] + } +} \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/P1_Group31a.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/P1_Group31a.vveh new file mode 100644 index 0000000000000000000000000000000000000000..d8ef049f148e537689bc9c50b99d3f80ad2fe25c --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/P1_Group31a.vveh @@ -0,0 +1,86 @@ +{ + "Header": { + "CreatedBy": "", + "Date": "2021-08-05T14:50:38.8085781Z", + "AppVersion": "3", + "FileVersion": 10 + }, + "Body": { + "SavedInDeclMode": false, + "VehCat": "CityBus", + "LegislativeClass": "Unknown", + "CurbWeight": 11975, + "CurbWeightExtra": 0.0, + "MassMax": 19.5, + "Loading": 1123.632, + "rdyn": 465, + "CdCorrMode": "CdofVdecl", + "CdCorrFile": "", + "AxleConfig": { + "Type": "4x2", + "Axles": [ + { + "Inertia": 11.9, + "Wheels": "275/70 R22.5", + "AxleWeightShare": 0.375, + "TwinTyres": false, + "RRCISO": 0.0034, + "FzISO": 31300.0, + "Type": "VehicleNonDriven" + }, + { + "Inertia": 11.9, + "Wheels": "275/70 R22.5", + "AxleWeightShare": 0.625, + "TwinTyres": true, + "RRCISO": 0.004, + "FzISO": 31300.0, + "Type": "VehicleDriven" + } + ] + }, + "EngineStopStart": true, + "EcoRoll": "None", + "PredictiveCruiseControl": "None", + "ATEcoRollReleaseLockupClutch": false, + "CdA": 4.9, + "VehicleHeight": 3.10, + "IdlingSpeed": 700.0, + "Retarder": { + "Type": "None", + "Ratio": 0.0, + "File": "" + }, + "Angledrive": { + "Type": "None", + "Ratio": 0.0, + "LossMap": "" + }, + "PTO": { + "Type": "None", + "LossMap": "", + "Cycle": "", + "CycleDriving": "" + }, + "TorqueLimits": {}, + "MaxPropulsionTorque": "Torque_limit_1250Nm.vtqp", + "InitialSoC": 50.0, + "PowertrainConfiguration": "ParallelHybrid", + "ElectricMotors": [ + { + "Count": 1, + "Ratio": 1.6, + "Position": "P1", + "MotorFile": "GenericEMotor.vem", + "MechanicalEfficiency": 0.98 + } + ], + "Batteries": [ + { + "NumPacks": 1, + "BatteryFile": "GenericBattery.vreess", + "StreamId": 0 + } + ] + } +} \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Smart_BusAux.vaux b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Smart_BusAux.vaux new file mode 100644 index 0000000000000000000000000000000000000000..47aaa075b4e6e6710098764f6887a4f5d9eab73c --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Smart_BusAux.vaux @@ -0,0 +1,34 @@ +{ + "Header": { + "CreatedBy": "", + "Date": "2021-12-02T17:15:51.9588754Z", + "AppVersion": "3", + "FileVersion": 1 + }, + "Body": { + "PneumaticSystem": { + "CompressorMap": "DEFAULT_2-Cylinder_2-Stage_398ccm.ACMP", + "AverageAirDemand": 1.4, + "SmartAirCompression": false, + "GearRatio": 1.2 + }, + "ElectricSystem": { + "AlternatorEfficiency": 0.7, + "CurrentDemand": 65.77, + "CurrentDemandEngineOffDriving": 65.77, + "CurrentDemandEngineOffStandstill": 56.46, + "AlternatorType": "Conventional", + "ElectricStorageCapacity": 540.0, + "BatteryEfficiency": 0.93, + "MaxAlternatorPower": 12735.0, + "DCDCConverterEfficiency": 0.98, + "ESSupplyFromHEVREESS": false + }, + "HVAC": { + "ElectricPowerDemand": 765.0, + "MechanicalPowerDemand": 500.0, + "AuxHeaterPower": 0.0, + "AverageHeatingDemand": 0.0 + } + } +} \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Smart_BusAux_ESfrom HV.vaux b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Smart_BusAux_ESfrom HV.vaux new file mode 100644 index 0000000000000000000000000000000000000000..6b1ffdf14f0d41b6dafe731f649a83368eb0c22e --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Smart_BusAux_ESfrom HV.vaux @@ -0,0 +1,34 @@ +{ + "Header": { + "CreatedBy": "", + "Date": "2021-11-17T15:08:01.2732788Z", + "AppVersion": "3", + "FileVersion": 1 + }, + "Body": { + "PneumaticSystem": { + "CompressorMap": "DEFAULT_2-Cylinder_2-Stage_398ccm.ACMP", + "AverageAirDemand": 1.4, + "SmartAirCompression": false, + "GearRatio": 1.2 + }, + "ElectricSystem": { + "AlternatorEfficiency": 0.7, + "CurrentDemand": 65.77, + "CurrentDemandEngineOffDriving": 65.77, + "CurrentDemandEngineOffStandstill": 56.46, + "AlternatorType": "None", + "ElectricStorageCapacity": 540.0, + "BatteryEfficiency": 0.93, + "MaxAlternatorPower": 12735.0, + "DCDCConverterEfficiency": 0.97, + "ESSupplyFromHEVREESS": true + }, + "HVAC": { + "ElectricPowerDemand": 765.0, + "MechanicalPowerDemand": 500.0, + "AuxHeaterPower": 0.0, + "AverageHeatingDemand": 0.0 + } + } +} \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/TorqueConverter.vtcc b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/TorqueConverter.vtcc new file mode 100644 index 0000000000000000000000000000000000000000..ab26835861c60ee6ae3c3d611d6d94d3e48ea48f --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/TorqueConverter.vtcc @@ -0,0 +1,13 @@ +Speed Ratio, Torque Ratio,MP1000 +0.000,5.172,510.204 +0.073,3.793,467.687 +0.147,3.221,425.170 +0.220,2.783,382.653 +0.294,2.414,340.136 +0.367,2.088,297.619 +0.441,1.794,255.102 +0.514,1.523,195.578 +0.588,1.271,136.054 +0.661,1.034,76.531 +0.734,0.885,0.000 + diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Torque_limit_1250Nm.vtqp b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Torque_limit_1250Nm.vtqp new file mode 100644 index 0000000000000000000000000000000000000000..6c97e6d899204f26c07a8ab261762fe6601daff9 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Torque_limit_1250Nm.vtqp @@ -0,0 +1,6 @@ +n [rpm], T_drive [Nm] +0,1250 +699,1250 +700,812.5 +1181,0 +2494,0 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Torque_limit_P0vsP1.vtqp b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Torque_limit_P0vsP1.vtqp new file mode 100644 index 0000000000000000000000000000000000000000..a6cb6533e1a443ed2e7ed809bb9e3c04a6785d73 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Torque_limit_P0vsP1.vtqp @@ -0,0 +1,6 @@ +n [rpm], T_drive [Nm] +0,50 +699,50 +700,50 +1181,50 +2494,0 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Urban.vdri b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Urban.vdri new file mode 100644 index 0000000000000000000000000000000000000000..8644fd1ae4d755dd5c299c84934386e751f5970d --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/Urban.vdri @@ -0,0 +1,130 @@ +<s>,<v>,<grad>,<stop> +0,0,-7,12.6 +1,23.7,-7,0 +2,23.7,-7,0 +5,23.7,-7.1,0 +10,23.7,-7.2,0 +18,23.7,-7.3,0 +24,23.7,-7.2,0 +30,23.7,-7.1,0 +33,23.7,-7,0 +35,23.7,-6.9,0 +38,23.7,-6.8,0 +39,23.7,-6.7,0 +40,23.7,-6.6,0 +42,23.7,-6.5,0 +43,23.7,-6.4,0 +44,23.7,-6.3,0 +45,23.7,-6.2,0 +47,23.7,-6.1,0 +48,23.7,-6,0 +49,23.7,-5.8,0 +51,23.7,-5.6,0 +52,23.7,-5.5,0 +53,23.7,-5.3,0 +55,23.7,-5.2,0 +56,23.7,-5,0 +57,23.7,-4.8,0 +58,23.7,-4.6,0 +60,23.7,-4.5,0 +61,23.7,-4.3,0 +62,23.7,-4.1,0 +63,23.7,-3.9,0 +64,23.7,-3.8,0 +65,23.7,-3.6,0 +66,23.7,-3.3,0 +68,23.7,-3.1,0 +69,23.7,-2.9,0 +70,23.7,-2.7,0 +71,23.7,-2.5,0 +72,23.7,-2.4,0 +73,23.7,-2.2,0 +74,23.7,-2,0 +75,23.7,-1.8,0 +76,23.7,-1.6,0 +77,23.7,-1.4,0 +78,23.7,-1.2,0 +79,23.7,-1,0 +80,23.7,-0.8,0 +81,23.7,-0.6,0 +82,23.7,-0.4,0 +83,23.7,-0.2,0 +84,23.7,0,0 +85,23.7,0.2,0 +86,23.7,0.4,0 +87,23.7,0.6,0 +88,23.7,0.8,0 +89,23.7,1,0 +90,23.7,1.2,0 +91,10,1.4,0 +92,10,1.6,0 +93,10,1.8,0 +94,18.4,2,0 +95,18.4,2.1,0 +96,18.4,2.3,0 +97,18.4,2.5,0 +98,18.4,2.7,0 +99,18.4,2.8,0 +100,18.4,3,0 +101,18.4,3.2,0 +102,18.4,3.3,0 +103,18.4,3.5,0 +104,18.4,3.7,0 +105,18.4,3.9,0 +106,18.4,4,0 +107,18.4,4.2,0 +108,18.4,4.3,0 +109,18.4,4.5,0 +110,18.4,4.6,0 +111,18.4,4.7,0 +112,18.4,4.9,0 +113,18.4,5,0 +114,18.4,5.1,0 +115,18.4,5.2,0 +116,18.4,5.3,0 +117,18.4,5.5,0 +118,18.4,5.6,0 +119,18.4,5.7,0 +120,18.4,5.8,0 +121,18.4,5.9,0 +123,18.4,6,0 +124,18.4,6.1,0 +125,18.4,6.2,0 +127,18.4,6.3,0 +129,18.4,6.4,0 +130,14.1,6.4,0 +132,14.1,6.5,0 +139,14.1,6.4,0 +142,14.1,6.3,0 +144,14.1,6.2,0 +146,14.1,6.1,0 +147,14.1,5.9,0 +149,14.1,5.8,0 +151,14.1,5.6,0 +153,14.1,5.4,0 +155,14.1,5.2,0 +156,14.1,5.1,0 +157,14.1,5,0 +158,14.1,4.8,0 +159,14.1,4.7,0 +160,14.1,4.5,0 +161,14.1,4.4,0 +162,14.1,4.3,0 +163,14.1,4.1,0 +164,14.1,4,0 +165,14.1,3.8,0 +166,14.1,3.7,0 +167,0,3.4,5.6 +168,31.2,3.4,0 +169,31.2,3.1,0 +170,31.2,2.9,0 +171,31.2,2.8,0 +172,31.2,2.6,0 +173,31.2,2.5,0 +174,31.2,2.3,0 +175,31.2,2.2,0 +176,31.2,2,0 +177,31.2,1.8,0 +178,31.2,1.6,0 +179,31.2,1.5,0 +180,31.2,1.3,0 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/VEH_retarder_cardanshaft.vrlm b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/VEH_retarder_cardanshaft.vrlm new file mode 100644 index 0000000000000000000000000000000000000000..e26a38c51595067395dbf98f8ee20759ba911c97 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/VECTO-1493/VEH_retarder_cardanshaft.vrlm @@ -0,0 +1,15 @@ +Retarder Speed [1/min],Torque Loss [Nm] +0,10 +200,10.08 +400,10.32 +600,10.72 +900,11.62 +1200,12.88 +1600,15.12 +2000,18 +2500,22.5 +3000,28 +3500,34.5 +4000,42 +4500,50.5 +5000,60 diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj index 3faf7e0509d51e23b4518f239cdcfed63201f7b3..16149c3e0bf3b4adc18c244ae6e3b7545f61ed1d 100644 --- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj +++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj @@ -451,15 +451,6 @@ <None Include="TestData\Components\AT_GBX\GearboxSerial8Spd.vgbx"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> - <None Include="TestData\Components\ElectricMotor\vem_P_inverter_DC_90_coarse.vemo"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Components\ElectricMotor\vem_P_inverter_DC_90_fine.vemo"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Components\ElectricMotor\vem_P_inverter_DC_std.vemo"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> <None Include="TestData\Components\GearshiftLinesVoith.vgsv"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> @@ -2827,6 +2818,114 @@ <None Include="TestData\Integration\ADAS-HEV\VECTO-1484\Truck.vacc"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\AMT_12.vgbx"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\Axle_4x2_LH.vtlm"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\Bus.vacc"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\DEFAULT_2-Cylinder_2-Stage_398ccm.ACMP"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\DRIVER_truck.vacc"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\EM_drag.vemd"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\EM_drag_P0vsP1.vemd"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\EM_fld.vemp"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\EM_fld_P0vsP1.vemp"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\EM_fld_P0vsP1_lim50Nm.vemp"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\EM_Map.vemo"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\EM_MapP0vsP1.vemo"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\Gear_direct.vtlm"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\Gear_indirect.vtlm"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\GenericBattery.vbatr"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\GenericBattery.vbatv"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\GenericBattery.vreess"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\GenericBattery_1kWh.vreess"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\GenericBattery_small.vreess"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\GenericEMotor.vem"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\GenericEMotor_P0vsP1.vem"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\Group31a_7.7l.veng"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\Group31a_fld.vfld"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\Group31a_Map.vmap"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\HEV_Parameter.vhctl"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\MaxCurrent.vimax"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\NonSmart_BusAux_ESfrom HV.vaux"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\P1_CityBus.vecto"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\P1_Group31a.vveh"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\Smart_BusAux.vaux"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\Smart_BusAux_ESfrom HV.vaux"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\TorqueConverter.vtcc"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\Torque_limit_1250Nm.vtqp"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\Torque_limit_P0vsP1.vtqp"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\Urban.vdri"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="TestData\Integration\ADAS-HEV\VECTO-1493\VEH_retarder_cardanshaft.vrlm"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> <None Include="TestData\Integration\ADAS-PEV\Group5PCCEng\325kW.vfld"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> @@ -3361,99 +3460,6 @@ <None Include="TestData\Integration\Buses\SingleBus.vecto"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\AMT_12.vgbx"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Axle_4x2_Tractor.vtlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Default.vrlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\EM_drag.vemd"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\EM_fld.vemp"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\EM_Map.vemo"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_1.vtlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_10.vtlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_11.vtlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_12.vtlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_2.vtlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_3.vtlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_4.vtlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_5.vtlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_6.vtlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_7.vtlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_8.vtlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Gear_9.vtlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Group5_ICE_fld.vfld"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Group5_ICE_Map.vmap"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\HEV_Parameter.vhctl"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\LongHaul_mod5_id_2.vdri"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\MaxCurrent.vimax"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\P1_Group5.vveh"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\P1_Group5_12.7l.veng"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\P1_Group5_EM.vem"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\P1_Group5_REESS.vreess"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\P1_Group5_s2c0_rep_Payload.vecto"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\REESS_Internal_Resistance.vbatr"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\REESS_SOC_curve.vbatv"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\EngineeringMode\P1_Group5_AMT\Truck.vacc"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> <None Include="TestData\Integration\ShiftStrategyV2\CityBus_AT_FCOpt\175kW.vfld"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> @@ -4536,54 +4542,6 @@ <None Include="TestData\Integration\DeclarationMode\40t Truck\Retarder.vrlm"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> - <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\175kW.vfld"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\175kW.vmap"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Axle_4x2.vtlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Axle_4x2_orig.vtlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Class2_RigidTruck.vveh"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Class2_RigidTruck_DECL.vecto"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Class2_RigidTruck_NoAirdrag.vveh"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Class2_RigidTruck_NoAirdrag_DECL.vecto"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Engine_175kW_6.8l.veng"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Gear_1.vtlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Gear_2.vtlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Gear_3.vtlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Gear_4.vtlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Gear_5.vtlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\Gear_6.vtlm"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_ESS\MT_6.vgbx"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> <None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\175kW.vfld"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None>