diff --git a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs index c841eef11a5d8cfd97cabf48b17fd1c3f01d6d67..84b91668984f772f4a135a17bab4574f6700a509 100644 --- a/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs +++ b/VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs @@ -675,7 +675,8 @@ public class JSONFileWriter : IOutputFileWriter body.Add("VACC", GetRelativePath(driver.AccelerationCurve.AccelerationCurve.Source, basePath)); body.Add("EngineStopStartAtVehicleStopThreshold", driver.EngineStopStartData.ActivationDelay.Value()); body.Add("EngineStopStartMaxOffTimespan", driver.EngineStopStartData.MaxEngineOffTimespan.Value()); - body.Add("EngineStopStartUtilityFactor", driver.EngineStopStartData.UtilityFactor); + body.Add("EngineStopStartUtilityFactor", driver.EngineStopStartData.UtilityFactorStandstill); + body.Add("EngineStopStartUtilityFactorDriving", driver.EngineStopStartData.UtilityFactorDriving); body.Add("EcoRollMinSpeed", driver.EcoRollData.MinSpeed.AsKmph); body.Add("EcoRollActivationDelay", driver.EcoRollData.ActivationDelay.Value()); @@ -819,7 +820,8 @@ public class JSONFileWriter : IOutputFileWriter body.Add("VACC", GetRelativePath(driver.AccelerationCurve.AccelerationCurve.Source, basePath)); body.Add("EngineStopStartAtVehicleStopThreshold", driver.EngineStopStartData.ActivationDelay.Value()); body.Add("EngineStopStartMaxOffTimespan", driver.EngineStopStartData.MaxEngineOffTimespan.Value()); - body.Add("EngineStopStartUtilityFactor", driver.EngineStopStartData.UtilityFactor); + body.Add("EngineStopStartUtilityFactor", driver.EngineStopStartData.UtilityFactorStandstill); + body.Add("EngineStopStartUtilityFactorDriving", driver.EngineStopStartData.UtilityFactorDriving); body.Add("EcoRollMinSpeed", driver.EcoRollData.MinSpeed.AsKmph); body.Add("EcoRollActivationDelay", driver.EcoRollData.ActivationDelay.Value()); @@ -975,7 +977,8 @@ public class JSONFileWriter : IOutputFileWriter body.Add("VACC", GetRelativePath(driver.AccelerationCurve.AccelerationCurve.Source, basePath)); body.Add("EngineStopStartAtVehicleStopThreshold", driver.EngineStopStartData.ActivationDelay.Value()); body.Add("EngineStopStartMaxOffTimespan", driver.EngineStopStartData.MaxEngineOffTimespan.Value()); - body.Add("EngineStopStartUtilityFactor", driver.EngineStopStartData.UtilityFactor); + body.Add("EngineStopStartUtilityFactor", driver.EngineStopStartData.UtilityFactorStandstill); + body.Add("EngineStopStartUtilityFactorDriving", driver.EngineStopStartData.UtilityFactorDriving); body.Add("EcoRollMinSpeed", driver.EcoRollData.MinSpeed.AsKmph); body.Add("EcoRollActivationDelay", driver.EcoRollData.ActivationDelay.Value()); diff --git a/VectoCore/VectoCoreTest/Models/EngineeringMode/EngineeringModeBusAuxTest.cs b/VectoCore/VectoCoreTest/Models/EngineeringMode/EngineeringModeBusAuxTest.cs index d42db2d0011c021f7dd34351865346676a5ffcae..7853613203473406d63b6476562b554c5084f62b 100644 --- a/VectoCore/VectoCoreTest/Models/EngineeringMode/EngineeringModeBusAuxTest.cs +++ b/VectoCore/VectoCoreTest/Models/EngineeringMode/EngineeringModeBusAuxTest.cs @@ -33,6 +33,7 @@ namespace TUGraz.VectoCore.Tests.Models.EngineeringMode const string JobFile_SmartES_SmartPS = @"TestData\Integration\Buses\EngineeringMode\InterurbanBus_ENG_BusAux_SmartES-SmartPS.vecto"; const string JobFile_A = @"TestData\Hybrids\BusAuxEngineeringMode\InterurbanBus_ENG_BusAux_A.vecto"; + const string JobFile_A_ESS = @"TestData\Hybrids\BusAuxEngineeringMode\InterurbanBus_ENG_BusAux_A_ESS.vecto"; const string JobFile_B = @"TestData\Hybrids\BusAuxEngineeringMode\InterurbanBus_ENG_BusAux_B.vecto"; const string JobFile_C1 = @"TestData\Hybrids\BusAuxEngineeringMode\InterurbanBus_ENG_BusAux_C1.vecto"; const string JobFile_C2a = @"TestData\Hybrids\BusAuxEngineeringMode\InterurbanBus_ENG_BusAux_C2a.vecto"; @@ -73,6 +74,12 @@ namespace TUGraz.VectoCore.Tests.Models.EngineeringMode TestCase(JobFile_C3a, 2, TestName = "InterurbanBus ENG BusAux C3a Urban"), TestCase(JobFile_C3b, 2, TestName = "InterurbanBus ENG BusAux C3b Urban"), + TestCase(JobFile_A_ESS, 0, TestName = "InterurbanBus ENG BusAux A ESS Interurban"), + TestCase(JobFile_A_ESS, 1, TestName = "InterurbanBus ENG BusAux A ESS Coach"), + TestCase(JobFile_A_ESS, 2, TestName = "InterurbanBus ENG BusAux A ESS Urban"), + + TestCase(JobFile_C1, 0, TestName = "InterurbanBus ENG BusAux C1 Interurban"), + ] public void InterurbanBus_BusAuxTest(string jobFile, int runIdx) { diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_A_ESS.vecto b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_A_ESS.vecto index 6b92118a3e9b6cf189101ffb88733a512495bdb6..8b2565a6797e01b300d03d02c5ecd41445a65612 100644 --- a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_A_ESS.vecto +++ b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/InterurbanBus_ENG_BusAux_A_ESS.vecto @@ -8,7 +8,7 @@ "Body": { "SavedInDeclMode": false, "EngineOnlyMode": false, - "VehicleFile": "InterurbanBus.vveh", + "VehicleFile": "InterurbanBus_ESS.vveh", "EngineFile": "Engine_250kW_7.7l.veng", "GearboxFile": "MT_6_Bus.vgbx", "TCU": "MT_6_Bus.vgbx", diff --git a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/MT_6_Bus.vgbx b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/MT_6_Bus.vgbx index 1bc127d091905944ae76562cfb9dc53246cfd746..4fa959bcf1d4580a17b9fd63d4c3e5d4a81e343e 100644 --- a/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/MT_6_Bus.vgbx +++ b/VectoCore/VectoCoreTest/TestData/Hybrids/BusAuxEngineeringMode/MT_6_Bus.vgbx @@ -9,7 +9,7 @@ "SavedInDeclMode": false, "ModelName": "Undefined", "Inertia": 0.0, - "TracInt": 2.0, + "TracInt": 1.0, "Gears": [ { "Ratio": 6.5, @@ -57,7 +57,7 @@ "StartTqReserve": 0.2, "StartSpeed": 2.0, "StartAcc": 0.6, - "GearboxType": "MT", + "GearboxType": "AMT", "TorqueConverter": { "Enabled": false }, diff --git a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs index 67e83fef56f256896b02717edef6456ac4a8cdbe..5f6468bf1489f38b766705afbaf54ffe825916e7 100644 --- a/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs +++ b/VectoCore/VectoCoreTest/XML/XMLEngineeringInputSingleTest.cs @@ -918,7 +918,7 @@ namespace TUGraz.VectoCore.Tests.XML var essData = inputDataProvider.DriverInputData.EngineStopStartData; Assert.AreEqual(2.01, essData.ActivationDelay.Value()); Assert.AreEqual(120.23, essData.MaxEngineOffTimespan.Value()); - Assert.AreEqual(0.834, essData.UtilityFactor); + Assert.AreEqual(0.834, essData.UtilityFactorStandstill); }