diff --git a/AuxillaryTestHarness/AuxiliaryTestHarness.vbproj b/AuxillaryTestHarness/AuxiliaryTestHarness.vbproj
index 99905a80cef414dfcbe247491d0ca91de4597c9b..cb43fa8c9d273640ee0084737b096021bac595ad 100644
--- a/AuxillaryTestHarness/AuxiliaryTestHarness.vbproj
+++ b/AuxillaryTestHarness/AuxiliaryTestHarness.vbproj
@@ -179,6 +179,9 @@
</ItemGroup>
<ItemGroup>
<None Include="AuxillaryTestHarness_TemporaryKey.pfx" />
+ <Content Include="HVACSteadyStateModel.AHSM">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<None Include="My Project\Application.myapp">
<Generator>MyApplicationCodeGenerator</Generator>
<LastGenOutput>Application.Designer.vb</LastGenOutput>
diff --git a/AuxillaryTestHarness/HVACSteadyStateModel.AHSM b/AuxillaryTestHarness/HVACSteadyStateModel.AHSM
new file mode 100644
index 0000000000000000000000000000000000000000..73b88edcabc3732f26e11b60eb3d1ca6fa5fa2c8
--- /dev/null
+++ b/AuxillaryTestHarness/HVACSteadyStateModel.AHSM
@@ -0,0 +1,11 @@
+[Electrical Power (w)],[ Mechanical Power (w)], [Fuelling (L/H)]
+100,100,0
+[MODELSOURCE]
+Modelname : HVAC MODEL SYSTEM
+Model Version : 1.0
+UserName : Joe Bloggs
+DateTime : 15th Feb 2014
+Comments :This is some descriptive Comments on the production of this model.
+
+[KeyValuePairs]
+AmbientTemperature Deg C : 22
diff --git a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
index 20ac69e83808413b7cbcb539e011e36dbd7db066..d788e74dab3f9be5a550de9c45d03d11966f9db2 100644
--- a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
+++ b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
@@ -87,7 +87,6 @@ Public Class AdvancedAuxiliaries
M0 = New M0_NonSmart_AlternatorsSetEfficiency( auxConfig.ElectricalUserInputsConfig.ElectricalConsumers,
- New HVACInputs,
alternatorMap,
auxConfig.ElectricalUserInputsConfig.PowerNetVoltage,
Signals,
@@ -103,8 +102,6 @@ Public Class AdvancedAuxiliaries
M1 = New M1_AverageHVACLoadDemand(M0,
- New HVACMap(""),
- New HVACInputs(),
auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency,
auxConfig.PneumaticUserInputsConfig.CompressorGearEfficiency,
auxConfig.ElectricalUserInputsConfig.PowerNetVoltage,
diff --git a/VECTOAux/VectoAuxiliaries/AuxillaryEnvironment.vb b/VECTOAux/VectoAuxiliaries/AuxillaryEnvironment.vb
index 79b1d2b278feb5811958ecfded467de59cbc3958..67008572e0ff0e2f5995318195eee95c98561da4 100644
--- a/VECTOAux/VectoAuxiliaries/AuxillaryEnvironment.vb
+++ b/VECTOAux/VectoAuxiliaries/AuxillaryEnvironment.vb
@@ -102,7 +102,6 @@ ElectricalUserInputsConfig.ElectricalConsumers.DoorDutyCycleFraction = GetDoorAc
M0 = New M0_NonSmart_AlternatorsSetEfficiency( ElectricalUserInputsConfig.ElectricalConsumers,
- New HVACInputs,
alternatoMap,
ElectricalUserInputsConfig.PowerNetVoltage,
Signals,
@@ -118,8 +117,6 @@ M05 = New M0_5_SmartAlternatorSetEfficiency(M0,
M1 = New M1_AverageHVACLoadDemand(M0,
- New HVACMap(""),
- New HVACInputs(),
ElectricalUserInputsConfig.AlternatorGearEfficiency,
PneumaticUserInputsConfig.CompressorGearEfficiency,
ElectricalUserInputsConfig.PowerNetVoltage,
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/M0_NonSmart_AlternatorsSetEfficiency.vb b/VECTOAux/VectoAuxiliaries/Electrics/M0_NonSmart_AlternatorsSetEfficiency.vb
index f623bab489158a31f9635d6312fdf6e6273e3b2e..b37f103f3c4c77ed69483f80cf122b151b05c9a3 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/M0_NonSmart_AlternatorsSetEfficiency.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/M0_NonSmart_AlternatorsSetEfficiency.vb
@@ -9,7 +9,7 @@ Public Class M0_NonSmart_AlternatorsSetEfficiency
Private _electricalConsumersList As IElectricalConsumerList
- Private _hvacInputs As IHVACInputs
+' Private _hvacInputs As IHVACInputs
Private _alternatorEfficiencyMap As IAlternatorMap
Private _powernetVoltage As Single
@@ -17,17 +17,17 @@ Public Class M0_NonSmart_AlternatorsSetEfficiency
Private _steadyStateModelHVAC As IHVACSteadyStateModel
- Public Sub New(electricalConsumers As IElectricalConsumerList, hvacInputs As IHVACInputs, alternatorEfficiencyMap As IAlternatorMap, powernetVoltage As Single, signals As ISignals, ssmHvac As IHVACSteadyStateModel)
+ Public Sub New(electricalConsumers As IElectricalConsumerList, alternatorEfficiencyMap As IAlternatorMap, powernetVoltage As Single, signals As ISignals, ssmHvac As IHVACSteadyStateModel)
If electricalConsumers Is Nothing Then Throw New ArgumentException("No ElectricalConsumersList Supplied")
- If hvacInputs Is Nothing Then Throw New ArgumentException("No hvac inputs supplied")
+ 'If hvacInputs Is Nothing Then Throw New ArgumentException("No hvac inputs supplied")
If alternatorEfficiencyMap Is Nothing Then Throw New ArgumentException("No Alternator Efficiency Map Supplied")
If (powernetVoltage < ElectricConstants.PowenetVoltageMin Or powernetVoltage > ElectricConstants.PowenetVoltageMax) Then Throw New ArgumentException("Powernet Voltage out of range")
If signals is Nothing then Throw New ArgumentException("No Signals reference was supplied.")
Me._electricalConsumersList = electricalConsumers
- Me._hvacInputs = hvacInputs
+ 'Me._hvacInputs = hvacInputs
Me._alternatorEfficiencyMap = alternatorEfficiencyMap
Me._powernetVoltage = powernetVoltage
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/M1_AverageHVACLoadDemand.vb b/VECTOAux/VectoAuxiliaries/Hvac/M1_AverageHVACLoadDemand.vb
index a80b9af311db6a14a9d6fcf5218fce8e854f62ae..78eee8c1262b406338ed0e5b85f3ee7f44cd1096 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/M1_AverageHVACLoadDemand.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/M1_AverageHVACLoadDemand.vb
@@ -10,19 +10,17 @@ Namespace Hvac
Private _m0 As IM0_NonSmart_AlternatorsSetEfficiency
Private _alternatorGearEfficiency As Single
Private _compressorGearEfficiency As Single
- Private _hvacInputs As IHVACInputs
- Private _hvacMap As IHVACMap
+
Private _signals As ISignals
Private _powernetVoltage As Single
Private _steadyStateModel As IHVACSteadyStateModel
- Public Sub New(m0 As IM0_NonSmart_AlternatorsSetEfficiency, hvacMap As IHVACMap, hvacInputs As IHVACInputs, altGearEfficiency As Single, compressorGearEfficiency As Single, powernetVoltage As Single, signals As ISignals, ssm As IHVACSteadyStateModel)
+ Public Sub New(m0 As IM0_NonSmart_AlternatorsSetEfficiency, altGearEfficiency As Single, compressorGearEfficiency As Single, powernetVoltage As Single, signals As ISignals, ssm As IHVACSteadyStateModel)
'Sanity Check - Illegal operations without all params.
If m0 Is Nothing Then Throw New ArgumentException("Module0 as supplied is null")
- If hvacMap Is Nothing Then Throw New ArgumentException("hvacMap as supplied is null")
- If hvacInputs Is Nothing Then Throw New ArgumentException("hvacInputs as supplied is null")
+
If altGearEfficiency < ElectricConstants.AlternatorPulleyEfficiencyMin OrElse altGearEfficiency > ElectricConstants.AlternatorPulleyEfficiencyMax Then _
Throw New ArgumentException(String.Format("Gear efficiency must be between {0} and {1}", ElectricConstants.AlternatorPulleyEfficiencyMin, ElectricConstants.AlternatorPulleyEfficiencyMax))
@@ -36,8 +34,6 @@ Namespace Hvac
'Assign
_m0 = m0
- _hvacMap = hvacMap
- _hvacInputs = hvacInputs
_alternatorGearEfficiency = altGearEfficiency
_signals = signals
_steadyStateModel = ssm
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
index 1e1101528fd3ea0435ec0b4e5dfec11babe0d9cf..f763008869b10c13a79d088e839c166c1f8f8c54 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
@@ -115,6 +115,9 @@ Partial Class frmAuxiliaryConfig
Me.txtPerStopBrakeActuationNIperKG = New System.Windows.Forms.TextBox()
Me.txtSmartRegenFractionTotalAirDemand = New System.Windows.Forms.TextBox()
Me.tabHVACConfig = New System.Windows.Forms.TabPage()
+ Me.btnSSMBSource = New System.Windows.Forms.Button()
+ Me.lblSSMFilePath = New System.Windows.Forms.Label()
+ Me.txtSSMFilePath = New System.Windows.Forms.TextBox()
Me.lblHVACTitle = New System.Windows.Forms.Label()
Me.txtHVACFuellingLitresPerHour = New System.Windows.Forms.TextBox()
Me.lblHVACFuellingLitresPerHour = New System.Windows.Forms.Label()
@@ -126,9 +129,6 @@ Partial Class frmAuxiliaryConfig
Me.DeleteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ErrorProvider = New System.Windows.Forms.ErrorProvider(Me.components)
Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
- Me.txtSSMFilePath = New System.Windows.Forms.TextBox()
- Me.lblSSMFilePath = New System.Windows.Forms.Label()
- Me.btnSSMBSource = New System.Windows.Forms.Button()
Me.pnlMain.SuspendLayout
Me.tabMain.SuspendLayout
Me.tabGeneralConfig.SuspendLayout
@@ -1029,6 +1029,32 @@ Partial Class frmAuxiliaryConfig
Me.tabHVACConfig.Text = "HVAC"
Me.tabHVACConfig.UseVisualStyleBackColor = true
'
+ 'btnSSMBSource
+ '
+ Me.btnSSMBSource.Location = New System.Drawing.Point(712, 82)
+ Me.btnSSMBSource.Name = "btnSSMBSource"
+ Me.btnSSMBSource.Size = New System.Drawing.Size(45, 23)
+ Me.btnSSMBSource.TabIndex = 28
+ Me.btnSSMBSource.Text = ". . ."
+ Me.btnSSMBSource.UseVisualStyleBackColor = true
+ '
+ 'lblSSMFilePath
+ '
+ Me.lblSSMFilePath.AutoSize = true
+ Me.lblSSMFilePath.Location = New System.Drawing.Point(31, 88)
+ Me.lblSSMFilePath.Name = "lblSSMFilePath"
+ Me.lblSSMFilePath.Size = New System.Drawing.Size(171, 13)
+ Me.lblSSMFilePath.TabIndex = 27
+ Me.lblSSMFilePath.Text = "Steady State Model File ( .AHSM )"
+ '
+ 'txtSSMFilePath
+ '
+ Me.txtSSMFilePath.Location = New System.Drawing.Point(210, 85)
+ Me.txtSSMFilePath.Name = "txtSSMFilePath"
+ Me.txtSSMFilePath.ReadOnly = true
+ Me.txtSSMFilePath.Size = New System.Drawing.Size(485, 20)
+ Me.txtSSMFilePath.TabIndex = 26
+ '
'lblHVACTitle
'
Me.lblHVACTitle.AutoSize = true
@@ -1108,32 +1134,6 @@ Partial Class frmAuxiliaryConfig
'
Me.Timer1.Interval = 1000
'
- 'txtSSMFilePath
- '
- Me.txtSSMFilePath.Location = New System.Drawing.Point(210, 85)
- Me.txtSSMFilePath.Name = "txtSSMFilePath"
- Me.txtSSMFilePath.ReadOnly = true
- Me.txtSSMFilePath.Size = New System.Drawing.Size(485, 20)
- Me.txtSSMFilePath.TabIndex = 26
- '
- 'lblSSMFilePath
- '
- Me.lblSSMFilePath.AutoSize = true
- Me.lblSSMFilePath.Location = New System.Drawing.Point(31, 88)
- Me.lblSSMFilePath.Name = "lblSSMFilePath"
- Me.lblSSMFilePath.Size = New System.Drawing.Size(171, 13)
- Me.lblSSMFilePath.TabIndex = 27
- Me.lblSSMFilePath.Text = "Steady State Model File ( .AHSM )"
- '
- 'btnSSMBSource
- '
- Me.btnSSMBSource.Location = New System.Drawing.Point(712, 82)
- Me.btnSSMBSource.Name = "btnSSMBSource"
- Me.btnSSMBSource.Size = New System.Drawing.Size(45, 23)
- Me.btnSSMBSource.TabIndex = 28
- Me.btnSSMBSource.Text = ". . ."
- Me.btnSSMBSource.UseVisualStyleBackColor = true
- '
'frmAuxiliaryConfig
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
index fe6b7e0396e74256c0cd1f59cc1c246eb4f9748b..c342a979f7ada9d15c4b7bf5e432c5ac22980bcf 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
@@ -669,7 +669,7 @@ Dim result As Boolean = True
ErrorProvider.SetError(txtHVACFuellingLitresPerHour, String.Empty)
End If
- UpdateTabStatus("tabHVACConfig", result)
+
If txtSSMFilePath.Text.Trim.Length=0 then
@@ -680,7 +680,7 @@ Dim result As Boolean = True
End If
-
+ UpdateTabStatus("tabHVACConfig", result)
Return result
@@ -1186,4 +1186,22 @@ End Sub
+Private Sub btnSSMBSource_Click( sender As Object, e As EventArgs) Handles btnSSMBSource.Click
+
+
+ Dim fbAux As New cFileBrowser(True, False)
+
+
+ fbAux.Extensions = New String() {"ahsm"}
+
+ If fbAux.OpenDialog(fPATH(vectoFile)) Then
+
+ txtSSMFilePath.Text = fFileWoDir(fbAux.Files(0), fPATH(vectoFile))
+
+ End If
+
+
+End Sub
+
+
End Class
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
index 8bbfc542185fe50370a2f15ed264da90baadffe1..253edb497aabd38e0531a2f066faecb1b08feb38 100644
--- a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
+++ b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
@@ -116,14 +116,11 @@
<Compile Include="Electrics\SmartResult.vb" />
<Compile Include="FilePathUtils.vb" />
<Compile Include="Hvac\HVACConstants.vb" />
- <Compile Include="Hvac\HVACInputs.vb" />
<Compile Include="Electrics\IElectricalConsumerList.vb" />
- <Compile Include="Hvac\HVACMap.vb" />
<Compile Include="Hvac\HVACSteadyStateModel.vb" />
<Compile Include="Hvac\HVACUserInputsConfig.vb" />
<Compile Include="Hvac\IHVACInputs.vb" />
<Compile Include="Hvac\HVACMapParameter.vb" />
- <Compile Include="Hvac\IHVACMap.vb" />
<Compile Include="Hvac\IHVACSteadyStateModel.vb" />
<Compile Include="Hvac\IHVACUserInputsConfig.vb" />
<Compile Include="Hvac\IM1_AverageHVACLoadDemand.vb" />
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
index ff418946898e6ef00da6260cfdbac9b292caf291..dfe9da12e79678a9ba06a0f1283e9d6f47f2b126 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
@@ -22,7 +22,7 @@ Private sub Initialise()
Dim ssm As New HVACSteadyStateModel(100,100,100)
Dim elecConsumers As New ElectricalConsumerList(26.3,0.096,True)
-Dim hvacInputs As New HVACInputs(1,1)
+
'Dim hvacMap As New HVACMap("testFiles\TestHvacMap.csv")
'hvacMap.Initialise()
Dim alternatoMap As New AlternatorMap("testFiles\testAlternatormap.aalt")
@@ -31,7 +31,7 @@ alternatoMap.Initialise()
Dim signals = New Signals()
signals.EngineSpeed=2000
-Dim m0 As New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers,hvacInputs,alternatoMap,26.3,signals,ssm)
+Dim m0 As New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers,alternatoMap,26.3,signals,ssm)
'Results Cards
Dim readings = new List(of SmartResult)
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
index a88ce45b23a0a175439db461e0a4d36590dbce6c..876b38e0091f4b205d5c6d4b70de7c8d99eca5c9 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
@@ -17,8 +17,7 @@ Private Const cstrHVACMapLocation As String = "TestFiles\TestHvacMap.csv"
Private Const cstrAlternatorMap As String = "TestFiles\testAlternatorMap.aalt"
Private elecConsumers As IElectricalConsumerList
-Private hvacInputs As IHVACInputs
-Private hvacMap As IHVACMap
+
Private alternatorMap As IAlternatorMap
Private signals As Signals = New Signals
Private powernetVoltage As Single = 26.3
@@ -36,10 +35,6 @@ Public Sub New()
elecConsumers = CType(New ElectricalConsumerList(0.096,26.3), IElectricalConsumerList)
elecConsumers.AddConsumer(New ElectricalConsumer(False, "TEST", "CONSUMER1", 20, 0.5, 26.3, 1))
- 'Setup HVAC
- hvacInputs = CType(New HVACInputs(1, 1), IHVACInputs)
- hvacMap = CType(New HVACMap(cstrHVACMapLocation), IHVACMap)
- hvacMap.Initialise()
'Alternator Map
alternatorMap = CType(New AlternatorMap(cstrAlternatorMap), IAlternatorMap)
@@ -51,41 +46,32 @@ End Sub
<Test()>
Public Sub CreateNewTest()
- Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, hvacInputs, alternatorMap, powernetVoltage,signals,ssm)
+ Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, alternatorMap, powernetVoltage,signals,ssm)
Assert.IsNotNull(target)
End Sub
<Test()>
<ExpectedException("System.ArgumentException")>
Public Sub CreateNew_MissingElecConsumers_ThrowArgumentExceptionTest()
- Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(Nothing, hvacInputs, alternatorMap, powernetVoltage,signals,ssm)
+ Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(Nothing, alternatorMap, powernetVoltage,signals,ssm)
End Sub
-<Test()>
-<ExpectedException("System.ArgumentException")>
-Public Sub CreateNew_MissingHVACInputs_ThrowArgumentExceptionTest()
- Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, Nothing, alternatorMap, powernetVoltage,signals,ssm)
-End Sub
-<Test()>
-<ExpectedException("System.ArgumentException")>
-Public Sub CreateNew_MissingHVACMAP_ThrowArgumentExceptionTest()
- Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, Nothing, alternatorMap, powernetVoltage,signals,ssm)
-End Sub
+
<Test()>
<ExpectedException("System.ArgumentException")>
Public Sub CreateNew_MissingAlternatorMap_ThrowArgumentExceptionTest()
- Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, hvacInputs, Nothing, powernetVoltage,signals,ssm)
+ Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, Nothing, powernetVoltage,signals,ssm)
End Sub
<Test()>
Public Sub EfficiencyValueTest()
- Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, hvacInputs, alternatorMap, powernetVoltage,signals,ssm)
+ Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, alternatorMap, powernetVoltage,signals,ssm)
Dim actual As Single = target.AlternatorsEfficiency
@@ -100,7 +86,7 @@ End Sub
<Test()>
Public Sub HVAC_PowerDemandAmpsTest()
- Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, hvacInputs, alternatorMap, powernetVoltage,signals,ssm)
+ Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, alternatorMap, powernetVoltage,signals,ssm)
Dim actual As Single
Dim expected As Single = 3.80228149
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
index c474382f30e43c4cd124acd3d5636a5239dff3f0..c7ea4ed01b56256623bfb0bded68e54d44601932 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
@@ -17,7 +17,6 @@ Private powernetVoltage As Single = 26.3
Private ssm As IHVACSteadyStateModel = New HVACSteadyStateModel(100,100,100)
Private m0 As IM0_NonSmart_AlternatorsSetEfficiency
Private alternatorMap As IAlternatorMap = New AlternatorMap(_GOODMAP)
-Private hvacMap As IHVACMap = New HVACMap("")
Private alternatorGearEfficiency As Single = 0.8
Private compressorGrearEfficiency As Single = 0.8
@@ -27,7 +26,7 @@ Public Sub new()
alternatorMap.Initialise()
- m0 = New M0_NonSmart_AlternatorsSetEfficiency(New ElectricalConsumerList(powernetVoltage,0.096,True),New HVACInputs(),alternatorMap,powernetVoltage,signals,ssm )
+ m0 = New M0_NonSmart_AlternatorsSetEfficiency(New ElectricalConsumerList(powernetVoltage,0.096,True),alternatorMap,powernetVoltage,signals,ssm )
End Sub
@@ -35,8 +34,6 @@ End Sub
Private function GETM1Instance() As IM1_AverageHVACLoadDemand
return New M1_AverageHVACLoadDemand( m0,
- hvacMap,
- New HVACInputs(),
alternatorGearEfficiency,
compressorGrearEfficiency,
powernetVoltage,
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
index b4b490002980baf10c201103df7e5afc56dcf812..2a2621a709087e3b0b7d9c88809a08684434310a 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
@@ -24,12 +24,10 @@ Namespace UnitTests
Dim consumers As IElectricalConsumerList = CType(New ElectricalConsumerList(26.3,0.096, True), IElectricalConsumerList)
- Dim hvacInp As IHVACInputs = CType(New HVACInputs(1, 1), IHVACInputs)
- Dim hvacmap As IHVACMap = CType(New HVACMap("testfiles\TestHvacMap.csv"), IHVACMap)
- hvacmap.Initialise()
+
Dim altMap As IAlternatorMap = CType(New AlternatorMap("testfiles\testAlternatorMap.aalt"), IAlternatorMap)
altMap.Initialise()
- Dim m0 As New M0_NonSmart_AlternatorsSetEfficiency(consumers,hvacInp, altMap, 26.3,signals,ssmHVac)
+ Dim m0 As New M0_NonSmart_AlternatorsSetEfficiency(consumers, altMap, 26.3,signals,ssmHVac)
'Get Consumers.
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
index aebcc6fb0ecdbd018d10812df86a3af324edd209..6569373594c5cda1f53f35d6ff3d531add2cc724 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
@@ -28,12 +28,10 @@ Private sub Initialise()
_signals.EngineSpeed= 2000
Dim elecConsumers As New ElectricalConsumerList(_powerNetVoltage,0.096,True)
-Dim hvacInputs As New HVACInputs(1,1)
-Dim hvacMap As New HVACMap(_hvacMap)
-hvacMap.Initialise()
+
Dim alternatoMap As New AlternatorMap(_altMap)
alternatoMap.Initialise()
-Dim m0 As New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers,hvacInputs,alternatoMap,_powerNetVoltage,_signals,ssmHVac)
+Dim m0 As New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers,alternatoMap,_powerNetVoltage,_signals,ssmHVac)
'Results Cards
Dim readings = new List(Of SmartResult)
diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
index 3a663ea17d6729d249b9595ce37cd2c064e6bb53..69bce9a6be90179fa4ae5c20f442ffa53df9b4d8 100644
--- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
+++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
@@ -95,7 +95,6 @@
</ItemGroup>
<ItemGroup>
<Compile Include="UnitTests\AuxiliaryEnvironmentComparisonTests.vb" />
- <Compile Include="Mocks\HVACMapMock.vb" />
<Compile Include="Mocks\M1_Mock.vb" />
<Compile Include="Mocks\M2_Mock.vb" />
<Compile Include="Mocks\M3_Mock.vb" />
@@ -110,7 +109,6 @@
<Compile Include="UnitTests\M0_NonSmart_AlternatorsSetEfficiencyTests.vb" />
<Compile Include="UnitTests\AveragePneumaticLoadDemandTests.vb" />
<Compile Include="UnitTests\ElectricalConsumerListTests.vb" />
- <Compile Include="UnitTests\HVACMapTests.vb" />
<Compile Include="UnitTests\M10Tests.vb" />
<Compile Include="UnitTests\M13Tests.vb" />
<Compile Include="UnitTests\M12Tests.vb" />