diff --git a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs index f4a9b5e2011541df122c34ba8bbde206f601cfcb..699d079b229657c0c5f6884ce8dc15197743429b 100644 --- a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs +++ b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs @@ -130,6 +130,8 @@ namespace TUGraz.VectoCore.OutputData //void AddElectricMotor(PowertrainPosition pos); KilogramPerWattSecond VehicleLineSlope(IFuelProperties fuel); bool HasCombustionEngine { get; } + bool HasGearbox { get; } + bool HasAxlegear { get; } WattSecond TotalElectricMotorWorkDrive(PowertrainPosition emPos); WattSecond TotalElectricMotorWorkRecuperate(PowertrainPosition emPos); WattSecond TotalElectricMotorMotWorkDrive(PowertrainPosition emPos); diff --git a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs index 8ac384ca39c6652555cb3831181f6ff468df9239..9c60ac799a727b4b75c434efb786fa2f95d4ad95 100644 --- a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs +++ b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs @@ -224,6 +224,11 @@ namespace TUGraz.VectoCore.OutputData public bool HasCombustionEngine => !(_runData.JobType == VectoSimulationJobType.BatteryElectricVehicle || _runData.JobType == VectoSimulationJobType.IEPC_E); + public bool HasGearbox => _runData.GearboxData != null; + + public bool HasAxlegear => _runData.AxleGearData != null; + + public WattSecond TotalElectricMotorWorkDrive(PowertrainPosition emPos) { var offField = emPos == PowertrainPosition.IEPC ? ModalResultField.IEPC_Off_ : ModalResultField.EM_Off_; diff --git a/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs b/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs index 3150aa7717531b9838fa4c5a39e4b447aff2d694..f4a67d5acbeb463e6bc98eb3bb4055bf24a0f5a5 100644 --- a/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs +++ b/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs @@ -270,6 +270,8 @@ namespace TUGraz.VectoCore.Tests.Utils } public bool HasCombustionEngine { get; set; } + public bool HasGearbox { get; set; } + public WattSecond TotalElectricMotorWorkDrive(PowertrainPosition emPos) { throw new NotImplementedException(); @@ -336,6 +338,8 @@ namespace TUGraz.VectoCore.Tests.Utils } public ICorrectedModalData CorrectedModalData { get; } + public bool HasAxlegear { get; set; } + public void RegisterComponent(VectoSimulationComponent component) {