diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb index 99df79b2500a3a5dbbf232c825d41352bce00469..04e060039bd818b956feb009383e1ee54c078f5b 100644 --- a/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb +++ b/VECTOAux/VectoAuxiliariesTests/Mocks/AlternatorMapMock.vb @@ -1,4 +1,5 @@ Imports TUGraz.VectoCommon.Utils +Imports VectoAuxiliaries.DownstreamModules.Electrics Imports VectoAuxiliaries.Electrics Namespace Mocks diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb index ac0e67d58b37ef2c83ba6ac07679bf4283f404e8..19e6cae5554326a06a5317c1ed7e931180b2e0db 100644 --- a/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb +++ b/VECTOAux/VectoAuxiliariesTests/Mocks/ElectricalConsumerMock.vb @@ -1,6 +1,7 @@ Imports VectoAuxiliaries.Electrics Imports System.ComponentModel Imports TUGraz.VectoCommon.Utils +Imports VectoAuxiliaries.DownstreamModules.Electrics Namespace Mocks Public Class ElectricalConsumerMock diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb index bf564858d1ea3a3d4fb03a4201bfc7e8a7baafcb..a3839926823af32ebbfac0032060a516c34ff5a9 100644 --- a/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb +++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb @@ -1,5 +1,6 @@  Imports TUGraz.VectoCommon.Utils +Imports VectoAuxiliaries Imports VectoAuxiliaries.Electrics Imports VectoAuxiliaries.Pneumatics Imports VectoAuxiliaries.Hvac @@ -51,5 +52,9 @@ Public Class M1_Mock _HVACFuelingLitresPerHour = HVACFuelingLitresPerHour.SI(Unit.SI.Liter.Per.Hour).Cast(Of LiterPerSecond)() _ '(Of LiterPerHour)() End Sub + + Public Sub ResetCalculations() Implements IAbstractModule.ResetCalculations + Throw New NotImplementedException + End Sub End Class diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb index e555250bf37b42e723a7985e69793943ef09084d..842efa8fce27934e60bd132921c043ed693d10b7 100644 --- a/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb +++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb @@ -1,4 +1,5 @@ Imports TUGraz.VectoCommon.Utils +Imports VectoAuxiliaries Imports VectoAuxiliaries.Electrics Imports VectoAuxiliaries.Pneumatics Imports VectoAuxiliaries.Hvac @@ -32,5 +33,9 @@ Public Class M2_Mock _GetAveragePowerAtCrankFromElectrics = GetAveragePowerAtCrankFromElectrics.SI(Of Watt)() _GetAveragePowerDemandAtAlternator = GetAveragePowerDemandAtAlternator.SI(Of Watt)() End Sub + + Public Sub ResetCalculations() Implements IAbstractModule.ResetCalculations + Throw New NotImplementedException + End Sub End Class diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb index c7d3bd5e9f70bb10c5985934395ffb2808729113..0ac50f228644b8803b19683d992147c86c444dd7 100644 --- a/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb +++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb @@ -1,4 +1,5 @@ Imports TUGraz.VectoCommon.Utils +Imports VectoAuxiliaries Imports VectoAuxiliaries.Electrics Imports VectoAuxiliaries.Pneumatics Imports VectoAuxiliaries.Hvac @@ -9,6 +10,7 @@ Public Class M3_Mock Public _GetAveragePowerDemandAtCrankFromPneumatics As Watt Public _TotalAirConsumedPerCycle As NormLiterPerSecond + Private _totalAirDemand As NormLiter Public Function GetAveragePowerDemandAtCrankFromPneumatics() As Watt _ @@ -16,6 +18,12 @@ Public Class M3_Mock Return _GetAveragePowerDemandAtCrankFromPneumatics End Function + Public ReadOnly Property TotalAirDemand As NormLiter Implements IM3_AveragePneumaticLoadDemand.TotalAirDemand + Get + Return _totalAirDemand + End Get + End Property + Public Function TotalAirConsumedPerCycle() As NormLiterPerSecond _ Implements IM3_AveragePneumaticLoadDemand.AverageAirConsumedPerSecondLitre Return _TotalAirConsumedPerCycle @@ -30,5 +38,9 @@ Public Class M3_Mock _GetAveragePowerDemandAtCrankFromPneumatics = GetAveragePowerDemandAtCrankFromPneumatics.SI(Of Watt)() _TotalAirConsumedPerCycle = TotalAirConsumedPerCycle.SI(Of NormLiterPerSecond)() End Sub + + Public Sub ResetCalculations() Implements IAbstractModule.ResetCalculations + Throw New NotImplementedException + End Sub End Class diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb index 7eb7e8e7447dfd252a0d14a980b5a6f6f8565227..a2ec9ba03e21404a14e37a9b09cdcad363829863 100644 --- a/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb +++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb @@ -1,4 +1,5 @@ Imports TUGraz.VectoCommon.Utils +Imports VectoAuxiliaries Imports VectoAuxiliaries.Electrics Imports VectoAuxiliaries.Pneumatics Imports VectoAuxiliaries.Hvac @@ -63,6 +64,8 @@ Public Class M4_Mock Public Property PulleyGearRatio As Double Implements IM4_AirCompressor.PulleyGearRatio - + Public Sub ResetCalculations() Implements IAbstractModule.ResetCalculations + Throw New NotImplementedException + End Sub End Class diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb index 1b53fb739f6a5c3722772ab834fac0a3f8f69021..3655c69f8dcbbe35761314048df6e2190a4fd9a5 100644 --- a/VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb +++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M5_Mock.vb @@ -1,4 +1,5 @@ Imports TUGraz.VectoCommon.Utils +Imports VectoAuxiliaries Imports VectoAuxiliaries.Electrics Imports VectoAuxiliaries.Pneumatics Imports VectoAuxiliaries.Hvac @@ -40,5 +41,9 @@ Public Class M5_Mock _AlternatorsGenerationPowerAtCrankOverrunWatts = AlternatorsGenerationPowerAtCrankOverrunWatts.SI(Of Watt)() _AlternatorsGenerationPowerAtCrankTractionOnWatts = AlternatorsGenerationPowerAtCrankTractionOnWatts.SI(Of Watt)() End Sub + + Public Sub ResetCalculations() Implements IAbstractModule.ResetCalculations + Throw New NotImplementedException + End Sub End Class diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb index 3ccbc1173173cd1b75825a336202bb0001bbefad..300b1d03b4079de932b83aea5e20b38307bb1e8d 100644 --- a/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb +++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb @@ -1,5 +1,6 @@  Imports TUGraz.VectoCommon.Utils +Imports VectoAuxiliaries Imports VectoAuxiliaries.Electrics Imports VectoAuxiliaries.Pneumatics Imports VectoAuxiliaries.Hvac @@ -105,5 +106,9 @@ Public Class M6_Mock _SmartPneumaticOnlyAirCompPowerGenAtCrank = SmartPneumaticOnlyAirCompPowerGenAtCrank.SI(Of Watt)() _SmartPneumaticsOnlyCompressorFlag = SmartPneumaticsOnlyCompressorFlag End Sub + + Public Sub ResetCalculations() Implements IAbstractModule.ResetCalculations + Throw New NotImplementedException + End Sub End Class diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb index 4bae96687221cf91fe6828d1d4268ecb05a85976..ae499990faa006779b3090500ebac0dd97d06aec 100644 --- a/VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb +++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M7_Mock.vb @@ -1,5 +1,6 @@  Imports TUGraz.VectoCommon.Utils +Imports VectoAuxiliaries Imports VectoAuxiliaries.Electrics Imports VectoAuxiliaries.Pneumatics Imports VectoAuxiliaries.Hvac @@ -57,4 +58,8 @@ Public Class M7_Mock _SmartElectricalOnlyAuxAltPowerGenAtCrank = SmartElectricalOnlyAuxAltPowerGenAtCrank _SmartPneumaticOnlyAuxAirCompPowerGenAtCrank = SmartPneumaticOnlyAuxAirCompPowerGenAtCrank End Sub + + Public Sub ResetCalculations() Implements IAbstractModule.ResetCalculations + Throw New NotImplementedException + End Sub End Class \ No newline at end of file diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj index 6867dba58e26c439576cb42816a723c308805370..ddb7c4413069c793cdb0018a1e3aaf1c35af548e 100644 --- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj +++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj @@ -399,6 +399,10 @@ <Project>{79a066ad-69a9-4223-90f6-6ed5d2d084f4}</Project> <Name>VectoCommon</Name> </ProjectReference> + <ProjectReference Include="..\BusAuxiliaries\BusAuxiliaries.csproj"> + <Project>{550D99D4-25F7-48D9-B0F0-E5DD6CB3485D}</Project> + <Name>BusAuxiliaries</Name> + </ProjectReference> <ProjectReference Include="..\VectoAuxiliaries\VectoAuxiliaries.vbproj"> <Project>{fdeee460-0b8a-4ef6-8d9e-72f203a50f65}</Project> <Name>VectoAuxiliaries</Name>