diff --git a/AuxillaryTestHarness/AuxillaryTestHarness.vbproj b/AuxillaryTestHarness/AuxillaryTestHarness.vbproj
index 67da18e595dacb5ec8f631b2db826d3b8e2c92e4..a74c84665f066a844d8b767baaa80a569eeb1f45 100644
--- a/AuxillaryTestHarness/AuxillaryTestHarness.vbproj
+++ b/AuxillaryTestHarness/AuxillaryTestHarness.vbproj
@@ -28,7 +28,7 @@
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>7</ApplicationRevision>
+ <ApplicationRevision>8</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/AuxillaryTestHarness/Dashboard.vb b/AuxillaryTestHarness/Dashboard.vb
index 6680cfd923626666ef8d0fb0a52da0ad9087fadf..eb8d6f334b519483b4bd596cd21843e4cd097017 100644
--- a/AuxillaryTestHarness/Dashboard.vb
+++ b/AuxillaryTestHarness/Dashboard.vb
@@ -521,7 +521,7 @@ Dim result As Boolean = true
'Alternator Map path : txtAlternatorMapPath
'Test for empty after trim
If txtAlternatorMapPath.Text.Trim.Length=0 then
- errorProvider.SetError(txtAlternatorMapPath ,"Please enter the localtion of a valid compressor map.")
+ errorProvider.SetError(txtAlternatorMapPath ,"Please enter the localtion of a valid alternator map.")
result=false
else
errorProvider.SetError(txtAlternatorMapPath ,String.Empty)
@@ -534,7 +534,7 @@ Dim result As Boolean = true
alt.Initialise()
errorProvider.SetError(txtAlternatorMapPath ,String.Empty)
Catch ex As Exception
- errorProvider.SetError(txtAlternatorMapPath ,"Error : map is invalid or cannot be found, please select a Cvalid compressor map")
+ errorProvider.SetError(txtAlternatorMapPath ,"Error : map is invalid or cannot be found, please select a valid alternator map")
result=false
End Try
diff --git a/VECTOAux/VectoAuxiliaries/AuxillaryEnvironment.vb b/VECTOAux/VectoAuxiliaries/AuxillaryEnvironment.vb
index bb7b65ae19e2848a74f045ae60560e3f7fac6c7f..04f3ad8d360c973fafcae103ed252603cfc1da85 100644
--- a/VECTOAux/VectoAuxiliaries/AuxillaryEnvironment.vb
+++ b/VECTOAux/VectoAuxiliaries/AuxillaryEnvironment.vb
@@ -95,7 +95,7 @@ M3 = New M3_AveragePneumaticLoadDemand(PneumaticUserInputsConfig,
compressorMap,
VectoInputs.VehicleWeightKG,
VectoInputs.Cycle,
- VectoInputs.CycleDurationMinutes)
+ Signals)
M4 = New M4_AirCompressor(compressorMap,PneumaticUserInputsConfig.CompressorGearRatio,PneumaticUserInputsConfig.CompressorGearEfficiency,Signals)
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb
index 7eb9ab754775fc46e9293e00c181e194f350891b..39f4310514dd9579f8aa81f139a50d477e658415 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb
@@ -38,7 +38,7 @@ Implements IM6
End Property
Public ReadOnly Property SmartElecAndPneumaticAltPowerGenAtCrank As Single Implements IM6.SmartElecAndPneumaticAltPowerGenAtCrank
Get
- Return Max1
+ Return Max1 * -1
End Get
End Property
Public ReadOnly Property SmartElecAndPneumaticAirCompPowerGenAtCrank As Single Implements IM6.SmartElecAndPneumaticAirCompPowerGenAtCrank
@@ -53,7 +53,7 @@ Implements IM6
End Property
Public ReadOnly Property SmartElecOnlyAltPowerGenAtCrank As Single Implements IM6.SmartElecOnlyAltPowerGenAtCrank
Get
- Return Max2
+ Return Max2 * -1
End Get
End Property
Public ReadOnly Property SmartPneumaticOnlyAirCompPowerGenAtCrank As Single Implements IM6.SmartPneumaticOnlyAirCompPowerGenAtCrank
@@ -82,13 +82,13 @@ End Property
'Max of Sum5 vs Sum10
Public ReadOnly Property Max1 As Single
Get
- Return If( Sum5 > Sum10, Sum5, Sum10)
+ Return If( Sum5 > Sum10, Sum5, Sum10)
End Get
End Property
'Max of Sum10 vs Sum7
Public ReadOnly Property Max2 As Single
Get
- Return If( Sum7 > Sum10, Sum7, Sum10)
+ Return If( Sum7 > Sum10, Sum7, Sum10)
End Get
End Property
@@ -122,16 +122,18 @@ End Property
'Sums
Public ReadOnly Property Sum1 As Single
Get
- Return _m1.AveragePowerDemandAtCrankFromHVACElectricsWatts + _m2.GetAveragePowerAtCrankFromElectrics
+ Return _m1.AveragePowerDemandAtCrankFromHVACElectricsWatts() + _m2.GetAveragePowerAtCrankFromElectrics()
End Get
End Property
Public ReadOnly Property Sum2 As Single
Get
- Return _signals.PreExistingAuxPower + _
- _m1.AveragePowerDemandAtCrankFromHVACMechanicalsWatts + _
- _m3.GetAveragePowerDemandAtCrankFromPneumatics + _
- SW1
+
+ Dim returnValue As Single = _signals.PreExistingAuxPower +_m1.AveragePowerDemandAtCrankFromHVACMechanicalsWatts + SW1 + _m3.GetAveragePowerDemandAtCrankFromPneumatics
+
+ Return returnValue
+
+
End Get
End Property
@@ -208,7 +210,7 @@ Public ReadOnly Property Sum15 As Single
End Property
Public ReadOnly property Sum16 as single
Get
- Return Sum14 + Sum16
+ Return Sum14 + Sum15
End Get
End Property
Public ReadOnly Property Sum17 As Single
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M7.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M7.vb
index 4d1f1f8ddd800570ef4f11cc7f633044aca348d4..1650835335b0dc510859eaa59598c8966a31cb47 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M7.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M7.vb
@@ -11,11 +11,11 @@ Public Class M7
Private _m6 As IM6
Private _signals As ISignals
- 'Boolan Conditions IE
+ 'Boolan Conditions
Private readonly property C1 As Boolean
Get
- Return _m6.OverrunFlag=1 Andalso _signals.ClutchEngaged Andalso _signals.InNeutral=false
+ Return If(_m6.OverrunFlag=1,True,False) Andalso _signals.ClutchEngaged Andalso _signals.InNeutral=false
End Get
End Property
@@ -48,7 +48,6 @@ Public Class M7
End Get
End Property
-
'Public readonly properties ( Outputs )
Public ReadOnly Property SmartElectricalAndPneumaticAuxAltPowerGenAtCrank As Single Implements IM7.SmartElectricalAndPneumaticAuxAltPowerGenAtCrank
Get
diff --git a/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb b/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb
index e7a5319f427de766cf4c227d659a6d280af4e07a..7b1d737e45d852a02b8f89a5d92e96477d8b2d1b 100644
--- a/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb
+++ b/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb
@@ -17,6 +17,7 @@ Namespace Pneumatics
Private _totalAirDemand As Single
+
Public ReadOnly Property TotalAirDemand As Single
Get
Return _totalAirDemand
@@ -32,7 +33,7 @@ Namespace Pneumatics
ByRef pneumaticsCompressorFlowRateMap As ICompressorMap,
vehicleMassKG As Single, _
cycleName As String,
- cycleDurationMinutes As Single
+ signals As ISignals
)
@@ -42,7 +43,7 @@ Namespace Pneumatics
_pneumaticsCompressorFlowRateMap = pneumaticsCompressorFlowRateMap
_vehicleMassKG = vehicleMassKG
_cycleName = cycleName
- _cycleDurationMinutes = cycleDurationMinutes
+ _cycleDurationMinutes = signals.TotalCycleTimeSeconds /60
'Total up the blow demands from compressor map
@@ -125,10 +126,10 @@ Namespace Pneumatics
'Get Average Power Demand @ Crank From Pneumatics
Public Function GetAveragePowerDemandAtCrankFromPneumatics() As Single Implements IM3_AveragePneumaticLoadDemand.GetAveragePowerDemandAtCrankFromPneumatics
- Dim averagePowerDemandAtCrankFromPneumatics As Single = _pneumaticsCompressorFlowRateMap.GetAveragePowerDemandPerCompressorUnitFlowRate _
+ Dim averagePowerDemandAtCrankFromPneumatics As Single = (_pneumaticsCompressorFlowRateMap.GetAveragePowerDemandPerCompressorUnitFlowRate /60) _
* (TotalAirDemand / (_cycleDurationMinutes * 60))
- averagePowerDemandAtCrankFromPneumatics /= _pneumaticUserInputsConfig.CompressorGearEfficiency
+ averagePowerDemandAtCrankFromPneumatics = averagePowerDemandAtCrankFromPneumatics / _pneumaticUserInputsConfig.CompressorGearEfficiency
Return averagePowerDemandAtCrankFromPneumatics
diff --git a/VECTOAux/VectoAuxiliaries/Signals.vb b/VECTOAux/VectoAuxiliaries/Signals.vb
index 133f32a744eb730f28b0eeb086dbefdf3ccbfcab..a095f1899ff14073f3f8c7446abd08857271cdd3 100644
--- a/VECTOAux/VectoAuxiliaries/Signals.vb
+++ b/VECTOAux/VectoAuxiliaries/Signals.vb
@@ -26,6 +26,8 @@ Implements ISignals
Public Property InNeutral As Boolean Implements ISignals.InNeutral
+
+
End Class
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb
index 55fe17eb920c2957618a18e6544578265a5e6722..ec7cfd4ad555f92aa2e69858a0f0939618995cbd 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb
@@ -14,7 +14,7 @@ Public _AveragePowerDemandAtCrankFromHVACMechanicalsWatts As Single
Public _HVACFuelingLitresPerHour As single
Public Function AveragePowerDemandAtAlternatorFromHVACElectricsWatts() As Single Implements IM1_AverageHVACLoadDemand.AveragePowerDemandAtAlternatorFromHVACElectricsWatts
- Return AveragePowerDemandAtAlternatorFromHVACElectricsWatts
+ Return _AveragePowerDemandAtAlternatorFromHVACElectricsWatts
End Function
Public Function AveragePowerDemandAtCrankFromHVACElectricsWatts() As Single Implements IM1_AverageHVACLoadDemand.AveragePowerDemandAtCrankFromHVACElectricsWatts
@@ -30,6 +30,11 @@ Public _HVACFuelingLitresPerHour As single
End Function
+
+Public Sub new()
+
+End Sub
+
Public Sub new ( AveragePowerDemandAtAlternatorFromHVACElectricsWatts As Single, _
AveragePowerDemandAtCrankFromHVACElectricsWatts As single, _
AveragePowerDemandAtCrankFromHVACMechanicalsWatts As Single, _
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb
index d118d019ef5092a6bd5371bb9ef47114bf2e7a82..14b4ad5464967d7eeba82beadc6830af0ad1c83f 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb
@@ -21,6 +21,10 @@ Public _GetAveragePowerDemandAtAlternator As Single
End Function
+Public Sub new()
+
+End Sub
+
Public Sub new ( GetAveragePowerAtCrankFromElectrics As Single,GetAveragePowerDemandAtAlternator As single )
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb
index 292a83ed4cf58069e14451b32182292f1d074838..062fa3668022b0e690ee20ee1d20c87c4ebec8ca 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb
@@ -19,6 +19,11 @@ Public Class M3_Mock
End Function
+
+Public Sub new()
+
+End Sub
+
Public Sub new ( GetAveragePowerDemandAtCrankFromPneumatics As Single,TotalAirConsumedPerCycle As single )
_GetAveragePowerDemandAtCrankFromPneumatics= GetAveragePowerDemandAtCrankFromPneumatics
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb
index 4bade5bb190309d3b0dd9665a8a4c4d9f444762a..513ec0a8d06017c1b5fed1832e99e1cb3a2afba7 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M4_Mock.vb
@@ -34,6 +34,10 @@ Public Property _PowerDifference As single
End Function
+ Public Sub new()
+
+ End Sub
+
Public Sub new(AveragePowerDemandPerCompressorUnitFlowRate as single , _
FlowRate As single, _
PowerCompressorOff As Single, _
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb
index 4b90846b15da29cf566f59b01a123f1ddfe7ca58..70621c1a9c5ba1d3ca6d7f98bee190c75de51a06 100644
--- a/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/M6_Mock.vb
@@ -33,7 +33,7 @@ public property _SmartPneumaticsOnlyCompressorFlag As integer
End Property
Public ReadOnly Property OverrunFlag As Integer Implements IM6.OverrunFlag
Get
- Return OverrunFlag
+ Return _OverrunFlag
End Get
End Property
Public ReadOnly Property SmartElecAndPneumaticAirCompPowerGenAtCrank As Single Implements IM6.SmartElecAndPneumaticAirCompPowerGenAtCrank
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
index aa111c805c1f0df1431bdc5dfcaf404dbf469a58..a9f6be7273699fdc63fb0d6a8e32c5aefddf4448 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
@@ -25,6 +25,7 @@ Namespace UnitTests
Private _compressorMapPath As String = "Testfiles\testCompressorMap.csv"
Private _defaultInputConfig As IPneumaticUserInputsConfig
+ Private _Signals As ISignals = New Signals
'Constructors
@@ -47,6 +48,9 @@ Namespace UnitTests
_defaultInputConfig.Doors = "Pneumatic"
_defaultInputConfig.SmartAirCompression = True
+ _Signals.TotalCycleTimeSeconds=3114
+
+
End Sub
@@ -64,8 +68,9 @@ Namespace UnitTests
Dim psActuationsMap = CType(New PneumaticActuationsMAP(_actuationsMapPath), IPneumaticActuationsMAP)
Dim psCompressorMap = CType(New CompressorMap(_compressorMapPath), ICompressorMap)
+
psCompressorMap.Initialise()
- Dim target As New M3_AveragePneumaticLoadDemand(psUserInputsConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _cycleDurationMinutes)
+ Dim target As New M3_AveragePneumaticLoadDemand(psUserInputsConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
@@ -84,7 +89,7 @@ Namespace UnitTests
psCompressorMap.Initialise()
- Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _cycleDurationMinutes)
+ Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
Dim expected As Single = 7664.94
Dim actual As Single = target.TotalAirDemand()
@@ -105,22 +110,22 @@ Namespace UnitTests
psCompressorMap.Initialise()
- Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _cycleDurationMinutes)
+ Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
- Dim expected As Single = 30.7680626
+ Dim expected As Single = 0.512801051
Dim actual As Single = target.GetAveragePowerDemandAtCrankFromPneumatics()
Assert.AreEqual(expected, actual)
End Sub
- 'CompressorGearEfficiency = 0.99
+
<Test()>
- Public Sub AverageLoadValueUsingDefaultAuxValues_AveragePowerAtTheCrank_0_99EFTest()
+ Public Sub AverageLoadValueUsingDefaultAuxValues_AveragePowerAtTheCrank_0_80EFTest()
initialise()
- _defaultInputConfig.CompressorGearEfficiency = 0.99
+ _defaultInputConfig.CompressorGearEfficiency = 0.8
Dim psAuxConfig = CType(New PneumaticsAuxilliariesConfig(True), IPneumaticsAuxilliariesConfig)
Dim psActuationsMap = CType(New PneumaticActuationsMAP(_actuationsMapPath), IPneumaticActuationsMAP)
@@ -128,9 +133,9 @@ Namespace UnitTests
psCompressorMap.Initialise()
- Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _cycleDurationMinutes)
+ Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
- Dim expected As Single = 24.863081
+ Dim expected As Single = 0.512801051
Dim actual As Single = target.GetAveragePowerDemandAtCrankFromPneumatics()
Assert.AreEqual(expected, actual)
@@ -148,7 +153,7 @@ Namespace UnitTests
psCompressorMap.Initialise()
- Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _cycleDurationMinutes)
+ Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
Dim expected As Single = 7664.94
Dim actual As Single = target.TotalAirConsumedPerCycle()
@@ -171,7 +176,7 @@ Namespace UnitTests
_defaultInputConfig.SmartRegeneration = False
- Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _cycleDurationMinutes)
+ Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
Dim expected As Single = 8545.207
Dim actual As Single = target.TotalAirConsumedPerCycle()
@@ -194,7 +199,7 @@ Namespace UnitTests
_defaultInputConfig.RetarderBrake = False
- Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _cycleDurationMinutes)
+ Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
Dim expected As Single = 8541.45
@@ -218,7 +223,7 @@ Namespace UnitTests
_defaultInputConfig.KneelingHeightMillimeters = 100
- Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _cycleDurationMinutes)
+ Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
Dim expected As Single = 8274.78
@@ -242,7 +247,7 @@ Namespace UnitTests
_defaultInputConfig.AirSuspensionControl = "Mechanically"
- Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _cycleDurationMinutes)
+ Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
Dim expected As Single = 8443.44
@@ -266,7 +271,7 @@ Namespace UnitTests
_defaultInputConfig.AdBlueDosing = "Pneumatic"
- Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _cycleDurationMinutes)
+ Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
Dim expected As Single = 7664.94
@@ -290,7 +295,7 @@ Namespace UnitTests
_defaultInputConfig.Doors = "Electric"
- Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _cycleDurationMinutes)
+ Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
Dim expected As Single = 6598.14
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
index 00ffbd425194afc1739e6c99d2398d82668b35fa..27f4cb787e98aa6a94b09132991079f56ddef78c 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
@@ -74,7 +74,7 @@ Public Sub AveragePowerDemandAtCrankFromHVACElectricsWattsTest()
Dim target As IM1_AverageHVACLoadDemand = GETM1Instance()
- Dim expected As Single = 196.576889
+ Dim expected As Single = 245.7211
dim actual as Single = target.AveragePowerDemandAtCrankFromHVACElectricsWatts
Assert.AreEqual( expected , actual)
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M6.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
similarity index 59%
rename from VECTOAux/VectoAuxiliariesTests/UnitTests/M6.vb
rename to VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
index 1b05d9d8e70d3627fd13a5bce5330c776aa3177d..5f646d440d8975fe99b4cd4d05fa3db079bea2eb 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M6.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
@@ -110,6 +110,80 @@ Public Sub SmartElectricalOffTest()
End Sub
+'Mikes Test Results
+<Test()> _
+<TestCase(100,100,100,100,20,20,40,100,100,100,100,-550,false, 0,0, 0, 20, 0,100,20,200,0)> _
+<TestCase(100,100,100,100,20,20,40,100,100,100,100,-550,true , 1,1, 100,40, 100,100,40,200,1)> _
+Public Sub MikesConditionsTest( M1_1 As Single, _
+ M1_2 As Single, _
+ M2_1 As Single, _
+ M3_1 As Single, _
+ M4_1 As Single, _
+ M4_2 As Single, _
+ M4_3 As Single, _
+ M5_1 As Single, _
+ M5_2 As Single, _
+ AUX As Single, _
+ EMP As Single, _
+ EDP As Single, _
+ SM As Boolean, _
+ OUT1 As Single, _
+ OUT2 As single, _
+ OUT3 As Single, _
+ OUT4 As Single, _
+ OUT5 As Single, _
+ OUT6 As Single, _
+ OUT7 As Single, _
+ OUT8 As Single, _
+ OUT9 As Single)
+
+
+ dim M1 = New M1_Mock()
+ dim M2 = New M2_Mock()
+ dim M3 = New M3_Mock()
+ dim M4 = New M4_Mock()
+ dim M5 = New M5_Mock()
+
+ Dim signals As New Signals()
+
+
+ M1._AveragePowerDemandAtCrankFromHVACMechanicalsWatts= M1_1
+ M1._AveragePowerDemandAtCrankFromHVACElectricsWatts=M1_2
+ M2._GetAveragePowerAtCrankFromElectrics=M2_1
+ M3._GetAveragePowerDemandAtCrankFromPneumatics= M3_1
+ M4._PowerCompressorOff=M4_1
+ M4._PowerDifference=M4_2
+ M4._PowerCompressorOn=M4_3
+ M5._AlternatorsGenerationPowerAtCrankTractionOnWatts=M5_1
+ M5._AlternatorsGenerationPowerAtCrankOverrunWatts=M5_2
+
+
+
+ signals.EngineMotoringPower= EMP
+ signals.PreExistingAuxPower=AUX
+ signals.EngineDrivelinePower=EDP
+ signals.SmartElectrics=SM
+
+
+ Dim target As New M6(M1,M2,M3,M4,M5,Signals)
+
+ Assert.AreEqual(OUT1,target.OverrunFlag)
+ Assert.AreEqual(OUT2,target.SmartElecAndPneumaticsCompressorFlag)
+ Assert.AreEqual(OUT3,target.SmartElecAndPneumaticAltPowerGenAtCrank)
+ Assert.AreEqual(OUT4,target.SmartElecAndPneumaticAirCompPowerGenAtCrank)
+ Assert.AreEqual(OUT5,target.SmartElecOnlyAltPowerGenAtCrank)
+ Assert.AreEqual(OUT6,target.AveragePowerDemandAtCrankFromPneumatics)
+ Assert.AreEqual(OUT7,target.SmartElecAndPneumaticAirCompPowerGenAtCrank)
+ Assert.AreEqual(OUT8,target.AvgPowerDemandAtCrankFromElectricsIncHVAC)
+ Assert.AreEqual(OUT9,target.SmartPneumaticsOnlyCompressorFlag)
+
+
+
+
+End Sub
+
+
+
End Class
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M7.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb
similarity index 62%
rename from VECTOAux/VectoAuxiliariesTests/UnitTests/M7.vb
rename to VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb
index 9c501559018e31792cb8d0674e5b54219495ea32..bb7acff071725a8b6c0bd24d80289b97888d4c1d 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M7.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb
@@ -44,29 +44,29 @@ End Sub
'OP3 OP3 :Smart Electrical Aux : Alternator Power Gen @ Crank
'OP4 OP4 :Smart Electrical Aux : Ait Compressor Power Gen @ Crank
<Test()> _
-<TestCase(100,200,false,0,false,true,300,400,500,600,700,1000,2000,3000,4000)> _
-Public Sub InputOutputTests(IP1 As Single, _
- IP2 As Single, _
- IP3 As Boolean, _
- IP4 As Single, _
- IP5 As Boolean, _
- IP6 As Boolean, _
- IP7 As Single, _
- IP8 As Single, _
- IP9 As single, _
- IP10 As Single, _
- IP11 As Single, _
- IP12 As Single, _
- IP13 As Single, _
- OP1 As Single, _
- OP2 As Single, _
- OP3 As Single, _
- OP4 As Single )
+<TestCase(100,200,false,0,false,true,300,400,500,600,700,100,600,100,600)> _
+<TestCase(100,200,true,0,false,true,300,400,500,600,700,200,600,200,600)> _
+<TestCase(100,200,false,1,true,false,300,400,500,600,700,300,400,500,700)> _
+Public Sub InputOutputTests(byval IP1 As Single, _
+ byval IP2 As Single, _
+ byval IP3 As Boolean, _
+ byval IP4 As Single, _
+ byval IP5 As Boolean, _
+ byval IP6 As Boolean, _
+ byval IP7 As Single, _
+ byval IP8 As Single, _
+ byval IP9 As single, _
+ byval IP10 As Single, _
+ byval IP11 As Single, _
+ byval OP1 As Single, _
+ byval OP2 As Single, _
+ byval OP3 As Single, _
+ byval OP4 As Single )
'Instantiate new mocks.
M5 = New M5_Mock()
M6 = New M6_Mock()
- Signals = New Signals
+ Signals = New Signals()
'Assign from TestCaseValues
M5._AlternatorsGenerationPowerAtCrankTractionOnWatts=IP1
@@ -85,12 +85,15 @@ Public Sub InputOutputTests(IP1 As Single, _
'Create Instance of M7 from
Dim target As IM7 = New M7(M5,M6,Signals)
-
-
- Assert.AreEqual(OP1, target.SmartElectricalAndPneumaticAuxAltPowerGenAtCrank)
- Assert.AreEqual(OP2, target.SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank)
- Assert.AreEqual(OP3, target.SmartElectricalOnlyAuxAltPowerGenAtCrank)
- Assert.AreEqual(OP4, target.SmartPneumaticOnlyAuxAirCompPowerGenAtCrank)
+ Dim OP1act As Single = target.SmartElectricalAndPneumaticAuxAltPowerGenAtCrank
+ Dim OP2act As Single = target.SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank
+ Dim OP3act As Single = target.SmartElectricalOnlyAuxAltPowerGenAtCrank
+ Dim OP4act As Single = target.SmartPneumaticOnlyAuxAirCompPowerGenAtCrank
+
+ Assert.AreEqual(OP1, OP1act)
+ Assert.AreEqual(OP2, OP2act)
+ Assert.AreEqual(OP3, OP3act)
+ Assert.AreEqual(OP4, OP4act)
Assert.IsNotNull(target)
diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
index 46124752357bc2f954470b614cf2227c6cba8f63..b4251fc537a37934e9018637ae5a961c6c08ec9f 100644
--- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
+++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
@@ -102,8 +102,8 @@
<Compile Include="UnitTests\M1_AverageHVACLoadDemandTests.vb" />
<Compile Include="UnitTests\M1_HVACAverageLoadDemandTests.vb" />
<Compile Include="UnitTests\M5_SmartAlternatorSetGenerationTests.vb" />
- <Compile Include="UnitTests\M6.vb" />
- <Compile Include="UnitTests\M7.vb" />
+ <Compile Include="UnitTests\M6Tests.vb" />
+ <Compile Include="UnitTests\M7Tests.vb" />
<Compile Include="UnitTests\PneumaticActuationsMapTests.vb" />
<Compile Include="UnitTests\AirCompressorTests.vb" />
<Compile Include="UnitTests\AlternatorMapTests.vb" />