From 01afb0d4f5ee21f06fc1b24c99b463d70f88dff7 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Tue, 27 Jul 2021 17:38:38 +0200
Subject: [PATCH] ADAS-HEV Testcases running and behaving correctly

---
 VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs     | 4 ++--
 .../ADAS-HEV/Group5EcoRollEng/Class5_Tractor_ENG.vecto       | 4 ++--
 .../Integration/ADAS-HEV/Group5EcoRollEng/DriveDhSl1.3.vdri  | 5 -----
 .../{DriveDhSl1.5.vdri => DriveDhSl1.4.vdri}                 | 4 ++--
 .../Integration/ADAS-HEV/Group5EcoRollEng/DriveDhSl1.7.vdri  | 5 +++++
 .../Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor.vveh    | 2 +-
 VectoCore/VectoCoreTest/VectoCoreTest.csproj                 | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/DriveDhSl1.3.vdri
 rename VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/{DriveDhSl1.5.vdri => DriveDhSl1.4.vdri} (60%)
 create mode 100644 VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/DriveDhSl1.7.vdri

diff --git a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs
index 936b6adbf7..2841fa25dc 100644
--- a/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs
+++ b/VectoCore/VectoCoreTest/Integration/ADAS/ADASTestsHEV.cs
@@ -55,9 +55,9 @@ namespace TUGraz.VectoCore.Tests.Integration.ADAS
 
 		[TestCase(0, TestName = "EcoRoll DH1.1 const"),
 		TestCase(1, TestName = "EcoRoll DH1.1 UH0.1"),
-		TestCase(2, TestName = "EcoRoll DH1.3 const"),
+		TestCase(2, TestName = "EcoRoll DH1.4 const"),
 		TestCase(3, TestName = "EcoRoll DH0.8 const - too flat"),
-		TestCase(4, TestName = "EcoRoll DH1.5 const - too steep"),
+		TestCase(4, TestName = "EcoRoll DH1.7 const - too steep"),
 		TestCase(5, TestName = "EcoRoll DH1.1 const - Stop"),
 		TestCase(6, TestName = "EcoRoll DH1.1 const - TS60"),
 		TestCase(7, TestName = "EcoRoll DH1.1 const - TS68"),
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/Class5_Tractor_ENG.vecto b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/Class5_Tractor_ENG.vecto
index 3e86922548..57fa716756 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/Class5_Tractor_ENG.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/Class5_Tractor_ENG.vecto
@@ -51,9 +51,9 @@
     "Cycles": [
       "DriveDHSl1.1.vdri",
       "DriveDHSl1.1_Uh0.1.vdri",
-      "DriveDHSl1.3.vdri",
+      "DriveDHSl1.4.vdri",
       "DriveDhSl0.8.vdri",
-      "DriveDhSl1.5.vdri",
+      "DriveDhSl1.7.vdri",
       "DriveDHSl1.1_Stop.vdri",
       "DriveDHSl1.1_TS--.vdri",
       "DriveDHSl1.1_TS-.vdri",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/DriveDhSl1.3.vdri b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/DriveDhSl1.3.vdri
deleted file mode 100644
index bc0b7f5479..0000000000
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/DriveDhSl1.3.vdri
+++ /dev/null
@@ -1,5 +0,0 @@
-s, v, grad, stop, AUX_ES
-0, 70, -1.3, 0, 2
-600, 70, -1.8, 0, 2
-800, 70, -1.3, 0, 2
-10000, 70, -1.3, 0, 2
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/DriveDhSl1.5.vdri b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/DriveDhSl1.4.vdri
similarity index 60%
rename from VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/DriveDhSl1.5.vdri
rename to VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/DriveDhSl1.4.vdri
index dd9632c614..8a37a079dc 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/DriveDhSl1.5.vdri
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/DriveDhSl1.4.vdri
@@ -1,5 +1,5 @@
 s, v, grad, stop, AUX_ES
 0, 70, -1.1, 0, 2
 600, 70, -1.8, 0, 2
-800, 70, -1.5, 0, 2
-10000, 70, -1.5, 0, 2
\ No newline at end of file
+800, 70, -1.4, 0, 2
+10000, 70, -1.4, 0, 2
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/DriveDhSl1.7.vdri b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/DriveDhSl1.7.vdri
new file mode 100644
index 0000000000..5a04091c23
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5EcoRollEng/DriveDhSl1.7.vdri
@@ -0,0 +1,5 @@
+s, v, grad, stop, AUX_ES
+0, 70, -1.1, 0, 2
+600, 70, -1.8, 0, 2
+800, 70, -1.7, 0, 2
+10000, 70, -1.7, 0, 2
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor.vveh b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor.vveh
index 97208ef856..8faac9a6ab 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ADAS-HEV/Group5PCCEng/Class5_Tractor.vveh
@@ -39,7 +39,7 @@
     "Battery": {
       "NumPacks": 1,
       "BatteryFile": "GenericBattery_10kWh_658V.vbat"
-    }
+    },
     "Retarder": {
       "Type": "None",
       "Ratio": 1.0,
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 07b63545a8..80c6dd7d2c 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -2309,10 +2309,10 @@
     <None Include="TestData\Integration\ADAS-HEV\Group5EcoRollEng\DriveDhSl1.1_Uh0.1.vdri">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="TestData\Integration\ADAS-HEV\Group5EcoRollEng\DriveDhSl1.3.vdri">
+    <None Include="TestData\Integration\ADAS-HEV\Group5EcoRollEng\DriveDhSl1.4.vdri">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="TestData\Integration\ADAS-HEV\Group5EcoRollEng\DriveDhSl1.5.vdri">
+    <None Include="TestData\Integration\ADAS-HEV\Group5EcoRollEng\DriveDhSl1.7.vdri">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="TestData\Integration\ADAS-HEV\Group5EcoRollEng\Engine_325kW_12.7l.veng">
-- 
GitLab