From 9b4eef00ba91066d69362a2c196661b0dbdfa48d Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Fri, 17 May 2019 11:13:25 +0200
Subject: [PATCH] fixes to make most testcases run (errors mainly regadring
additional columns in .vmod and .vsum)
---
VECTO/GUI/VectoJobForm.vb | 4 +-
VECTO/Input Files/VectoJob.vb | 7 +--
VECTO/OutputData/JSONFileWriter.vb | 4 +-
.../InputData/IInputDataProvider.cs | 1 -
.../XMLEngineeringInputDataProvider.cs | 2 +-
.../Engineering/IXMLEngineeringInputReader.cs | 1 -
.../Reader/Impl/XMLEngineeringInputReader.cs | 1 -
.../EngineeringDataAdapter.cs | 2 +-
.../EngineeringModeVectoRunDataFactory.cs | 4 +-
VectoCore/VectoCore/Utils/VectoCSVFile.cs | 4 +-
.../Models/Simulation/ShiftStrategyV2Test.cs | 2 +-
.../GearshiftLinesVoithTest.cs | 46 +++++++++++++------
.../CityBus_AT_FCOpt/GearboxPowerSplit.vgbx | 7 +--
.../CityBus_AT_FCOpt/ShiftParameters.vtcu | 7 ++-
.../CityBus_AT_GSVoith/GearboxPowerSplit.vgbx | 5 --
.../CityBus_AT_GSVoith/GearboxSerial.vgbx | 6 +--
.../CityBus_AT_GSVoith/ShiftParameters.vtcu | 5 ++
.../Class5_Tractor_4x2/AMT_12.vgbx | 5 --
.../Class5_Tractor_4x2/ShiftParameters.vtcu | 10 ++--
...d Truck_4x2_vehicle-class-1_EURO6_2018.xml | 9 ++++
...d Truck_4x2_vehicle-class-2_EURO6_2018.xml | 9 ++++
...d Truck_4x2_vehicle-class-3_EURO6_2018.xml | 9 ++++
...d Truck_4x2_vehicle-class-4_EURO6_2018.xml | 9 ++++
...d Truck_6x2_vehicle-class-9_EURO6_2018.xml | 9 ++++
... Truck_6x4_vehicle-class-11_EURO6_2018.xml | 9 ++++
... Truck_8x4_vehicle-class-16_EURO6_2018.xml | 9 ++++
...Tractor_4x2_vehicle-class-5_EURO6_2018.xml | 9 ++++
...2_vehicle-class-5_EURO6_2018_FlatFCMap.xml | 9 ++++
...cle-class-5_EURO6_2018_IncreasingFCMap.xml | 9 ++++
...ractor_6x2_vehicle-class-10_EURO6_2018.xml | 9 ++++
...ractor_6x4_vehicle-class-12_EURO6_2018.xml | 9 ++++
31 files changed, 173 insertions(+), 58 deletions(-)
diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index e3c3e8f0e6..fac55759e3 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -447,10 +447,10 @@ Public Class VectoJobForm
TbVEH.Text = GetRelativePath(inputData.JobInputData.Vehicle.DataSource.SourceFile, _basePath)
TbENG.Text = GetRelativePath(inputData.JobInputData.Vehicle.Components.EngineInputData.DataSource.SourceFile, _basePath)
TbGBX.Text = GetRelativePath(inputData.JobInputData.Vehicle.Components.GearboxInputData.DataSource.SourceFile, _basePath)
- if (inputData.GearshiftInputData Is Nothing) Then
+ if (inputData.DriverInputData.GearshiftInputData Is Nothing) Then
TbShiftStrategyParams.Text = ""
else
- TbShiftStrategyParams.Text = GetRelativePath(inputData.GearshiftInputData.Source, _basePath)
+ TbShiftStrategyParams.Text = GetRelativePath(inputData.DriverInputData.GearshiftInputData.Source, _basePath)
End If
'Start/Stop
diff --git a/VECTO/Input Files/VectoJob.vb b/VECTO/Input Files/VectoJob.vb
index 413d32ec5c..57241cfcde 100644
--- a/VECTO/Input Files/VectoJob.vb
+++ b/VECTO/Input Files/VectoJob.vb
@@ -474,12 +474,7 @@ Public Class VectoJob
' Return TryCast( New JSONComponentInputData(_gearboxFile.FullPath, Me).JobInputData.Vehicle.Components.GearboxInputData, IGearshiftEngineeringInputData)
' End Get
'End Property
- Public ReadOnly Property GearshiftInputData As IGearshiftEngineeringInputData Implements IEngineeringInputDataProvider.GearshiftInputData
- get
- if not file.Exists(_tcuFile.FullPath) Then Return Nothing
- Return new JSONComponentInputData(_tcuFile.FullPath, me).GearshiftInputData
- End Get
- End Property
+
Public ReadOnly Property XMLHash As XElement Implements IDeclarationInputDataProvider.XMLHash
Get
diff --git a/VECTO/OutputData/JSONFileWriter.vb b/VECTO/OutputData/JSONFileWriter.vb
index 10c9c258d7..8f86489c11 100644
--- a/VECTO/OutputData/JSONFileWriter.vb
+++ b/VECTO/OutputData/JSONFileWriter.vb
@@ -278,8 +278,8 @@ Public Class JSONFileWriter
body.Add("VehicleFile", GetRelativePath(job.Vehicle.DataSource.SourceFile, basePath))
body.Add("EngineFile", GetRelativePath(input.JobInputData.Vehicle.Components.EngineInputData.DataSource.SourceFile, basePath))
body.Add("GearboxFile", GetRelativePath(input.JobInputData.Vehicle.Components.GearboxInputData.DataSource.SourceFile, basePath))
- if not job.SavedInDeclarationMode AndAlso Not(input.GearshiftInputData is Nothing) then
- body.Add("TCU", GetRelativePath(input.GearshiftInputData.Source, basePath))
+ if not job.SavedInDeclarationMode AndAlso Not(input.DriverInputData.GearshiftInputData is Nothing) then
+ body.Add("TCU", GetRelativePath(input.DriverInputData.GearshiftInputData.Source, basePath))
end if
body.Add("ShiftStrategy", input.JobInputData.ShiftStrategy)
diff --git a/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs b/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
index d55271662d..a44fcf86b3 100644
--- a/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
+++ b/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
@@ -53,7 +53,6 @@ namespace TUGraz.VectoCommon.InputData
IDriverEngineeringInputData DriverInputData { get; }
- IGearshiftEngineeringInputData GearshiftInputData { get; }
}
}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringInputDataProvider.cs
index 9b54d5dc1d..40a4e3ff02 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringInputDataProvider.cs
@@ -52,7 +52,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
get { return DriverData ?? (DriverData = Reader.DriverModel); }
}
- public virtual IGearshiftEngineeringInputData GearshiftInputData { get { return null; } }
+ //public virtual IGearshiftEngineeringInputData GearshiftInputData { get { return DriverInputData.GearshiftInputData; } }
#endregion
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/IXMLEngineeringInputReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/IXMLEngineeringInputReader.cs
index 0ed673f29e..d72f965c25 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/IXMLEngineeringInputReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/IXMLEngineeringInputReader.cs
@@ -7,6 +7,5 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering
IEngineeringJobInputData JobData { get; }
IDriverEngineeringInputData DriverModel { get; }
-
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/Impl/XMLEngineeringInputReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/Impl/XMLEngineeringInputReader.cs
index d15e7b19b0..5a680d8da6 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/Impl/XMLEngineeringInputReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/Reader/Impl/XMLEngineeringInputReader.cs
@@ -41,7 +41,6 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.Reader
get { return _driverModel ?? (_driverModel = CreateComponent(XMLNames.Component_DriverModel, DriverModelCreator, requireDataNode:false)); }
}
-
public IEngineeringJobInputData JobCreator(string version, XmlNode baseNode, string filename)
{
var job = Factory.CreateJobData(version, JobNode, InputData, (InputData as IXMLResource).DataSource.SourceFile);
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index acd1dfeb59..c90dd23f28 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -460,7 +460,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
GearshiftLines = gsInputData.LoadStageShiftLines,
- LoadstageThresholds = gsInputData.LoadStageThresoldsUp.Zip(gsInputData.LoadStageThresoldsDown, Tuple.Create)
+ LoadstageThresholds = gsInputData.LoadStageThresoldsUp != null && gsInputData.LoadStageThresoldsDown != null ? gsInputData.LoadStageThresoldsUp.Zip(gsInputData.LoadStageThresoldsDown, Tuple.Create) : null
};
return retVal;
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
index 5ec1bc2142..8f15c5cafc 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
@@ -77,7 +77,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
}
};
var tmpStrategy = PowertrainBuilder.GetShiftStrategy(tmpRunData, new SimplePowertrainContainer(tmpRunData));
- var gearboxData = dao.CreateGearboxData(vehicle.Components.GearboxInputData, engineData, InputDataProvider.GearshiftInputData, axlegearData.AxleGear.Ratio,
+ var gearboxData = dao.CreateGearboxData(vehicle.Components.GearboxInputData, engineData, InputDataProvider.DriverInputData.GearshiftInputData, axlegearData.AxleGear.Ratio,
tempVehicle.DynamicTyreRadius,tempVehicle.VehicleCategory, tmpStrategy, vehicle.Components.TorqueConverterInputData);
var crossWindRequired = vehicle.Components.AirdragInputData.CrossWindCorrectionMode ==
CrossWindCorrectionMode.VAirBetaLookupTable;
@@ -105,7 +105,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
Cycle = new DrivingCycleProxy(drivingCycle, cycle.Name),
ExecutionMode = ExecutionMode.Engineering,
SimulationType = SimulationType.DistanceCycle | SimulationType.MeasuredSpeedCycle | SimulationType.PWheel,
- GearshiftParameters = dao.CreateGearshiftData(InputDataProvider.GearshiftInputData),
+ GearshiftParameters = dao.CreateGearshiftData(InputDataProvider.DriverInputData.GearshiftInputData),
ShiftStrategy = InputDataProvider.JobInputData.ShiftStrategy
};
});
diff --git a/VectoCore/VectoCore/Utils/VectoCSVFile.cs b/VectoCore/VectoCore/Utils/VectoCSVFile.cs
index 98bd2bfe50..e636c97f6d 100644
--- a/VectoCore/VectoCore/Utils/VectoCSVFile.cs
+++ b/VectoCore/VectoCore/Utils/VectoCSVFile.cs
@@ -203,8 +203,8 @@ namespace TUGraz.VectoCore.Utils
var entries = new List<string>();
if (addVersionHeader) {
try {
- writer.WriteLine("# VECTO{0} {1} - {2}", VectoSimulationCore.BranchSuffix, VectoSimulationCore.VersionNumber,
- DateTime.Now.ToString("dd.MM.yyyy HH:mm"));
+ entries.Add(string.Format("# VECTO{0} {1} - {2}", VectoSimulationCore.BranchSuffix, VectoSimulationCore.VersionNumber,
+ DateTime.Now.ToString("dd.MM.yyyy HH:mm")));
} catch (Exception) {
entries.Add(string.Format("# VECTO {0} - {1}", "Unknown", DateTime.Now.ToString("dd.MM.yyyy HH:mm")));
}
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/ShiftStrategyV2Test.cs b/VectoCore/VectoCoreTest/Models/Simulation/ShiftStrategyV2Test.cs
index 762c1804f2..bb3476af7e 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/ShiftStrategyV2Test.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/ShiftStrategyV2Test.cs
@@ -59,7 +59,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
Validate = false
};
- Assert.NotNull(((IEngineeringInputDataProvider)inputData).GearshiftInputData);
+ Assert.NotNull(((IEngineeringInputDataProvider)inputData).DriverInputData.GearshiftInputData);
var jobContainer = new JobContainer(new MockSumWriter());
var runs = factory.SimulationRuns().ToArray();
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearshiftLinesVoithTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearshiftLinesVoithTest.cs
index 969a8f7b7c..b39d1b4614 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearshiftLinesVoithTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponentData/GearshiftLinesVoithTest.cs
@@ -1,7 +1,14 @@
-using System.IO;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
using NUnit.Framework;
+using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
using TUGraz.VectoCore.Models.SimulationComponent.Impl;
using TUGraz.VectoCore.Utils;
@@ -72,11 +79,7 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
{
var data = VectoCSVFile.Read(filename);
- var runData = new VectoRunData() {
- GearshiftParameters = new ShiftStrategyParameters() {
- GearshiftLines = data
- }
- };
+ var runData = GetVectoRunData(data);
var strategy = new ATShiftStrategyVoith(runData, null);
var slope = VectoMath.InclinationToAngle(gradient / 100.0);
@@ -87,17 +90,13 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
Assert.AreEqual(expectedRpm, upshiftSpeed.AsRPM, 0.1);
}
-
+
[TestCase(File, 3, 5, 2.8, 1.0, 731.2)]
public void TestShiftlinesLookupDownshift(string filename, int gear, int loadStage, double gradient, double acc, double expectedRpm, double amin = -0.2, double amax = -0.4)
{
var data = VectoCSVFile.Read(filename);
-
- var runData = new VectoRunData() {
- GearshiftParameters = new ShiftStrategyParameters() {
- GearshiftLines = data
- }
- };
+
+ var runData = GetVectoRunData(data);
var strategy = new ATShiftStrategyVoith(runData, null);
var slope = VectoMath.InclinationToAngle(gradient / 100.0);
@@ -107,5 +106,26 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponentData
Assert.AreEqual(expectedRpm, upshiftSpeed.AsRPM, 0.1);
}
+
+ private static VectoRunData GetVectoRunData(TableData data)
+ {
+ var loadStageThresoldsUp = "19.7;36.34;53.01;69.68;86.35".Split(';').Select(x => x.ToDouble()).ToList();
+ var loadStageThresoldsDown = "13.7;30.34;47.01;63.68;80.35".Split(';').Select(x => x.ToDouble()).ToList();
+ var runData = new VectoRunData() {
+ EngineData = new CombustionEngineData() {
+ FullLoadCurves = new Dictionary<uint, EngineFullLoadCurve>() {
+ { 0, new EngineFullLoadCurve(new List<EngineFullLoadCurve.FullLoadCurveEntry>(), new PT1()) }
+ }
+ },
+ VehicleData = new VehicleData() {
+ GrossVehicleMass = 18000.SI<Kilogram>()
+ },
+ GearshiftParameters = new ShiftStrategyParameters() {
+ GearshiftLines = data,
+ LoadstageThresholds = loadStageThresoldsUp.Zip(loadStageThresoldsDown, Tuple.Create)
+ }
+ };
+ return runData;
+ }
}
}
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/GearboxPowerSplit.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/GearboxPowerSplit.vgbx
index fd4f513c68..c8bd572e44 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/GearboxPowerSplit.vgbx
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/GearboxPowerSplit.vgbx
@@ -34,12 +34,7 @@
"MaxTorque": ""
}
],
- "TqReserve": 0.0,
- "ShiftTime": 1.0,
- "StartTqReserve": 0.0,
- "StartSpeed": 2.0,
- "StartAcc": 0.6,
- "GearboxType": "ATPowerSplit",
+ "GearboxType": "ATPowerSplit",
"TorqueConverter": {
"Enabled": true,
"File": "TorqueConverterPowerSplit.vtcc",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/ShiftParameters.vtcu b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/ShiftParameters.vtcu
index 45a662d275..e9b80bb9ce 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/ShiftParameters.vtcu
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_FCOpt/ShiftParameters.vtcu
@@ -6,8 +6,13 @@
"FileVersion": 1
},
"Body": {
+ "TqReserve": 0.0,
+ "ShiftTime": 1.0,
+ "StartTqReserve": 0.0,
+ "StartSpeed": 2.0,
+ "StartAcc": 0.6,
"Rating_current_gear": 0.99,
"RatioEarlyUpshiftFC": 10,
- "RatioEarlyDownshiftFC": 5
+ "RatioEarlyDownshiftFC": 5
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/GearboxPowerSplit.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/GearboxPowerSplit.vgbx
index fd4f513c68..9a8510ecbd 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/GearboxPowerSplit.vgbx
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/GearboxPowerSplit.vgbx
@@ -34,11 +34,6 @@
"MaxTorque": ""
}
],
- "TqReserve": 0.0,
- "ShiftTime": 1.0,
- "StartTqReserve": 0.0,
- "StartSpeed": 2.0,
- "StartAcc": 0.6,
"GearboxType": "ATPowerSplit",
"TorqueConverter": {
"Enabled": true,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/GearboxSerial.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/GearboxSerial.vgbx
index 0620238ba2..ab02182679 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/GearboxSerial.vgbx
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/GearboxSerial.vgbx
@@ -52,11 +52,7 @@
"MaxTorque": ""
}
],
- "TqReserve": 0.0,
- "ShiftTime": 1.0,
- "StartTqReserve": 0.0,
- "StartSpeed": 2.0,
- "StartAcc": 0.6,
+
"GearboxType": "ATSerial",
"TorqueConverter": {
"Enabled": true,
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/ShiftParameters.vtcu b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/ShiftParameters.vtcu
index d3fa50dbfa..373cf92419 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/ShiftParameters.vtcu
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/CityBus_AT_GSVoith/ShiftParameters.vtcu
@@ -6,6 +6,11 @@
"FileVersion": 1
},
"Body": {
+ "TqReserve": 0.0,
+ "ShiftTime": 1.0,
+ "StartTqReserve": 0.0,
+ "StartSpeed": 2.0,
+ "StartAcc": 0.6,
"LoadStageShiftLines": "GearshiftLinesVoith.vgsv",
"LoadStageThresoldsUp": "19.7;36.34;53.01;69.68;86.35",
"LoadStageThresoldsDown": "13.7;30.34;47.01;63.68;80.35",
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/Class5_Tractor_4x2/AMT_12.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/Class5_Tractor_4x2/AMT_12.vgbx
index 216c531dec..95d3057b81 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/Class5_Tractor_4x2/AMT_12.vgbx
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/Class5_Tractor_4x2/AMT_12.vgbx
@@ -88,11 +88,6 @@
"MaxTorque": ""
}
],
- "TqReserve": 20.0,
- "ShiftTime": 2.0,
- "StartTqReserve": 20.0,
- "StartSpeed": 2.0,
- "StartAcc": 0.6,
"GearboxType": "AMT",
"TorqueConverter": {
"Enabled": false
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/Class5_Tractor_4x2/ShiftParameters.vtcu b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/Class5_Tractor_4x2/ShiftParameters.vtcu
index 967bf2997c..74bc0e2b78 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/Class5_Tractor_4x2/ShiftParameters.vtcu
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/Class5_Tractor_4x2/ShiftParameters.vtcu
@@ -6,6 +6,10 @@
"FileVersion": 1
},
"Body": {
+ "TqReserve": 20.0,
+ "ShiftTime": 2.0,
+ "StartTqReserve": 20.0,
+ "StartAcc": 0.6,
"StartSpeed": 8,
"StartAcceleration": 0.8,
"GearResidenceTime": 5,
@@ -14,8 +18,8 @@
"GearRangeUp": 3,
"GearRangeDown": 3,
"LookBackDriver": 4,
- "DriverAccelerationLookBackInterval": 10,
- "DriverAccelerationThresholdLow": 0.1,
+ "DriverAccelerationLookBackInterval": 10,
+ "DriverAccelerationThresholdLow": 0.1,
"P_card_avg_threshold": 5000,
"P_card_curr_threshold": 1000,
"Diff_curr_targ_vel": 0.1,
@@ -26,6 +30,6 @@
"PredictionDurationLookup": "PredictionTimeLookup.csv",
"ShareIdleLow": "ShareIdleLow.csv",
"ShareEngineHigh": "ShareEngineSpeedHigh.csv"
-
+
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml
index c77b800f32..acf1d421b3 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-1_EURO6_2018.xml
@@ -18,6 +18,15 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>true</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<Components>
<Engine>
<Data id="ENG-N.A.">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml
index 607a4b4dd5..dc5decd501 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-2_EURO6_2018.xml
@@ -18,6 +18,15 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>true</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<Components>
<Engine>
<Data id="ENG-N.A.">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml
index 902159c33d..ef39358017 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-3_EURO6_2018.xml
@@ -18,6 +18,15 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>true</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<Components>
<Engine>
<Data id="ENG-N.A.">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml
index a8b58456b9..6b7b491c29 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_4x2_vehicle-class-4_EURO6_2018.xml
@@ -19,6 +19,15 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>true</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<Components>
<Engine>
<Data id="ENG-N.A.">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml
index 1703912025..0a8016124b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x2_vehicle-class-9_EURO6_2018.xml
@@ -19,6 +19,15 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>true</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<Components>
<Engine>
<Data id="ENG-N.A.">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml
index bbdc724e24..11dde054e5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_6x4_vehicle-class-11_EURO6_2018.xml
@@ -18,6 +18,15 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>true</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<Components>
<Engine>
<Data id="ENG-N.A.">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml
index 87386c37bc..fc9a49d0ae 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Rigid Truck_8x4_vehicle-class-16_EURO6_2018.xml
@@ -18,6 +18,15 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>true</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<Components>
<Engine>
<Data id="ENG-N.A.">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
index 17dedc03e8..ed78e2df85 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018.xml
@@ -19,6 +19,15 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>true</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<Components>
<Engine>
<Data id="ENG-N.A.">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml
index 96ee0bde6d..a89857f85c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_FlatFCMap.xml
@@ -19,6 +19,15 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>true</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<Components>
<Engine>
<Data id="ENG-N.A.">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml
index 635f90fe05..9605825fed 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_4x2_vehicle-class-5_EURO6_2018_IncreasingFCMap.xml
@@ -19,6 +19,15 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>true</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<Components>
<Engine>
<Data id="ENG-N.A.">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x2_vehicle-class-10_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x2_vehicle-class-10_EURO6_2018.xml
index 646668879e..f0259bb06c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x2_vehicle-class-10_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x2_vehicle-class-10_EURO6_2018.xml
@@ -19,6 +19,15 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>true</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<Components>
<Engine>
<Data id="ENG-N.A.">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x4_vehicle-class-12_EURO6_2018.xml b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x4_vehicle-class-12_EURO6_2018.xml
index 866027d648..92203b94eb 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x4_vehicle-class-12_EURO6_2018.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/ShiftStrategyV2/SampleVehicles/Tractor_6x4_vehicle-class-12_EURO6_2018.xml
@@ -18,6 +18,15 @@
<PTOShaftsGearWheels>none</PTOShaftsGearWheels>
<PTOOtherElements>none</PTOOtherElements>
</PTO>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <VocationalVehicle>false</VocationalVehicle>
+ <SleeperCab>true</SleeperCab>
+ <ADAS>
+ <EngineStopStart>false</EngineStopStart>
+ <EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+ <EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+ <PredictiveCruiseControl>none</PredictiveCruiseControl>
+ </ADAS>
<Components>
<Engine>
<Data id="ENG-N.A.">
--
GitLab