From 700d337cc99aee0eed74572d4467866ccaed211d Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Thu, 19 Sep 2019 14:59:00 +0200 Subject: [PATCH] bugfix aaux model M03: air demand pneumatic suspention used wrong cycle time (always zero) --- .../BusAuxiliaries/DownstreamModules/Impl/Pneumatics/M03Impl.cs | 2 +- .../UnitTests/AveragePneumaticLoadDemandTests.vb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Pneumatics/M03Impl.cs b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Pneumatics/M03Impl.cs index 004080d3a9..78f8906634 100644 --- a/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Pneumatics/M03Impl.cs +++ b/VECTOAux/BusAuxiliaries/DownstreamModules/Impl/Pneumatics/M03Impl.cs @@ -90,7 +90,7 @@ namespace TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl //'* * AirSuspension * * // '=IF(K12 = "electrically", 0, G38 * F54) - Suplied Spreadsheet var AirSuspension = (_pneumaticUserInputsConfig.AirSuspensionControl == "Electrically" ? 0 : - _pneumaticAuxillariesConfig.AirControlledSuspensionNIperMinute * _cycleDurationMinutes).SI<NormLiter>(); + _pneumaticAuxillariesConfig.AirControlledSuspensionNIperMinute * (_signals.TotalCycleTimeSeconds / 60.0)).SI<NormLiter>(); //'* * Total Air Demand** var TotalAirDemand = Breaks + ParkBrakesplus2Doors + Kneeling + AdBlue + Regeneration + DeadVolBlowOuts + diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb index b6be23c6c1..8ca7a4b982 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb @@ -262,7 +262,7 @@ Namespace UnitTests New M03Impl(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG.SI(Of Kilogram), "Urban", _Signals) - Dim expected As Double = 7947.68457 / _Signals.TotalCycleTimeSeconds + Dim expected As Double = 8726.1840 / _Signals.TotalCycleTimeSeconds Assert.AreEqual(expected, target.AverageAirConsumedPerSecondLitre().Value(), 0.001) End Sub -- GitLab