From c892ebe7c5325a83574f01c345005da3ba78ab1d Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Wed, 11 Aug 2021 19:10:51 +0200
Subject: [PATCH] added combined tests for comparison of ADAS
---
VECTO.sln.DotSettings | 1 +
.../Simulation/Impl/SimulatorFactory.cs | 3 +-
.../Integration/ADAS/ADASTestsConventional.cs | 187 +++++++++++-------
...ass5_Tractor_ENG_PCC123EcoEngineStop.vecto | 63 ------
...Class5_Tractor_ENG_WithoutEngineStop.vecto | 63 ------
...=> Class5_Tractor_EcoRollEngineStop.vecto} | 4 +-
... => Class5_Tractor_EcoRollEngineStop.vveh} | 2 +-
...ss5_Tractor_EcoRollWithoutEngineStop.vecto | 63 ++++++
...ss5_Tractor_EcoRollWithoutEngineStop.vveh} | 2 +-
..._ENG.vecto => Class5_Tractor_NoADAS.vecto} | 4 +-
...ractor.vveh => Class5_Tractor_NoADAS.vveh} | 2 +-
...PCC12.vecto => Class5_Tractor_PCC12.vecto} | 2 +-
...C123.vecto => Class5_Tractor_PCC123.vecto} | 2 +-
...ss5_Tractor_PCC123EcoRollEngineStop.vecto} | 4 +-
...ass5_Tractor_PCC123EcoRollEngineStop.vveh} | 4 +-
...actor_PCC123EcoRollWithoutEngineStop.vecto | 63 ++++++
...actor_PCC123EcoRollWithoutEngineStop.vveh} | 4 +-
VectoCore/VectoCoreTest/VectoCoreTest.csproj | 24 +--
18 files changed, 276 insertions(+), 221 deletions(-)
delete mode 100644 VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG_PCC123EcoEngineStop.vecto
delete mode 100644 VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG_WithoutEngineStop.vecto
rename VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/{Class5_Tractor_ENG_WithEngineStop.vecto => Class5_Tractor_EcoRollEngineStop.vecto} (93%)
rename VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/{Class5_TractorWithEngineStop.vveh => Class5_Tractor_EcoRollEngineStop.vveh} (98%)
create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_EcoRollWithoutEngineStop.vecto
rename VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/{Class5_TractorWithoutEngineStop.vveh => Class5_Tractor_EcoRollWithoutEngineStop.vveh} (98%)
rename VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/{Class5_Tractor_ENG.vecto => Class5_Tractor_NoADAS.vecto} (94%)
rename VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/{Class5_Tractor.vveh => Class5_Tractor_NoADAS.vveh} (98%)
rename VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/{Class5_Tractor_ENG_PCC12.vecto => Class5_Tractor_PCC12.vecto} (97%)
rename VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/{Class5_Tractor_ENG_PCC123.vecto => Class5_Tractor_PCC123.vecto} (97%)
rename VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/{Class5_Tractor_ENG_PCC123Eco.vecto => Class5_Tractor_PCC123EcoRollEngineStop.vecto} (93%)
rename VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/{Class5_Tractor_PCC123EcoEngineStop.vveh => Class5_Tractor_PCC123EcoRollEngineStop.vveh} (96%)
create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123EcoRollWithoutEngineStop.vecto
rename VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/{Class5_Tractor_PCC123EcoNoEngineStop.vveh => Class5_Tractor_PCC123EcoRollWithoutEngineStop.vveh} (96%)
diff --git a/VECTO.sln.DotSettings b/VECTO.sln.DotSettings
index da4f5cb20a..b88df5f54a 100644
--- a/VECTO.sln.DotSettings
+++ b/VECTO.sln.DotSettings
@@ -110,6 +110,7 @@
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsWrapperSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EVB_002ECodeStyle_002ESettingsUpgrade_002EVBSpaceAfterUnaryMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EXml_002ECodeStyle_002EFormatSettingsUpgrade_002EXmlMoveToCommonFormatterSettingsUpgrade/@EntryIndexedValue">True</s:Boolean>
+ <s:Boolean x:Key="/Default/UserDictionary/Words/=actuations/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Airdrag/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Angledrive/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Axlegear/@EntryIndexedValue">True</s:Boolean>
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
index afc3a8bdc4..a92f711d82 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
@@ -65,13 +65,14 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
}
public SimulatorFactory(ExecutionMode mode, IInputDataProvider dataProvider, IOutputDataWriter writer,
- IDeclarationReport declarationReport = null, IVTPReport vtpReport = null, bool validate = true)
+ IDeclarationReport declarationReport = null, IVTPReport vtpReport = null, bool validate = true, bool writeModalResults = false)
{
Log.Info("########## VectoCore Version {0} ##########", Assembly.GetExecutingAssembly().GetName().Version);
JobNumber = Interlocked.Increment(ref _jobNumberCounter);
_mode = mode;
ModWriter = writer;
Validate = validate;
+ WriteModalResults = writeModalResults;
ThreadPool.GetMinThreads(out var workerThreads, out var completionThreads);
if (workerThreads < 12) {
diff --git a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs
index 2ee8043051..3e4aee3213 100644
--- a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs
+++ b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsConventional.cs
@@ -2,9 +2,15 @@
using System.Linq;
using Ninject;
using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.InputData.FileIO.XML;
+using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.OutputData;
@@ -17,13 +23,13 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
[Parallelizable(ParallelScope.All)]
public class ADASTestsConventional
{
- private const string Group5NoPCC = @"TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_ENG.vecto";
- private const string Group5PCC12 = @"TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_ENG_PCC12.vecto";
- private const string Group5PCC123 = @"TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_ENG_PCC123.vecto";
- private const string Group5PCC123EcoNoEngineStop = @"TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_ENG_PCC123Eco.vecto";
- private const string Group5PCC123EcoEngineStop = @"TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_ENG_PCC123EcoEngineStop.vecto";
- private const string Group5WithEngineStop = @"TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_ENG_WithEngineStop.vecto";
- private const string Group5WithOutEngineStop = @"TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_ENG_WithoutEngineStop.vecto";
+ private const string Group5NoADAS = @"TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_NoADAS.vecto";
+ private const string Group5EcoRollWithoutEngineStop = @"TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_EcoRollWithoutEngineStop.vecto";
+ private const string Group5EcoRollEngineStop = @"TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_EcoRollEngineStop.vecto";
+ private const string Group5PCC12 = @"TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_PCC12.vecto";
+ private const string Group5PCC123 = @"TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_PCC123.vecto";
+ private const string Group5PCC123EcoRollWithoutEngineStop = @"TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_PCC123EcoRollWithoutEngineStop.vecto";
+ private const string Group5PCC123EcoRollEngineStop = @"TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_PCC123EcoRollEngineStop.vecto";
private IXMLInputDataReader _xmlInputReader;
private IKernel _kernel;
@@ -215,44 +221,44 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
// FC: Group5NoPCC <= Group5PCC12 <= Group5PCC123 <= Group5PCC123EcoEngineStop
// FC for Group5PCC123EcoNoEngineStop can sometimes be bigger than all others.
- [TestCase(Group5WithOutEngineStop, 0, TestName = "G5Eng EcoRoll Without Engine Stop CrestCoast 1"),
- TestCase(Group5WithOutEngineStop, 1, TestName = "G5Eng EcoRoll Without Engine Stop CrestCoast 2"),
- TestCase(Group5WithOutEngineStop, 2, TestName = "G5Eng EcoRoll Without Engine Stop Case A"), // Case A
- TestCase(Group5WithOutEngineStop, 3, TestName = "G5Eng EcoRoll Without Engine Stop Case B"), // Case B
- TestCase(Group5WithOutEngineStop, 4, TestName = "G5Eng EcoRoll Without Engine Stop Case C"), // Case C
- TestCase(Group5WithOutEngineStop, 5, TestName = "G5Eng EcoRoll Without Engine Stop Case D"), // Case D
- TestCase(Group5WithOutEngineStop, 6, TestName = "G5Eng EcoRoll Without Engine Stop Case E"), // Case E
- TestCase(Group5WithOutEngineStop, 7, TestName = "G5Eng EcoRoll Without Engine Stop Case F"), // Case F
- TestCase(Group5WithOutEngineStop, 8, TestName = "G5Eng EcoRoll Without Engine Stop Case G"), // Case G
- TestCase(Group5WithOutEngineStop, 9, TestName = "G5Eng EcoRoll Without Engine Stop Case H"), // Case H
- TestCase(Group5WithOutEngineStop, 10, TestName = "G5Eng EcoRoll Without Engine Stop Case I"), // Case I
- TestCase(Group5WithOutEngineStop, 11, TestName = "G5Eng EcoRoll Without Engine Stop Case J"), // Case J
-
- TestCase(Group5WithEngineStop, 0, TestName = "G5Eng EcoRoll With Engine Stop CrestCoast 1"),
- TestCase(Group5WithEngineStop, 1, TestName = "G5Eng EcoRoll With Engine Stop CrestCoast 2"),
- TestCase(Group5WithEngineStop, 2, TestName = "G5Eng EcoRoll With Engine Stop Case A"), // Case A
- TestCase(Group5WithEngineStop, 3, TestName = "G5Eng EcoRoll With Engine Stop Case B"), // Case B
- TestCase(Group5WithEngineStop, 4, TestName = "G5Eng EcoRoll With Engine Stop Case C"), // Case C
- TestCase(Group5WithEngineStop, 5, TestName = "G5Eng EcoRoll With Engine Stop Case D"), // Case D
- TestCase(Group5WithEngineStop, 6, TestName = "G5Eng EcoRoll With Engine Stop Case E"), // Case E
- TestCase(Group5WithEngineStop, 7, TestName = "G5Eng EcoRoll With Engine Stop Case F"), // Case F
- TestCase(Group5WithEngineStop, 8, TestName = "G5Eng EcoRoll With Engine Stop Case G"), // Case G
- TestCase(Group5WithEngineStop, 9, TestName = "G5Eng EcoRoll With Engine Stop Case H"), // Case H
- TestCase(Group5WithEngineStop, 10, TestName = "G5Eng EcoRoll With Engine Stop Case I"), // Case I
- TestCase(Group5WithEngineStop, 11, TestName = "G5Eng EcoRoll With Engine Stop Case J"), // Case J
-
- TestCase(Group5NoPCC, 0, TestName = "G5Eng NoPCC CrestCoast 1"),
- TestCase(Group5NoPCC, 1, TestName = "G5Eng NoPCC CrestCoast 2"),
- TestCase(Group5NoPCC, 2, TestName = "G5Eng NoPCC Case A"), // Case A
- TestCase(Group5NoPCC, 3, TestName = "G5Eng NoPCC Case B"), // Case B
- TestCase(Group5NoPCC, 4, TestName = "G5Eng NoPCC Case C"), // Case C
- TestCase(Group5NoPCC, 5, TestName = "G5Eng NoPCC Case D"), // Case D
- TestCase(Group5NoPCC, 6, TestName = "G5Eng NoPCC Case E"), // Case E
- TestCase(Group5NoPCC, 7, TestName = "G5Eng NoPCC Case F"), // Case F
- TestCase(Group5NoPCC, 8, TestName = "G5Eng NoPCC Case G"), // Case G
- TestCase(Group5NoPCC, 9, TestName = "G5Eng NoPCC Case H"), // Case H
- TestCase(Group5NoPCC, 10, TestName = "G5Eng NoPCC Case I"), // Case I
- TestCase(Group5NoPCC, 11, TestName = "G5Eng NoPCC Case J"), // Case J
+ [TestCase(Group5EcoRollWithoutEngineStop, 0, TestName = "G5Eng EcoRoll Without Engine Stop CrestCoast 1"),
+ TestCase(Group5EcoRollWithoutEngineStop, 1, TestName = "G5Eng EcoRoll Without Engine Stop CrestCoast 2"),
+ TestCase(Group5EcoRollWithoutEngineStop, 2, TestName = "G5Eng EcoRoll Without Engine Stop Case A"), // Case A
+ TestCase(Group5EcoRollWithoutEngineStop, 3, TestName = "G5Eng EcoRoll Without Engine Stop Case B"), // Case B
+ TestCase(Group5EcoRollWithoutEngineStop, 4, TestName = "G5Eng EcoRoll Without Engine Stop Case C"), // Case C
+ TestCase(Group5EcoRollWithoutEngineStop, 5, TestName = "G5Eng EcoRoll Without Engine Stop Case D"), // Case D
+ TestCase(Group5EcoRollWithoutEngineStop, 6, TestName = "G5Eng EcoRoll Without Engine Stop Case E"), // Case E
+ TestCase(Group5EcoRollWithoutEngineStop, 7, TestName = "G5Eng EcoRoll Without Engine Stop Case F"), // Case F
+ TestCase(Group5EcoRollWithoutEngineStop, 8, TestName = "G5Eng EcoRoll Without Engine Stop Case G"), // Case G
+ TestCase(Group5EcoRollWithoutEngineStop, 9, TestName = "G5Eng EcoRoll Without Engine Stop Case H"), // Case H
+ TestCase(Group5EcoRollWithoutEngineStop, 10, TestName = "G5Eng EcoRoll Without Engine Stop Case I"), // Case I
+ TestCase(Group5EcoRollWithoutEngineStop, 11, TestName = "G5Eng EcoRoll Without Engine Stop Case J"), // Case J
+
+ TestCase(Group5EcoRollEngineStop, 0, TestName = "G5Eng EcoRoll With Engine Stop CrestCoast 1"),
+ TestCase(Group5EcoRollEngineStop, 1, TestName = "G5Eng EcoRoll With Engine Stop CrestCoast 2"),
+ TestCase(Group5EcoRollEngineStop, 2, TestName = "G5Eng EcoRoll With Engine Stop Case A"), // Case A
+ TestCase(Group5EcoRollEngineStop, 3, TestName = "G5Eng EcoRoll With Engine Stop Case B"), // Case B
+ TestCase(Group5EcoRollEngineStop, 4, TestName = "G5Eng EcoRoll With Engine Stop Case C"), // Case C
+ TestCase(Group5EcoRollEngineStop, 5, TestName = "G5Eng EcoRoll With Engine Stop Case D"), // Case D
+ TestCase(Group5EcoRollEngineStop, 6, TestName = "G5Eng EcoRoll With Engine Stop Case E"), // Case E
+ TestCase(Group5EcoRollEngineStop, 7, TestName = "G5Eng EcoRoll With Engine Stop Case F"), // Case F
+ TestCase(Group5EcoRollEngineStop, 8, TestName = "G5Eng EcoRoll With Engine Stop Case G"), // Case G
+ TestCase(Group5EcoRollEngineStop, 9, TestName = "G5Eng EcoRoll With Engine Stop Case H"), // Case H
+ TestCase(Group5EcoRollEngineStop, 10, TestName = "G5Eng EcoRoll With Engine Stop Case I"), // Case I
+ TestCase(Group5EcoRollEngineStop, 11, TestName = "G5Eng EcoRoll With Engine Stop Case J"), // Case J
+
+ TestCase(Group5NoADAS, 0, TestName = "G5Eng NoPCC CrestCoast 1"),
+ TestCase(Group5NoADAS, 1, TestName = "G5Eng NoPCC CrestCoast 2"),
+ TestCase(Group5NoADAS, 2, TestName = "G5Eng NoPCC Case A"), // Case A
+ TestCase(Group5NoADAS, 3, TestName = "G5Eng NoPCC Case B"), // Case B
+ TestCase(Group5NoADAS, 4, TestName = "G5Eng NoPCC Case C"), // Case C
+ TestCase(Group5NoADAS, 5, TestName = "G5Eng NoPCC Case D"), // Case D
+ TestCase(Group5NoADAS, 6, TestName = "G5Eng NoPCC Case E"), // Case E
+ TestCase(Group5NoADAS, 7, TestName = "G5Eng NoPCC Case F"), // Case F
+ TestCase(Group5NoADAS, 8, TestName = "G5Eng NoPCC Case G"), // Case G
+ TestCase(Group5NoADAS, 9, TestName = "G5Eng NoPCC Case H"), // Case H
+ TestCase(Group5NoADAS, 10, TestName = "G5Eng NoPCC Case I"), // Case I
+ TestCase(Group5NoADAS, 11, TestName = "G5Eng NoPCC Case J"), // Case J
// FuelConsumption should always be <= Group5NoPCC
TestCase(Group5PCC12, 0, TestName = "G5Eng PCC12 CrestCoast 1"),
@@ -281,30 +287,30 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
TestCase(Group5PCC123, 11, TestName = "G5Eng PCC123 Case J"), // Case J
// FuelConsumption can sometimes be greater than Group5PCC123 (because of engine idling)
- TestCase(Group5PCC123EcoNoEngineStop, 2, TestName = "G5Eng PCC123-Eco WithoutEngineStop Case A"), // Case A
- TestCase(Group5PCC123EcoNoEngineStop, 3, TestName = "G5Eng PCC123-Eco WithoutEngineStop Case B"), // Case B
- TestCase(Group5PCC123EcoNoEngineStop, 4, TestName = "G5Eng PCC123-Eco WithoutEngineStop Case C"), // Case C
- TestCase(Group5PCC123EcoNoEngineStop, 5, TestName = "G5Eng PCC123-Eco WithoutEngineStop Case D"), // Case D
- TestCase(Group5PCC123EcoNoEngineStop, 6, TestName = "G5Eng PCC123-Eco WithoutEngineStop Case E"), // Case E
- TestCase(Group5PCC123EcoNoEngineStop, 7, TestName = "G5Eng PCC123-Eco WithoutEngineStop Case F"), // Case F
- TestCase(Group5PCC123EcoNoEngineStop, 8, TestName = "G5Eng PCC123-Eco WithoutEngineStop Case G"), // Case G
- TestCase(Group5PCC123EcoNoEngineStop, 9, TestName = "G5Eng PCC123-Eco WithoutEngineStop Case H"), // Case H
- TestCase(Group5PCC123EcoNoEngineStop, 10, TestName = "G5Eng PCC123-Eco WithoutEngineStop Case I"), // Case I
- TestCase(Group5PCC123EcoNoEngineStop, 11, TestName = "G5Eng PCC123-Eco WithoutEngineStop Case J"), // Case J
+ TestCase(Group5PCC123EcoRollWithoutEngineStop, 2, TestName = "G5Eng PCC123-Eco WithoutEngineStop Case A"), // Case A
+ TestCase(Group5PCC123EcoRollWithoutEngineStop, 3, TestName = "G5Eng PCC123-Eco WithoutEngineStop Case B"), // Case B
+ TestCase(Group5PCC123EcoRollWithoutEngineStop, 4, TestName = "G5Eng PCC123-Eco WithoutEngineStop Case C"), // Case C
+ TestCase(Group5PCC123EcoRollWithoutEngineStop, 5, TestName = "G5Eng PCC123-Eco WithoutEngineStop Case D"), // Case D
+ TestCase(Group5PCC123EcoRollWithoutEngineStop, 6, TestName = "G5Eng PCC123-Eco WithoutEngineStop Case E"), // Case E
+ TestCase(Group5PCC123EcoRollWithoutEngineStop, 7, TestName = "G5Eng PCC123-Eco WithoutEngineStop Case F"), // Case F
+ TestCase(Group5PCC123EcoRollWithoutEngineStop, 8, TestName = "G5Eng PCC123-Eco WithoutEngineStop Case G"), // Case G
+ TestCase(Group5PCC123EcoRollWithoutEngineStop, 9, TestName = "G5Eng PCC123-Eco WithoutEngineStop Case H"), // Case H
+ TestCase(Group5PCC123EcoRollWithoutEngineStop, 10, TestName = "G5Eng PCC123-Eco WithoutEngineStop Case I"), // Case I
+ TestCase(Group5PCC123EcoRollWithoutEngineStop, 11, TestName = "G5Eng PCC123-Eco WithoutEngineStop Case J"), // Case J
// FuelConsumption should always be <= Group5PCC123
- TestCase(Group5PCC123EcoEngineStop, 0, TestName = "G5Eng PCC123-Eco-EngineStop CrestCoast 1"),
- TestCase(Group5PCC123EcoEngineStop, 1, TestName = "G5Eng PCC123-Eco-EngineStop CrestCoast 2"),
- TestCase(Group5PCC123EcoEngineStop, 2, TestName = "G5Eng PCC123-Eco-EngineStop Case A"), // Case A
- TestCase(Group5PCC123EcoEngineStop, 3, TestName = "G5Eng PCC123-Eco-EngineStop Case B"), // Case B
- TestCase(Group5PCC123EcoEngineStop, 4, TestName = "G5Eng PCC123-Eco-EngineStop Case C"), // Case C
- TestCase(Group5PCC123EcoEngineStop, 5, TestName = "G5Eng PCC123-Eco-EngineStop Case D"), // Case D
- TestCase(Group5PCC123EcoEngineStop, 6, TestName = "G5Eng PCC123-Eco-EngineStop Case E"), // Case E
- TestCase(Group5PCC123EcoEngineStop, 7, TestName = "G5Eng PCC123-Eco-EngineStop Case F"), // Case F
- TestCase(Group5PCC123EcoEngineStop, 8, TestName = "G5Eng PCC123-Eco-EngineStop Case G"), // Case G
- TestCase(Group5PCC123EcoEngineStop, 9, TestName = "G5Eng PCC123-Eco-EngineStop Case H"), // Case H
- TestCase(Group5PCC123EcoEngineStop, 10, TestName = "G5Eng PCC123-Eco-EngineStop Case I"), // Case I
- TestCase(Group5PCC123EcoEngineStop, 11, TestName = "G5Eng PCC123-Eco-EngineStop Case J"), // Case J
+ TestCase(Group5PCC123EcoRollEngineStop, 0, TestName = "G5Eng PCC123-Eco-EngineStop CrestCoast 1"),
+ TestCase(Group5PCC123EcoRollEngineStop, 1, TestName = "G5Eng PCC123-Eco-EngineStop CrestCoast 2"),
+ TestCase(Group5PCC123EcoRollEngineStop, 2, TestName = "G5Eng PCC123-Eco-EngineStop Case A"), // Case A
+ TestCase(Group5PCC123EcoRollEngineStop, 3, TestName = "G5Eng PCC123-Eco-EngineStop Case B"), // Case B
+ TestCase(Group5PCC123EcoRollEngineStop, 4, TestName = "G5Eng PCC123-Eco-EngineStop Case C"), // Case C
+ TestCase(Group5PCC123EcoRollEngineStop, 5, TestName = "G5Eng PCC123-Eco-EngineStop Case D"), // Case D
+ TestCase(Group5PCC123EcoRollEngineStop, 6, TestName = "G5Eng PCC123-Eco-EngineStop Case E"), // Case E
+ TestCase(Group5PCC123EcoRollEngineStop, 7, TestName = "G5Eng PCC123-Eco-EngineStop Case F"), // Case F
+ TestCase(Group5PCC123EcoRollEngineStop, 8, TestName = "G5Eng PCC123-Eco-EngineStop Case G"), // Case G
+ TestCase(Group5PCC123EcoRollEngineStop, 9, TestName = "G5Eng PCC123-Eco-EngineStop Case H"), // Case H
+ TestCase(Group5PCC123EcoRollEngineStop, 10, TestName = "G5Eng PCC123-Eco-EngineStop Case I"), // Case I
+ TestCase(Group5PCC123EcoRollEngineStop, 11, TestName = "G5Eng PCC123-Eco-EngineStop Case J"), // Case J
]
public void TestPCCEngineeringSampleCases(string jobName, int cycleIdx)
{
@@ -411,6 +417,53 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
//Assert.IsTrue(runs.FinishedWithoutErrors);
return jobContainer;
+ }
+
+ [TestCase]
+ public void CompareAllEngineeringJobs()
+ {
+ var jobName = Group5NoADAS;
+ var writer = new FileOutputWriter(Path.Combine(Path.GetDirectoryName(jobName), Path.GetFileName(jobName)));
+ var sumContainer = new SummaryDataContainer(writer);
+ var jobContainer = new JobContainer(sumContainer);
+
+ var jobNames = new[] {
+ Group5NoADAS,
+ Group5EcoRollWithoutEngineStop,
+ Group5EcoRollEngineStop,
+ Group5PCC12,
+ Group5PCC123,
+ Group5PCC123EcoRollWithoutEngineStop,
+ Group5PCC123EcoRollEngineStop,
+ };
+
+ var tasks = jobNames.Select(job => Task.Factory.StartNew(j =>
+ new SimulatorFactory(ExecutionMode.Engineering,
+ JSONInputDataFactory.ReadJsonJob((string)j), writer, validate: false, writeModalResults: true),
+ job, TaskCreationOptions.LongRunning));
+
+ foreach (var task in tasks) {
+ jobContainer.AddRuns(task.Result);
+ }
+
+ jobContainer.Execute();
+ jobContainer.WaitFinished();
+ var progress = jobContainer.GetProgress();
+
+ Assert.IsTrue(progress.All(r => r.Value.Success), string.Concat(progress.Select(r => r.Value.Error)));
+
+ var crestCoastRuns = sumContainer.Table.Select(@"[Job [-\]] LIKE '*-0'", "Job [-]");
+ var values = crestCoastRuns.Select(row => row.Field<ConvertedSI>("FC-Final [g/h]")).ToArray();
+ var (NoADAS, EcoRollNoStop, EcoRollEngineStop, PCC12, PCC123, PCC123NoEngineStop, PCC123EngineStop) = values;
+
+ foreach (var val in values) {
+ Console.WriteLine(val);
+ }
+
+
+
+
+
}
}
}
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG_PCC123EcoEngineStop.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG_PCC123EcoEngineStop.vecto
deleted file mode 100644
index 07877d3eae..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG_PCC123EcoEngineStop.vecto
+++ /dev/null
@@ -1,63 +0,0 @@
-{
- "Header": {
- "CreatedBy": "",
- "Date": "2021-08-04T15:20:20.0790743Z",
- "AppVersion": "3",
- "FileVersion": 5
- },
- "Body": {
- "SavedInDeclMode": false,
- "EngineOnlyMode": false,
- "VehicleFile": "Class5_Tractor_PCC123EcoEngineStop.vveh",
- "EngineFile": "Engine_325kW_12.7l.veng",
- "GearboxFile": "AMT_12.vgbx",
- "TCU": "AMT_12.vgbx",
- "ShiftStrategy": "",
- "Padd": 5000.0,
- "Paux_ICEOff_Driving": 0.0,
- "Paux_ICEOff_Standstill": 0.0,
- "VACC": "Truck.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": "Overspeed",
- "MinSpeed": 50.0,
- "OverSpeed": 2.5
- },
- "Cycles": [
- "CrestCoast1.vdri",
- "CrestCoast2.vdri",
- "Group5Eng_CaseA.vdri",
- "Group5Eng_CaseB.vdri",
- "Group5Eng_CaseC.vdri",
- "Group5Eng_CaseD.vdri",
- "Group5Eng_CaseE.vdri",
- "Group5Eng_CaseF.vdri",
- "Group5Eng_CaseG.vdri",
- "Group5Eng_CaseH.vdri",
- "Group5Eng_CaseI.vdri",
- "Group5Eng_CaseJ.vdri"
- ]
- }
-}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG_WithoutEngineStop.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG_WithoutEngineStop.vecto
deleted file mode 100644
index 6c29e4733c..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG_WithoutEngineStop.vecto
+++ /dev/null
@@ -1,63 +0,0 @@
-{
- "Header": {
- "CreatedBy": "",
- "Date": "2021-08-04T15:43:36.4316857Z",
- "AppVersion": "3",
- "FileVersion": 5
- },
- "Body": {
- "SavedInDeclMode": false,
- "EngineOnlyMode": false,
- "VehicleFile": "Class5_TractorWithoutEngineStop.vveh",
- "EngineFile": "Engine_325kW_12.7l.veng",
- "GearboxFile": "AMT_12.vgbx",
- "TCU": "AMT_12.vgbx",
- "ShiftStrategy": "",
- "Padd": 5000.0,
- "Paux_ICEOff_Driving": 0.0,
- "Paux_ICEOff_Standstill": 0.0,
- "VACC": "Truck.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": "Overspeed",
- "MinSpeed": 50.0,
- "OverSpeed": 2.5
- },
- "Cycles": [
- "CrestCoast1.vdri",
- "CrestCoast2.vdri",
- "Group5Eng_CaseA.vdri",
- "Group5Eng_CaseB.vdri",
- "Group5Eng_CaseC.vdri",
- "Group5Eng_CaseD.vdri",
- "Group5Eng_CaseE.vdri",
- "Group5Eng_CaseF.vdri",
- "Group5Eng_CaseG.vdri",
- "Group5Eng_CaseH.vdri",
- "Group5Eng_CaseI.vdri",
- "Group5Eng_CaseJ.vdri"
- ]
- }
-}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG_WithEngineStop.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_EcoRollEngineStop.vecto
similarity index 93%
rename from VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG_WithEngineStop.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_EcoRollEngineStop.vecto
index 96bc8f5dd2..1d08a9413d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG_WithEngineStop.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_EcoRollEngineStop.vecto
@@ -1,14 +1,14 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2021-08-04T15:43:19.4275704Z",
+ "Date": "2021-08-11T14:55:21.8570171Z",
"AppVersion": "3",
"FileVersion": 5
},
"Body": {
"SavedInDeclMode": false,
"EngineOnlyMode": false,
- "VehicleFile": "Class5_TractorWithEngineStop.vveh",
+ "VehicleFile": "Class5_Tractor_EcoRollEngineStop.vveh",
"EngineFile": "Engine_325kW_12.7l.veng",
"GearboxFile": "AMT_12.vgbx",
"TCU": "AMT_12.vgbx",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_TractorWithEngineStop.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_EcoRollEngineStop.vveh
similarity index 98%
rename from VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_TractorWithEngineStop.vveh
rename to VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_EcoRollEngineStop.vveh
index e23ec86cd1..fa2ee72ab3 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_TractorWithEngineStop.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_EcoRollEngineStop.vveh
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2021-08-04T15:43:14.9505960Z",
+ "Date": "2021-08-11T14:55:18.5397198Z",
"AppVersion": "3",
"FileVersion": 8
},
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_EcoRollWithoutEngineStop.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_EcoRollWithoutEngineStop.vecto
new file mode 100644
index 0000000000..13dbbaeaf5
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_EcoRollWithoutEngineStop.vecto
@@ -0,0 +1,63 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2021-08-11T14:55:41.9085124Z",
+ "AppVersion": "3",
+ "FileVersion": 5
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "Class5_Tractor_EcoRollWithoutEngineStop.vveh",
+ "EngineFile": "Engine_325kW_12.7l.veng",
+ "GearboxFile": "AMT_12.vgbx",
+ "TCU": "AMT_12.vgbx",
+ "ShiftStrategy": "",
+ "Padd": 5000.0,
+ "Paux_ICEOff_Driving": 0.0,
+ "Paux_ICEOff_Standstill": 0.0,
+ "VACC": "Truck.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": "Overspeed",
+ "MinSpeed": 50.0,
+ "OverSpeed": 2.5
+ },
+ "Cycles": [
+ "CrestCoast1.vdri",
+ "CrestCoast2.vdri",
+ "Group5Eng_CaseA.vdri",
+ "Group5Eng_CaseB.vdri",
+ "Group5Eng_CaseC.vdri",
+ "Group5Eng_CaseD.vdri",
+ "Group5Eng_CaseE.vdri",
+ "Group5Eng_CaseF.vdri",
+ "Group5Eng_CaseG.vdri",
+ "Group5Eng_CaseH.vdri",
+ "Group5Eng_CaseI.vdri",
+ "Group5Eng_CaseJ.vdri"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_TractorWithoutEngineStop.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_EcoRollWithoutEngineStop.vveh
similarity index 98%
rename from VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_TractorWithoutEngineStop.vveh
rename to VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_EcoRollWithoutEngineStop.vveh
index c40bd78b19..09e13559ea 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_TractorWithoutEngineStop.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_EcoRollWithoutEngineStop.vveh
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2021-08-04T15:43:32.3193775Z",
+ "Date": "2021-08-11T14:55:38.9089245Z",
"AppVersion": "3",
"FileVersion": 8
},
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_NoADAS.vecto
similarity index 94%
rename from VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_NoADAS.vecto
index d4f1da7713..d3c04df53d 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_NoADAS.vecto
@@ -1,14 +1,14 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2021-08-04T09:12:22.5467601Z",
+ "Date": "2021-08-11T15:31:10.9445325Z",
"AppVersion": "3",
"FileVersion": 5
},
"Body": {
"SavedInDeclMode": false,
"EngineOnlyMode": false,
- "VehicleFile": "Class5_Tractor.vveh",
+ "VehicleFile": "Class5_Tractor_NoADAS.vveh",
"EngineFile": "Engine_325kW_12.7l.veng",
"GearboxFile": "AMT_12.vgbx",
"TCU": "AMT_12.vgbx",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_NoADAS.vveh
similarity index 98%
rename from VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor.vveh
rename to VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_NoADAS.vveh
index 478360039e..366b72a1ac 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_NoADAS.vveh
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2021-08-04T09:12:17.5093776Z",
+ "Date": "2021-08-11T15:31:06.2542842Z",
"AppVersion": "3",
"FileVersion": 8
},
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG_PCC12.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC12.vecto
similarity index 97%
rename from VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG_PCC12.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC12.vecto
index 5e90b8d6de..ab7ffd4023 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG_PCC12.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC12.vecto
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2021-08-04T09:12:32.4672462Z",
+ "Date": "2021-08-11T14:55:56.6057724Z",
"AppVersion": "3",
"FileVersion": 5
},
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG_PCC123.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123.vecto
similarity index 97%
rename from VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG_PCC123.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123.vecto
index 677282aa24..660260fd69 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG_PCC123.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123.vecto
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2021-08-04T09:12:41.2973137Z",
+ "Date": "2021-08-11T14:56:07.5623195Z",
"AppVersion": "3",
"FileVersion": 5
},
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG_PCC123Eco.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123EcoRollEngineStop.vecto
similarity index 93%
rename from VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG_PCC123Eco.vecto
rename to VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123EcoRollEngineStop.vecto
index 9ad243cf57..41161d800b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_ENG_PCC123Eco.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123EcoRollEngineStop.vecto
@@ -1,14 +1,14 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2021-08-04T15:21:01.9876615Z",
+ "Date": "2021-08-11T14:56:24.8037720Z",
"AppVersion": "3",
"FileVersion": 5
},
"Body": {
"SavedInDeclMode": false,
"EngineOnlyMode": false,
- "VehicleFile": "Class5_Tractor_PCC123EcoNoEngineStop.vveh",
+ "VehicleFile": "Class5_Tractor_PCC123EcoRollEngineStop.vveh",
"EngineFile": "Engine_325kW_12.7l.veng",
"GearboxFile": "AMT_12.vgbx",
"TCU": "AMT_12.vgbx",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123EcoEngineStop.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123EcoRollEngineStop.vveh
similarity index 96%
rename from VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123EcoEngineStop.vveh
rename to VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123EcoRollEngineStop.vveh
index 6dd9cd168a..cde3723ef5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123EcoEngineStop.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123EcoRollEngineStop.vveh
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2021-08-04T15:20:16.8596579Z",
+ "Date": "2021-08-11T14:56:21.5069784Z",
"AppVersion": "3",
"FileVersion": 8
},
@@ -66,7 +66,7 @@
}
]
},
- "EngineStopStart": true,
+ "EngineStopStart": false,
"EcoRoll": "WithEngineStop",
"PredictiveCruiseControl": "Option_1_2_3",
"ATEcoRollReleaseLockupClutch": false,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123EcoRollWithoutEngineStop.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123EcoRollWithoutEngineStop.vecto
new file mode 100644
index 0000000000..d42086b044
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123EcoRollWithoutEngineStop.vecto
@@ -0,0 +1,63 @@
+{
+ "Header": {
+ "CreatedBy": "",
+ "Date": "2021-08-11T14:56:38.0110156Z",
+ "AppVersion": "3",
+ "FileVersion": 5
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "EngineOnlyMode": false,
+ "VehicleFile": "Class5_Tractor_PCC123EcoRollWithoutEngineStop.vveh",
+ "EngineFile": "Engine_325kW_12.7l.veng",
+ "GearboxFile": "AMT_12.vgbx",
+ "TCU": "AMT_12.vgbx",
+ "ShiftStrategy": "",
+ "Padd": 5000.0,
+ "Paux_ICEOff_Driving": 0.0,
+ "Paux_ICEOff_Standstill": 0.0,
+ "VACC": "Truck.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": "Overspeed",
+ "MinSpeed": 50.0,
+ "OverSpeed": 2.5
+ },
+ "Cycles": [
+ "CrestCoast1.vdri",
+ "CrestCoast2.vdri",
+ "Group5Eng_CaseA.vdri",
+ "Group5Eng_CaseB.vdri",
+ "Group5Eng_CaseC.vdri",
+ "Group5Eng_CaseD.vdri",
+ "Group5Eng_CaseE.vdri",
+ "Group5Eng_CaseF.vdri",
+ "Group5Eng_CaseG.vdri",
+ "Group5Eng_CaseH.vdri",
+ "Group5Eng_CaseI.vdri",
+ "Group5Eng_CaseJ.vdri"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123EcoNoEngineStop.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123EcoRollWithoutEngineStop.vveh
similarity index 96%
rename from VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123EcoNoEngineStop.vveh
rename to VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123EcoRollWithoutEngineStop.vveh
index 3d3d3f72c2..7b1eabb679 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123EcoNoEngineStop.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-Conventional/Group5PCCEng/Class5_Tractor_PCC123EcoRollWithoutEngineStop.vveh
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2021-08-04T15:20:56.4795793Z",
+ "Date": "2021-08-11T14:56:34.8508008Z",
"AppVersion": "3",
"FileVersion": 8
},
@@ -66,7 +66,7 @@
}
]
},
- "EngineStopStart": true,
+ "EngineStopStart": false,
"EcoRoll": "WithoutEngineStop",
"PredictiveCruiseControl": "Option_1_2_3",
"ATEcoRollReleaseLockupClutch": false,
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index c4f58810cd..49eee9cbb9 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -2266,28 +2266,28 @@
<None Include="TestData\Hybrids\Input CityBus 6x2_HEV_P2\Gear_9.vtlm">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_TractorWithEngineStop.vveh">
+ <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_EcoRollEngineStop.vveh">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_TractorWithoutEngineStop.vveh">
+ <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_EcoRollWithoutEngineStop.vveh">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_ENG_PCC123Eco.vecto">
+ <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_PCC123EcoRollEngineStop.vecto">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_ENG_PCC123EcoEngineStop.vecto">
+ <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_EcoRollEngineStop.vecto">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_ENG_WithEngineStop.vecto">
+ <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_EcoRollWithoutEngineStop.vecto">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_ENG_WithoutEngineStop.vecto">
+ <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_PCC123EcoRollEngineStop.vveh">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_PCC123EcoEngineStop.vveh">
+ <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_PCC123EcoRollWithoutEngineStop.vecto">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_PCC123EcoNoEngineStop.vveh">
+ <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_PCC123EcoRollWithoutEngineStop.vveh">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Integration\ADAS-HEV\Group5EcoRollEng\325kW.vfld">
@@ -3674,10 +3674,10 @@
<None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Axle_4x2_Tractor.vtlm">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_ENG_PCC123.vecto">
+ <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_PCC123.vecto">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_ENG_PCC12.vecto">
+ <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_PCC12.vecto">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_PCC123.vveh">
@@ -3686,10 +3686,10 @@
<None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_PCC12.vveh">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor.vveh">
+ <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_NoADAS.vveh">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_ENG.vecto">
+ <None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\Class5_Tractor_NoADAS.vecto">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Integration\ADAS-Conventional\Group5PCCEng\CrestCoast2.vdri">
--
GitLab