diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M14.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M14.vb
index a5dd7004436f2d7b2acf15bf98f5bb84ccec62f5..8fe320d01345f43c4d47821054540e43076661c1 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M14.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M14.vb
@@ -48,7 +48,7 @@ Public Class M14
End Property
Private ReadOnly Property S4 As Single
Get
- Return (S3 / signals.TotalCycleTimeSeconds )/1000
+ Return (S3 / signals.CurrentCycleTimeInSeconds )/1000
End Get
End Property
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M7.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M7.vb
index df50fb0a6587eb7c4c1d76b5454a9a926efe03fb..a36fbe8b288dc987827e242cc52c4c87a7619ef2 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M7.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M7.vb
@@ -35,7 +35,8 @@ Public Class M7
Dim idle As Boolean = _signals.EngineSpeed <=_signals.EngineIdleSpeed ANDAlso ( NOT _signals.ClutchEngaged OrElse _signals.InNeutral)
- Return If ( _signals.Idle, _m5.AlternatorsGenerationPowerAtCrankIdleWatts, _m5.AlternatorsGenerationPowerAtCrankTractionOnWatts)
+ Return If ( idle, _m5.AlternatorsGenerationPowerAtCrankIdleWatts, _m5.AlternatorsGenerationPowerAtCrankTractionOnWatts)
+
End Get
End Property
Private Readonly Property SW2 As Single
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M8.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M8.vb
index 76573b2c720258021fb0a1c264de6a48741fc280..9af3bf48c12e614bc56e52e5186501e31f893f39 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M8.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M8.vb
@@ -56,6 +56,11 @@ End Property
Return _m1.AveragePowerDemandAtCrankFromHVACMechanicalsWatts + SW5
End Get
End Property
+ Private ReadOnly Property Sum6 As Single
+ Get
+ Return Sum5 * SW6
+ End Get
+ End Property
Private ReadOnly Property SW1 As Single
Get
Return If( _signals.SmartPneumatics, Sum1, Sum2)
@@ -81,13 +86,18 @@ End Property
Return If( _signals.SmartElectrics,SW1,SW2)
End Get
End Property
+ Private ReadOnly Property SW6 As Single
+ Get
+ Return If(_signals.EngineStopped, 0 , 1)
+ End Get
+ End Property
#End Region
'OUT1
Public ReadOnly Property AuxPowerAtCrankFromElectricalHVACAndPneumaticsAncillaries As Single Implements IM8.AuxPowerAtCrankFromElectricalHVACAndPneumaticsAncillaries
Get
- Return Sum5
+ Return Sum6
End Get
End Property
'OUT2
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
index 720e9337367d000f7c4682130e7e339483491bd4..aa0bc4eaf61f3ada2e6c54b91584d25112f916ba 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
@@ -95,10 +95,10 @@ Public Class M14Tests
'Arrange
Dim ip1 As Single = 1000f
Dim ip5 As Single = 3114
- Dim ip6 As Single = 1500
+ Dim ip6 As Single = 3114
- Dim expectedOut1 As Single=1375.40137
- Dim expectedOut2 As Single=1.64718723
+ Dim expectedOut1 As Single=1779.33337f
+ Dim expectedOut2 As Single=2.13093829f
Dim m13 As New Mock(Of IM13)
Dim hvacSSM As New Mock(Of ISSMTOOL)
@@ -108,8 +108,8 @@ Public Class M14Tests
'Moq' Arrangements
m13.Setup ( Function(x) x.WHTCTotalCycleFuelConsumptionGrams).Returns(ip1)
- signals.Setup( Function(x) x.TotalCycleTimeSeconds) .Returns(ip5)
- signals.Setup( Function(x) x.CurrentCycleTimeInSeconds) .Returns(1500)
+ signals.Setup( Function(x) x.CurrentCycleTimeInSeconds) .Returns(ip5)
+
'Act
Dim m14 As New M14(m13.Object,ssmMock,constants,signals.Object)
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb
index dfb10770eaff72e8c15eac0f6c35748c2fad5292..f411f0e07777532f558858039f0c6d36a012eac9 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M8Tests.vb
@@ -77,6 +77,57 @@ Public sub ValueInOutTest( IP1 As Single,
End Sub
+<Test()> _
+<TestCase(10,20,30,40,50,60,70,0,1,FALSE,FALSE,TRUE,0 ,40 ,1 )> _
+<TestCase(10,20,30,40,50,60,70,0,1,FALSE,FALSE,FALSE,140 ,40 ,1 )> _
+Public sub TestIdlingFunction( IP1 As Single,
+ IP2 As Single,
+ IP3 As Single,
+ IP4 As Single,
+ IP5 As Single,
+ IP6 As Single,
+ IP7 As Single,
+ IP8 as Integer,
+ IP9 as Integer,
+ IP10 As Boolean,
+ IP11 As Boolean,
+ IP12 As Boolean,
+ OUT1 As Single,
+ OUT2 As Single,
+ OUT3 As Single)
+
+ 'Arrange
+ Dim m1MOCK = New Mock(Of IM1_AverageHVACLoadDemand )()
+ Dim m6Mock = new Mock(Of IM6 )()
+ Dim m7MOCK = New Mock(Of IM7 )()
+ Dim sigsMock = New Mock(Of ISignals)()
+
+ m1MOCK.Setup ( Function(x) x.AveragePowerDemandAtCrankFromHVACMechanicalsWatts ).Returns(IP1 )
+ m7MOCK.Setup ( Function(x) x.SmartElectricalAndPneumaticAuxAltPowerGenAtCrank ).Returns(IP2 )
+ m7MOCK.Setup ( Function(x) x.SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank ).Returns(IP3 )
+ m7MOCK.Setup ( Function(x) x.SmartElectricalOnlyAuxAltPowerGenAtCrank ).Returns(IP4 )
+ m7MOCK.Setup ( Function(x) x.SmartPneumaticOnlyAuxAirCompPowerGenAtCrank ).Returns(IP5 )
+ m6Mock.Setup ( Function(x) x.AvgPowerDemandAtCrankFromElectricsIncHVAC ).Returns(IP6 )
+ m6Mock.Setup ( Function(x) x.AveragePowerDemandAtCrankFromPneumatics ).Returns(IP7 )
+ m6Mock.Setup ( Function(x) x.SmartElecAndPneumaticsCompressorFlag ).Returns(IP8 )
+ m6Mock.Setup ( Function(x) x.SmartPneumaticsOnlyCompressorFlag ).Returns(IP9 )
+ sigsMock.Setup ( Function(x) x.SmartPneumatics ).Returns(IP10)
+ sigsMock.Setup ( Function(x) x.SmartElectrics ).Returns(IP11)
+ sigsMock.Setup ( Function(x) x.EngineStopped ).Returns(IP12)
+
+
+ 'Act
+ Dim target As IM8 = New M8(m1MOCK.Object, m6Mock.Object, m7MOCK.Object, sigsMock.Object)
+
+'Assert
+ Assert.AreEqual(OUT1, target.AuxPowerAtCrankFromElectricalHVACAndPneumaticsAncillaries )
+ Assert.AreEqual(OUT2, target.SmartElectricalAlternatorPowerGenAtCrank )
+ Assert.AreEqual(OUT3, target.CompressorFlag )
+
+End Sub
+
+
+
End Class
End Namespace