diff --git a/VECTO/GUI/F_VECTO.vb b/VECTO/GUI/F_VECTO.vb
index c048ad091b9fb038395346b066df563138accd0a..c7764ecdd220fbbe3b7e26b7487124c88560f7ad 100644
--- a/VECTO/GUI/F_VECTO.vb
+++ b/VECTO/GUI/F_VECTO.vb
@@ -1352,6 +1352,11 @@ lbDlog:
'AA-TB
Private Sub btnBrowseAAUXFile_Click(sender As Object, e As EventArgs) Handles btnBrowseAAUXFile.Click
+ If String.IsNullOrEmpty(VECTOfile) Then
+ MessageBox.Show("Please complete and save a valid new .vecto file before adding/configuring advanced bus auxiliaries.")
+ Return
+ End If
+
Dim aauxFileValidated As Boolean = False
Dim fbAux As New cFileBrowser(True, False)
Dim message As String = String.Empty
diff --git a/VECTO/MODcalc/cPower.vb b/VECTO/MODcalc/cPower.vb
index a41da1c9414340c0a83492eecc9acce8bcfd1222..bc4d70c952a66cdea3804b84ec986c9ad686d787 100644
--- a/VECTO/MODcalc/cPower.vb
+++ b/VECTO/MODcalc/cPower.vb
@@ -1022,8 +1022,7 @@ lbCheck:
-lb_nOK:
-
+lb_nOK:
'************************************ Determine Engine-state ************************************
' nU is final here!
@@ -1067,8 +1066,6 @@ lb_nOK:
Paux = PreExistingAuxPower + fPaux(jz, EngineSpeed)
'***************** ADVANCED AUXILIARIES END ********************************************************
-
-
'ICE-inertia
If jz = 0 Then
PaMot = 0
@@ -1077,8 +1074,6 @@ lb_nOK:
PaMot = fPaMot(nU, MODdata.nU(jz - 1))
End If
-
-
'Total Engine-power
' => Pantr
' => P
@@ -1491,7 +1486,8 @@ lb_nOK:
advancedAuxModel.Signals.EngineStopped = false
End If
-
+ mAAUX_Global.EngineDrivelineTorque = nPeToM(nU, P) - (((Paux) * 1000) / (EngineSpeed / 9.55))
+ mAAUX_Global.advancedAuxModel.Signals.EngineDrivelineTorque = mAAUX_Global.EngineDrivelineTorque
advancedAuxModel.CycleStep(1,message)
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb
index f1c159146b1c1a43917fc10de2bedf96a7f865d7..da2a8d4b89372ebf53aa8b19c0220fc8d82450f0 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb
@@ -17,7 +17,6 @@ Namespace DownstreamModules
Public Class M9
Implements IM9
-
Private Const RPM_TO_RADS_PER_SECOND As Single = 9.55F
#Region "Aggregates"
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/BusDatabase.vb b/VECTOAux/VectoAuxiliaries/Hvac/BusDatabase.vb
index 97f5c98fb91d8012a43b0d722a69e8f0a4a2955a..34603ca9d56554f37f635978282df80ba075e852 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/BusDatabase.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/BusDatabase.vb
@@ -99,6 +99,12 @@ Namespace Hvac
returnStatus = False
End If
+ Dim uniqueBuses = From b In buses Select New With {Key b.Model, b} Distinct.ToList()
+
+ If buses.Count <> uniqueBuses.Count Then
+ returnStatus = False
+ End If
+
Return returnStatus
End Function
diff --git a/VECTOAux/VectoAuxiliaries/Pneumatics/PneumaticUserInputsConfig.vb b/VECTOAux/VectoAuxiliaries/Pneumatics/PneumaticUserInputsConfig.vb
index 778ac02e15bf0e71ab54f5db8beb350a784949cb..940621baa91110233daa1448912de51dc3ef3f8d 100644
--- a/VECTOAux/VectoAuxiliaries/Pneumatics/PneumaticUserInputsConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/Pneumatics/PneumaticUserInputsConfig.vb
@@ -50,7 +50,7 @@ Namespace Pneumatics
AirSuspensionControl = "Mechanically"
Doors = "Pneumatic"
KneelingHeightMillimeters = 70
- ActuationsMap = "testPneumaticActuationsMap.apac"
+ ActuationsMap = Nothing
RetarderBrake = True
SmartAirCompression = False
SmartRegeneration = False
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
index 34332da34aad7741e699e8ff9dddebde5732c0f0..73a06c859b8bcb1a3922e45e6306c1e26ad9e53f 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
@@ -509,10 +509,8 @@ Public Class frmAuxiliaryConfig
Public Function ValidateAll() As Boolean
- If Validate_Pneumatics() = False OrElse Validate_Electrics() = False OrElse Validate_HVAC() = False Then
-
+ If Validate_Pneumatics() = False Or Validate_Electrics() = False Or Validate_HVAC() = False Then
Return False
-
End If
Return True
@@ -909,7 +907,7 @@ Public Class frmAuxiliaryConfig
Using frm As New frmCombinedAlternators(absoluteAALTPath, New CombinedAlternatorSignals)
'If Dialog result is OK, then take action else bail
If frm.ShowDialog() = Windows.Forms.DialogResult.OK Then
- If suppliedAALTPath.Contains(":\") Then
+ If suppliedAALTPath.Contains(":\") AndAlso Not String.IsNullOrEmpty(vectoPath) Then
txtAlternatorMapPath.Text = If(suppliedAALTPath.Contains(vectoPath), suppliedAALTPath.Replace(vectoPath, ""), suppliedAALTPath)
Else
txtAlternatorMapPath.Text = fFileWoDir(suppliedAALTPath)
@@ -919,6 +917,8 @@ Public Class frmAuxiliaryConfig
End If
End Using
+ Validate_Electrics()
+
End If
End Sub
@@ -994,10 +994,9 @@ Public Class frmAuxiliaryConfig
MessageBox.Show("Unable to load")
-
End If
-
+ Validate_HVAC()
End If
@@ -1060,7 +1059,7 @@ Public Class frmAuxiliaryConfig
Using frm As New frmHVACTool(absoluteBusDatabasePath, absoluteSSMPath, vectoFile, Not fileExists)
If frm.ShowDialog() = Windows.Forms.DialogResult.OK Then
- If suppliedSSMPath.Contains(":\") Then
+ If suppliedSSMPath.Contains(":\") AndAlso Not String.IsNullOrEmpty(vectoPath) Then
txtSSMFilePath.Text = If(suppliedSSMPath.Contains(vectoPath), suppliedSSMPath.Replace(vectoPath, ""), suppliedSSMPath)
Else
txtSSMFilePath.Text = fFileWoDir(suppliedSSMPath)
@@ -1070,6 +1069,8 @@ Public Class frmAuxiliaryConfig
End If
End Using
+ Validate_HVAC()
+
End If
End Sub
@@ -1528,4 +1529,7 @@ Public Class frmAuxiliaryConfig
End Sub
+ Protected Overrides Sub Finalize()
+ MyBase.Finalize()
+ End Sub
End Class
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
index 7b06142d6023369e3954950b1103cd58107b10d6..0de2727300ea74e1a1a75ac3e755dd38dae1ef68 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
@@ -94,7 +94,7 @@ Namespace UnitTests
Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
- Dim expected As Single = 7664.94
+ Dim expected As Single = 7947.684
Dim actual As Single = target.TotalAirDemand()
Assert.AreEqual(expected, actual)
@@ -115,7 +115,7 @@ Namespace UnitTests
Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
- Dim expected As Single = 5798.042
+ Dim expected As Single = 5832.091
Dim actual As Single = target.GetAveragePowerDemandAtCrankFromPneumatics()
Assert.AreEqual(expected, actual)
@@ -138,7 +138,7 @@ Namespace UnitTests
Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
- Dim expected As Single = 5798.042
+ Dim expected As Single = 5832.091
Dim actual As Single = target.GetAveragePowerDemandAtCrankFromPneumatics()
Assert.AreEqual(expected, actual)
@@ -158,7 +158,7 @@ Namespace UnitTests
Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
- Dim expected As Single = Math.Round( 7664.94/_Signals.TotalCycleTimeSeconds,4)
+ Dim expected As Single = Math.Round(7947.55127 / _Signals.TotalCycleTimeSeconds, 4)
Dim actual As Single = Math.Round(target.AverageAirConsumedPerSecondLitre(),4)
Assert.AreEqual(expected, actual)
@@ -181,7 +181,7 @@ Namespace UnitTests
Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
- Dim expected As Single = Math.Round( 8545.207/_Signals.TotalCycleTimeSeconds,4)
+ Dim expected As Single = Math.Round(8863.378 / _Signals.TotalCycleTimeSeconds, 4)
Dim actual As Single = Math.Round(target.AverageAirConsumedPerSecondLitre(),4)
Assert.AreEqual(expected, actual)
@@ -228,7 +228,7 @@ Namespace UnitTests
Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
- Dim expected As Single = 8274.78 / _Signals.TotalCycleTimeSeconds
+ Dim expected As Single = 8557.524 / _Signals.TotalCycleTimeSeconds
Dim actual As Single = Math.Round(target.AverageAirConsumedPerSecondLitre(), 8)
@@ -252,7 +252,7 @@ Namespace UnitTests
Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
- Dim expected As Single = 7664.94/_Signals.TotalCycleTimeSeconds
+ Dim expected As Single = 7947.68457 / _Signals.TotalCycleTimeSeconds
Dim actual As Single = Math.Round(target.AverageAirConsumedPerSecondLitre(), 6)
@@ -276,7 +276,7 @@ Namespace UnitTests
Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
- Dim expected As Single = 7664.94 / _Signals.TotalCycleTimeSeconds
+ Dim expected As Single = 7947.68457 / _Signals.TotalCycleTimeSeconds
Dim actual As Single = Math.Round(target.AverageAirConsumedPerSecondLitre(), 6)
@@ -300,7 +300,7 @@ Namespace UnitTests
Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
- Dim expected As Single = 6598.14 / _Signals.TotalCycleTimeSeconds
+ Dim expected As Single = 6880.88428 / _Signals.TotalCycleTimeSeconds
Dim actual As Single = Math.Round(target.AverageAirConsumedPerSecondLitre(), 6)
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
index 406a2d2592c58fa191c11212628e99481028ca6c..1e057d583fbd38f2dda66358033addae4c70a219 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
@@ -107,7 +107,7 @@ Namespace UnitTests
New AltUserInput(10, 55), _
New AltUserInput(40, 45), _
New AltUserInput(60, 67), _
- New AltUserInput(60, 67), _
+ New AltUserInput(61, 67), _
New AltUserInput(200, 67)}
Alt4ExpectedTable4000 = New List(Of AltUserInput)() From {New AltUserInput(0, 77), _
@@ -391,7 +391,7 @@ Namespace UnitTests
Dim actual As AlternatorMapValues = ca.GetEfficiency(1750, 170)
- Assert.AreEqual(0.5601562F, actual.Efficiency)
+ Assert.AreEqual(0.684354842F, actual.Efficiency)
End Sub
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
index 9cffaae25b8b3c8b3a42183ad91dda9c99a7caf3..bb9f24d76a9e15a7d421b94b3aa0ece244220073 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
@@ -94,7 +94,7 @@ End Sub
Public Sub AlternatorsEfficiencyIdle2000rpmTest()
Initialise()
- Dim expected As Single = 0.3654489
+ Dim expected As Single = 0.6308339
Dim actual As Single = target.AlternatorsEfficiencyIdleResultCard()
Assert.AreEqual(expected, actual)
@@ -107,7 +107,7 @@ End Sub
Public Sub AlternatorsEfficiencyTraction2000rpmTest()
Initialise()
- Dim expected As Single = 0.3654489
+ Dim expected As Single = 0.6308339
Dim actual As Single = target.AlternatorsEfficiencyTractionOnResultCard()
Assert.AreEqual(expected, actual)
@@ -119,7 +119,7 @@ End Sub
Public Sub AlternatorsEfficiencyOverrun2000rpmTest()
Initialise()
- Dim expected As Single = 0.3654489
+ Dim expected As Single = 0.6308339
Dim actual As Single = target.AlternatorsEfficiencyOverrunResultCard()
Assert.AreEqual(expected, actual)
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
index 5d7abf9dc084d9da147faa558860a926334eea27..11112d24edb081c46b5a11629ef5c2d49a6066d1 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
@@ -70,7 +70,7 @@ Namespace UnitTests
Dim actual As Single = target.AlternatorsEfficiency
- Dim expected As Single = 0.6720275
+ Dim expected As Single = 0.62
Assert.AreEqual(expected, actual)
@@ -83,7 +83,7 @@ Namespace UnitTests
Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, alternatorMap, powernetVoltage, signals, GetSSM())
Dim actual As Single
- Dim expected As Single = 18.81821
+ Dim expected As Single = 0
actual = target.GetHVACElectricalPowerDemandAmps()
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
index 9089489f7f26b48dbb5bd6ff2909f1e31f9da4e5..79350fd630c3e1a964adf4486e18bf8fbccea3d4 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb
@@ -8,57 +8,56 @@ Imports Moq
Namespace UnitTests
-<TestFixture()> _
-Public Class M13Tests
-
-Private Const FUEL_DENSITY_percm3 As Single = 0.835
-
-
-'<TestCase(50, 60, 70, TRUE, TRUE ,100, 1,False, 72287.5f , 86.57185629f )> _
-
-<Test()> _
-<TestCase(50, 60, 70, FALSE, FALSE,100, 1,False, 60f , 86.57185629f )> _
-<TestCase(50, 60, 70, FALSE, TRUE ,100, 1,False, 50f , 86.55988024f )> _
-<TestCase(50, 60, 70, TRUE, FALSE,100, 1,False, 70f , 86.58383234f )> _
-<TestCase(50, 60, 70, TRUE, TRUE ,100, 1,False, 60f , 86.57185629f )> _
-<TestCase(50, 60, 70, TRUE, TRUE ,100, 2,True, 120f ,173.14371258f )> _
-Public Sub InputOutputValues( IP1 As single,
- IP2 As single,
- IP3 As single,
- IP4 As Boolean,
- IP5 As Boolean,
- IP6 As single,
- IP7 As Single,
- IP8 As Boolean,
- OUT1 As single,
- OUT2 As single)
-
-'Arrange
-Dim m1 As New Mock(Of IM1_AverageHVACLoadDemand)
-Dim m10 As New Mock(Of IM10)
-Dim M12 As New Mock(Of IM12)
-Dim Signals As New Mock(Of ISignals)
-
-m12.Setup ( Function(x) x.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand) .Returns( IP1 )
-m12.Setup ( Function(x) x.BaseFuelConsumptionWithTrueAuxiliaryLoads) .Returns( IP2 )
-m10.Setup ( Function(x) x.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand) .Returns( IP3 )
-Signals.Setup ( Function(x) x.SmartPneumatics) .Returns( IP4 )
-Signals.Setup ( Function(x) x.SmartElectrics) .Returns( IP5 )
-m1.Setup ( Function(x) x.HVACFuelingLitresPerHour) .Returns( IP6 )
-Signals.Setup ( Function(x) x.WHTC) .Returns( IP7 )
-Signals.Setup ( Function(x) x.DeclarationMode) .Returns( IP8 )
-Signals.Setup ( Function(x) x.TotalCycleTimeSeconds) .Returns( 3114)
-Signals.Setup ( Function(x) x.CurrentCycleTimeInSeconds) .Returns( 3114)
-
-'Act
- Dim target = New M13( m1.Object, m10.Object, M12.Object, Signals.Object)
-
- 'Assert
- Assert.AreEqual( OUT1, target.WHTCTotalCycleFuelConsumptionGrams )
-
-End Sub
-
-End Class
+ <TestFixture()> _
+ Public Class M13Tests
+
+ Private Const FUEL_DENSITY_percm3 As Single = 0.835
+
+
+ '<TestCase(50, 60, 70, TRUE, TRUE ,100, 1,False, 72287.5f , 86.57185629f )> _
+
+ <Test()> _
+ <TestCase(50, 60, 70, False, False, 100, 1, False, 60.0F, 86.57185F)> _
+ <TestCase(50, 60, 70, False, True, 100, 1, False, 50.0F, 86.55988F)> _
+ <TestCase(50, 60, 70, True, False, 100, 1, False, 70.0F, 86.58383F)> _
+ <TestCase(50, 60, 70, True, True, 100, 1, False, 60.0F, 86.57185F)> _
+ <TestCase(50, 60, 70, True, True, 100, 2, True, 120.0F, 173.1437F)> _
+ Public Sub InputOutputValues(IP1 As Single,
+ IP2 As Single,
+ IP3 As Single,
+ IP4 As Boolean,
+ IP5 As Boolean,
+ IP6 As Single,
+ IP7 As Single,
+ IP8 As Boolean,
+ OUT1 As Single,
+ OUT2 As Single)
+
+ 'Arrange
+ Dim m10 As New Mock(Of IM10)
+ Dim m11 As New Mock(Of IM11)
+ Dim m12 As New Mock(Of IM12)
+ Dim Signals As New Mock(Of ISignals)
+
+ m12.Setup(Function(x) x.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand).Returns(IP1)
+ m12.Setup(Function(x) x.BaseFuelConsumptionWithTrueAuxiliaryLoads).Returns(IP2)
+ m10.Setup(Function(x) x.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand).Returns(IP3)
+ Signals.Setup(Function(x) x.SmartPneumatics).Returns(IP4)
+ Signals.Setup(Function(x) x.SmartElectrics).Returns(IP5)
+ Signals.Setup(Function(x) x.WHTC).Returns(IP7)
+ Signals.Setup(Function(x) x.DeclarationMode).Returns(IP8)
+ Signals.Setup(Function(x) x.TotalCycleTimeSeconds).Returns(3114)
+ Signals.Setup(Function(x) x.CurrentCycleTimeInSeconds).Returns(3114)
+
+ 'Act
+ Dim target = New M13(m10.Object, m11.Object, m12.Object, Signals.Object)
+
+ 'Assert
+ Assert.AreEqual(OUT1, target.WHTCTotalCycleFuelConsumptionGrams)
+
+ End Sub
+
+ End Class
End Namespace
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
index 5e17e34ef475e60494af01d6b913aa2dbf0a354d..da05430d4ec1be59007a2bb726ed844b9d9a9895 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
@@ -57,6 +57,14 @@ public class SSMToolMock
Public Property GenInputs As ISSMGenInputs Implements ISSMTOOL.GenInputs
+ Get
+ Return New SSMGenInputs(True)
+ End Get
+ Set(value As ISSMGenInputs)
+
+ End Set
+ End Property
+
Public Function IsEqualTo(source As ISSMTOOL) As Boolean Implements ISSMTOOL.IsEqualTo
End Function
@@ -99,8 +107,8 @@ Public Class M14Tests
Dim ip5 As Single = 3114
Dim ip6 As Single = 3114
- Dim expectedOut1 As Single=1779.33337f
- Dim expectedOut2 As Single=2.13093829f
+ Dim expectedOut1 As Single = 780333.4F
+ Dim expectedOut2 As Single = 0.934531F
Dim m13 As New Mock(Of IM13)
Dim hvacSSM As New Mock(Of ISSMTOOL)
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
index fa709354f96a9cc52ca92cbb363ce781c1584622..1647a7a614d5a2da58896d0ea42c7848da0699bc 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
@@ -66,7 +66,7 @@ Public Sub GetAveragePowerDemandAtCrankFromHVACMechanicsWattsTest()
Dim target As IM1_AverageHVACLoadDemand = GETM1Instance()
- Dim expected As Single = 1431.42224
+ Dim expected As Single = 1580.276
dim actual as Single = target.AveragePowerDemandAtCrankFromHVACMechanicalsWatts
Assert.AreEqual( expected , actual)
@@ -78,7 +78,7 @@ Public Sub AveragePowerDemandAtCrankFromHVACElectricsWattsTest()
Dim target As IM1_AverageHVACLoadDemand = GETM1Instance()
- Dim expected As Single = 1118.72766
+ Dim expected As Single = 0
dim actual as Single = target.AveragePowerDemandAtCrankFromHVACElectricsWatts
Assert.AreEqual( expected , actual)
@@ -90,7 +90,7 @@ Public Sub AveragePowerDemandAtAlternatorFromHVACElectricsWattsTest()
Dim target As IM1_AverageHVACLoadDemand = GETM1Instance()
- Dim expected As Single = 494.918945
+ Dim expected As Single = 0
dim actual as Single = target.AveragePowerDemandAtAlternatorFromHVACElectricsWatts
Assert.AreEqual( expected , actual)
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
index 5c64846b14be4a399bb5a19a6d7f2e4182851420..679c90ba293315a9a8405584537e160d6079fdc7 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
@@ -77,7 +77,7 @@ End Function
<Test()>
Public Sub GetAveragePowerAtCrankTest()
Dim target As M2_AverageElectricalLoadDemand = GetAverageElectricalDemandInstance()
- Dim expected As Single = 3604.51074
+ Dim expected As Single = 10914.6543
Dim actual As Single = target.GetAveragePowerAtCrankFromElectrics()
Assert.AreEqual(expected, actual)
End Sub
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
index 495b46f3d4fdfef0d3769846ee87b1f021161535..34ad37a163216075e2c5af0ec0948cae25d819d1 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
@@ -81,7 +81,7 @@ Public Sub PowerAtCrankIdleWatts()
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05,_powerNetVoltage,_altGearPullyEfficiency)
- Dim expected As Single = 4385.07
+ Dim expected As Single = 1641.35791
Dim actual As Single = _target.AlternatorsGenerationPowerAtCrankIdleWatts()
Assert.AreEqual( expected, actual)
@@ -93,7 +93,7 @@ Public Sub PowerAtCrankTractionWatts()
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05,_powerNetVoltage,_altGearPullyEfficiency)
- Dim expected As Single = 4385.07
+ Dim expected As Single = 1641.35791
Dim actual As Single = _target.AlternatorsGenerationPowerAtCrankTractionOnWatts()
Assert.AreEqual( expected, actual)
@@ -105,7 +105,7 @@ Public Sub PowerAtCrankOverrunWatts()
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05,_powerNetVoltage,_altGearPullyEfficiency)
- Dim expected As Single = 4385.07f
+ Dim expected As Single = 1641.35791F
Dim actual As Single = _target.AlternatorsGenerationPowerAtCrankOverrunWatts()