diff --git a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
index 9cd035d9f5bfa51cc7c6cf9f02303112f43f2aff..3935d4eec96b7185a469cd143ef617e12de520ce 100644
--- a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
+++ b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
@@ -17,6 +17,8 @@ Imports VectoAuxiliaries.Hvac
Imports VectoAuxiliaries.DownstreamModules
Imports System.Windows.Forms
Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.BusAuxiliaries.DownstreamModules.Impl
+Imports VectoAuxiliaries.DownstreamModules.Electrics
<Assembly: InternalsVisibleTo("VectoCore")>
@@ -138,14 +140,14 @@ Public Class AdvancedAuxiliaries
End If
- M0 = New M0_NonSmart_AlternatorsSetEfficiency(auxConfig.ElectricalUserInputsConfig.ElectricalConsumers,
+ M0 = New M00Impl(auxConfig.ElectricalUserInputsConfig.ElectricalConsumers,
alternatorMap,
auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI(Of Volt),
Signals,
ssmTool)
- Dim M05tmp As M0_5_SmartAlternatorSetEfficiency = New M0_5_SmartAlternatorSetEfficiency(M0,
+ Dim M05tmp As IM0_5_SmartAlternatorSetEfficiency = New M0_5Impl(M0,
auxConfig.ElectricalUserInputsConfig.ElectricalConsumers,
alternatorMap,
auxConfig.ElectricalUserInputsConfig.ResultCardIdle,
@@ -153,7 +155,7 @@ Public Class AdvancedAuxiliaries
auxConfig.ElectricalUserInputsConfig.ResultCardOverrun, Signals)
M05 = M05tmp
- M1 = New M1_AverageHVACLoadDemand(M0,
+ M1 = New M01Impl(M0,
auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency,
auxConfig.PneumaticUserInputsConfig.CompressorGearEfficiency,
auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI(Of Volt),
@@ -161,13 +163,13 @@ Public Class AdvancedAuxiliaries
ssmTool)
- M2 = New M2_AverageElectricalLoadDemand(auxConfig.ElectricalUserInputsConfig.ElectricalConsumers,
+ M2 = New M02Impl(auxConfig.ElectricalUserInputsConfig.ElectricalConsumers,
M0,
auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency,
auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI(Of Volt), Signals)
- M3 = New M3_AveragePneumaticLoadDemand(auxConfig.PneumaticUserInputsConfig,
+ M3 = New M03Impl(auxConfig.PneumaticUserInputsConfig,
auxConfig.PneumaticAuxillariesConfig,
actuationsMap,
compressorMap,
@@ -175,19 +177,19 @@ Public Class AdvancedAuxiliaries
VectoInputs.Cycle,
Signals)
- M4 = New M4_AirCompressor(compressorMap, auxConfig.PneumaticUserInputsConfig.CompressorGearRatio,
+ M4 = New M04Impl(compressorMap, auxConfig.PneumaticUserInputsConfig.CompressorGearRatio,
auxConfig.PneumaticUserInputsConfig.CompressorGearEfficiency, Signals)
- M5 = New M5__SmartAlternatorSetGeneration(M05tmp, auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI(Of Volt),
+ M5 = New M05Impl(M05tmp, auxConfig.ElectricalUserInputsConfig.PowerNetVoltage.SI(Of Volt),
auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency)
- M6 = New M6(M1, M2, M3, M4, M5, Signals)
- M7 = New M7(M5, M6, Signals)
- M8 = New M8(M1, M6, M7, Signals)
- M9 = New M9(M1, M4, M6, M8, fuelMap, auxConfig.PneumaticAuxillariesConfig, Signals)
- M10 = New M10(M3, M9, Signals)
- M11 = New M11(M1, M3, M6, M8, fuelMap, Signals)
- M12 = New M12(M10, M11, Signals)
- M13 = New M13(M10, M11, M12, Signals)
- M14 = New M14(M13, ssmToolModule14, hvacConstants, Signals)
+ M6 = New M06Impl(M1, M2, M3, M4, M5, Signals)
+ M7 = New M07Impl(M5, M6, Signals)
+ M8 = New M08Impl(M1, M6, M7, Signals)
+ M9 = New M09Impl(M1, M4, M6, M8, fuelMap, auxConfig.PneumaticAuxillariesConfig, Signals)
+ M10 = New M10Impl(M3, M9, Signals)
+ M11 = New M11Impl(M1, M3, M6, M8, fuelMap, Signals)
+ M12 = New M12Impl(M10, M11, Signals)
+ M13 = New M13Impl(M10, M11, M12, Signals)
+ M14 = New M14Impl(M13, ssmToolModule14, hvacConstants, Signals)
End Sub
#Region "Interface implementation"
@@ -274,7 +276,15 @@ Public Class AdvancedAuxiliaries
Throw New NotImplementedException
End Function
- Public ReadOnly Property TotalFuelGRAMS As Kilogram Implements VectoAuxiliaries.IAdvancedAuxiliaries.TotalFuelGRAMS
+ Public Sub IAdvancedAuxiliaries_ResetCalculations() Implements IAdvancedAuxiliaries.ResetCalculations
+ Dim modules As List(Of IAbstractModule) = New List(Of IAbstractModule)() From {
+ M0, M05, M1, M2, M3, M4, M5, M6, M7, M8, M9, M10, M11, M12, M13, M14}
+ For Each moduel As IAbstractModule In modules
+ moduel.ResetCalculations()
+ Next
+ End Sub
+
+ Public ReadOnly Property TotalFuelGRAMS As Kilogram Implements VectoAuxiliaries.IAdvancedAuxiliaries.TotalFuelGRAMS
Get
If Not M13 Is Nothing Then
Return M14.TotalCycleFCGrams
@@ -474,4 +484,5 @@ Public Class AdvancedAuxiliaries
Return M9.TotalCycleFuelConsumptionCompressorOnContinuously
End Get
End Property
+
End Class
diff --git a/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
index 0478e8fff63a4f9a3e46691d73ef821d4084501b..c6da99509559dd39de555b81f369109c6092f1d7 100644
--- a/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
@@ -18,6 +18,8 @@ Imports System.Windows.Forms
Imports Newtonsoft.Json
Imports TUGraz.VectoCommon.Utils
Imports VectoAuxiliaries
+Imports VectoAuxiliaries.DownstreamModules.Electrics
+Imports VectoAuxiliaries.DownstreamModules.HVAC
<Serializable()>
Public Class AuxiliaryConfig
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/Alternator.vb b/VECTOAux/VectoAuxiliaries/Electrics/Alternator.vb
index 179102eca47e75efb4950d735ef31202da8e56c5..d9e2121ee4ea370aa7abc0a4bc409c00674537d7 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/Alternator.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/Alternator.vb
@@ -1,18 +1,11 @@
Option Strict On
Imports TUGraz.VectoCommon.Utils
+Imports VectoAuxiliaries.DownstreamModules.Electrics
Namespace Electrics
- Public Class Table4Row
- Public RPM As Double
- Public Efficiency As Double
-
- Public Sub New(rpm As Double, eff As Double)
-
- Me.RPM = rpm
- Me.Efficiency = eff
- End Sub
- End Class
+
+
'Model based on CombinedALTS_V02_Editable.xlsx
Public Class Alternator
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/AlternatorMap.vb b/VECTOAux/VectoAuxiliaries/Electrics/AlternatorMap.vb
index 1456fb32911e0a529b10bd58af7571d790f362b3..46397516286de0594a2f85ff61dec8c523d6061d 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/AlternatorMap.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/AlternatorMap.vb
@@ -12,6 +12,7 @@ Imports System.Globalization
Imports System.IO
Imports System.Text
Imports TUGraz.VectoCommon.Utils
+Imports VectoAuxiliaries.DownstreamModules.Electrics
Namespace Electrics
Public Class AlternatorMap
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternator.vb b/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternator.vb
index bfa3f81396bb12c0696b1f7eef0ba7462674be55..30fa83cc7534d1922e009a618cfb3e3915cc2807 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternator.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternator.vb
@@ -7,6 +7,7 @@ Imports System.Text
Imports System.IO
Imports System.Globalization
Imports TUGraz.VectoCommon.Utils
+Imports VectoAuxiliaries.DownstreamModules.Electrics
Namespace Electrics
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorMapRow.vb b/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorMapRow.vb
index d9a141dbbd2b959de8f0744863fc880c92c78d71..d93a0d83b548a9260d1d84e965c8a625921e98ff 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorMapRow.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorMapRow.vb
@@ -1,4 +1,6 @@
-Namespace Electrics
+Imports VectoAuxiliaries.DownstreamModules.Electrics
+
+Namespace Electrics
'This class is reflective of the stored entries for the combined alternator
'And is used by the Combined Alternator Form and any related classes.
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorSignals.vb b/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorSignals.vb
index 873d569f5c5fc599ba7aa95ed848a21ad111101d..bf834a54d57f729204f4b55e7c894a8c646306ae 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorSignals.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorSignals.vb
@@ -1,5 +1,6 @@

Imports TUGraz.VectoCommon.Utils
+Imports VectoAuxiliaries.DownstreamModules.Electrics
Namespace Electrics
'Used by the CombinedAlternator class and any other related classes.
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumer.vb b/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumer.vb
index 8fff90df7738db016cb6a10cab5c26689923a479..151f476e71f023976412eec6a673f366ddc0affd 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumer.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumer.vb
@@ -1,5 +1,6 @@
Imports System.ComponentModel
Imports TUGraz.VectoCommon.Utils
+Imports VectoAuxiliaries.DownstreamModules.Electrics
' Copyright 2017 European Union.
' Licensed under the EUPL (the 'Licence');
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb b/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
index 132c93c0e920ab17deceace6d5abb584e14cbfec..8763262a9be26668b438d2a03ba0788e870c8816 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
@@ -12,6 +12,7 @@
Imports System.Collections.Generic
Imports TUGraz.VectoCommon.Utils
+Imports VectoAuxiliaries.DownstreamModules.Electrics
Namespace Electrics
Public Class ElectricalConsumerList
@@ -184,7 +185,7 @@ Namespace Electrics
End Get
End Property
- Public Sub AddConsumer(consumer As IElectricalConsumer) Implements Electrics.IElectricalConsumerList.AddConsumer
+ Public Sub AddConsumer(consumer As IElectricalConsumer) Implements IElectricalConsumerList.AddConsumer
If Not _items.Contains(consumer) Then
_items.Add(consumer)
@@ -195,7 +196,7 @@ Namespace Electrics
End If
End Sub
- Public Sub RemoveConsumer(consumer As IElectricalConsumer) Implements Electrics.IElectricalConsumerList.RemoveConsumer
+ Public Sub RemoveConsumer(consumer As IElectricalConsumer) Implements IElectricalConsumerList.RemoveConsumer
If _items.Contains(consumer) Then
@@ -210,7 +211,7 @@ Namespace Electrics
Public Function GetTotalAverageDemandAmps(excludeOnBase As Boolean) As Ampere _
- Implements Electrics.IElectricalConsumerList.GetTotalAverageDemandAmps
+ Implements IElectricalConsumerList.GetTotalAverageDemandAmps
Dim Amps As Ampere
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ElectricsUserInputsConfig.vb b/VECTOAux/VectoAuxiliaries/Electrics/ElectricsUserInputsConfig.vb
index db1bc9a072a64671f1323e65e5478c7c67826367..f15fb640c06f942bace1f171102b7506f10230a2 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/ElectricsUserInputsConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ElectricsUserInputsConfig.vb
@@ -10,6 +10,7 @@
' See the LICENSE.txt for the specific language governing permissions and limitations.
Imports TUGraz.VectoCommon.Utils
+Imports VectoAuxiliaries.DownstreamModules.Electrics
Imports VectoAuxiliaries.Electrics
Namespace Electrics
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ResultCard.vb b/VECTOAux/VectoAuxiliaries/Electrics/ResultCard.vb
index c6a0d60ed92d2cc9abf7ad7111360c38b5533b82..8064c0f5e92c4b7b113111dc049c02d23d9ae493 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/ResultCard.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ResultCard.vb
@@ -10,6 +10,7 @@
' See the LICENSE.txt for the specific language governing permissions and limitations.
Imports TUGraz.VectoCommon.Utils
+Imports VectoAuxiliaries.DownstreamModules.Electrics
Imports VectoAuxiliaries.Electrics
Namespace Electrics
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/EnvironmentalCondition.vb b/VECTOAux/VectoAuxiliaries/Hvac/EnvironmentalCondition.vb
index 0d9eabda44fa45345b8f7a6e1d4ec354a9a2ff26..a65e0068ef492bb49e16b0fdc5947bf1d3a8d3e6 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/EnvironmentalCondition.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/EnvironmentalCondition.vb
@@ -1,4 +1,6 @@
-Namespace Hvac
+Imports VectoAuxiliaries.DownstreamModules.HVAC
+
+Namespace Hvac
Public Class EnvironmentalCondition
Implements IEnvironmentalCondition
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/EnvironmentalConditionsMap.vb b/VECTOAux/VectoAuxiliaries/Hvac/EnvironmentalConditionsMap.vb
index fe22582b6152d64839bab7a4369d08b514afede5..d3a66c320e5276c6063f098a615ca56155ae4729 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/EnvironmentalConditionsMap.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/EnvironmentalConditionsMap.vb
@@ -1,5 +1,6 @@
Imports System.Globalization
Imports System.IO
+Imports VectoAuxiliaries.DownstreamModules.HVAC
Namespace Hvac
Public Class EnvironmentalConditionsMap
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/HVACConstants.vb b/VECTOAux/VectoAuxiliaries/Hvac/HVACConstants.vb
index 3812cd643670e61b483d1816b7598ec881a1dcd4..fccca9573bfed059164ebe360dbdddd0b8bc736b 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/HVACConstants.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/HVACConstants.vb
@@ -10,6 +10,7 @@
' See the LICENSE.txt for the specific language governing permissions and limitations.
Imports Newtonsoft.Json
Imports TUGraz.VectoCommon.Utils
+Imports VectoAuxiliaries.DownstreamModules.HVAC
Namespace Hvac
Public Class HVACConstants
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/HVACSteadyStateModel.vb b/VECTOAux/VectoAuxiliaries/Hvac/HVACSteadyStateModel.vb
index fe840ffd87027d89646c98b9178957cc78bd5eb0..f3a058b7f77e998447b34fb596eab6fe827873b0 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/HVACSteadyStateModel.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/HVACSteadyStateModel.vb
@@ -10,6 +10,7 @@
' See the LICENSE.txt for the specific language governing permissions and limitations.
Imports System.IO
+Imports VectoAuxiliaries.DownstreamModules.HVAC
Namespace Hvac
Public Class HVACSteadyStateModel
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/HVACUserInputsConfig.vb b/VECTOAux/VectoAuxiliaries/Hvac/HVACUserInputsConfig.vb
index 3a806dcd8ab247c8cd1f0001b35a0d4b34d8123f..ccd2bd8cb5b8fff91341969f9a391eefbb71bffe 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/HVACUserInputsConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/HVACUserInputsConfig.vb
@@ -9,6 +9,7 @@
'
' See the LICENSE.txt for the specific language governing permissions and limitations.
+Imports VectoAuxiliaries.DownstreamModules.HVAC
Imports VectoAuxiliaries.Hvac
Imports VectoAuxiliaries.Electrics
Imports VectoAuxiliaries.Pneumatics
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb
index 12b5ac6feaba175e3b03d1099b9cad394e8b699b..4d9c9d296374939c8e6b98aaa35f1fba5fce325c 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb
@@ -1,5 +1,6 @@
Imports System.Text
Imports Microsoft.VisualBasic
+Imports VectoAuxiliaries.DownstreamModules.HVAC
Imports VectoAuxiliaries.Hvac
Namespace Hvac
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMGenInputs.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMGenInputs.vb
index 46f55fe022d97e145d71797805d51862dbb9c3ae..2acc4f22020d3afc3f5fbb044d0ae633d6233010 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/SSMGenInputs.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMGenInputs.vb
@@ -1,4 +1,5 @@
Imports System.IO
+Imports VectoAuxiliaries.DownstreamModules.HVAC
Namespace Hvac
'Used by SSMHVAC Class
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMRun.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMRun.vb
index 2eb4045fd15954a4843a531388173cd5acc3cc64..82c4d9b060dd27dcd8529a3127e40c25884638ee 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/SSMRun.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMRun.vb
@@ -1,5 +1,6 @@
Imports System.Text
Imports Microsoft.VisualBasic
+Imports VectoAuxiliaries.DownstreamModules.HVAC
Namespace Hvac
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb
index e483f29f7bd665a1d4878683ad4cabdddcb26dc1..4dda1634c90e11825200edf96b0e9f3bb57443e0 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb
@@ -5,6 +5,7 @@ Imports System.IO
Imports System.Reflection
Imports System.Text
Imports TUGraz.VectoCommon.Utils
+Imports VectoAuxiliaries.DownstreamModules.HVAC
Namespace Hvac
'Used by frmHVACTool
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMTechList.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMTechList.vb
index 45dd0d5736d7d3e3ff208dd0266f215d9f0b60ae..221a48554d7029e359c4473f3b6357d4339f0d87 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/SSMTechList.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMTechList.vb
@@ -1,6 +1,7 @@
Imports System.Globalization
Imports System.IO
Imports TUGraz.VectoCommon.Utils
+Imports VectoAuxiliaries.DownstreamModules.HVAC
Namespace Hvac
'Used By SSMTOOL Class.
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/TechListBenefitLine.vb b/VECTOAux/VectoAuxiliaries/Hvac/TechListBenefitLine.vb
index e4748490caf0edbd26ad65fd42330978c95c5b36..80e29ac70f367b33b5635204199f2a88c24e2679 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/TechListBenefitLine.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/TechListBenefitLine.vb
@@ -1,10 +1,8 @@

-Namespace Hvac
- Public Enum TechLineType
+Imports VectoAuxiliaries.DownstreamModules.HVAC
- Normal
- HVCActiveSelection
- End Enum
+Namespace Hvac
+
Public Enum PowerType
diff --git a/VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb
index 0ea2a7543e687bbfd29b74c81fbef129ced18a65..2e7609e5fcc6f4b2e2e9f28984c7691b37005ecf 100644
--- a/VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb
@@ -17,6 +17,8 @@ Imports System.IO
Imports System.Windows.Forms
Imports Newtonsoft.Json
+Imports VectoAuxiliaries.DownstreamModules.Electrics
+Imports VectoAuxiliaries.DownstreamModules.HVAC
Public Interface IAuxiliaryConfig
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
index bc17e7d3e476e8843b5182d9585956a6b23caba8..f3662198d3b57cd0ff8842904c831da1e5b6fa1e 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
@@ -17,6 +17,8 @@ Imports System.Windows.Forms
Imports System.Drawing
Imports VectoAuxiliaries.Hvac
Imports System.IO
+Imports VectoAuxiliaries.DownstreamModules.Electrics
+Imports VectoAuxiliaries.DownstreamModules.HVAC
Public Class frmAuxiliaryConfig
@@ -1226,7 +1228,7 @@ Public Class frmAuxiliaryConfig
Next
End Sub
- Private Function GetSSMMAP(ByVal filePath As String, ByRef message As String) As Hvac.IHVACSteadyStateModel
+ Private Function GetSSMMAP(ByVal filePath As String, ByRef message As String) As IHVACSteadyStateModel
Dim ssmMap As New Hvac.HVACSteadyStateModel()
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmCombinedAlternators.vb b/VECTOAux/VectoAuxiliaries/UI/frmCombinedAlternators.vb
index 8b14f2d0f64343a5684c01ce4ee87b46d8ebeeba..d9fd4bf56f6c32eb64b45e81e2249d466e561573 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmCombinedAlternators.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmCombinedAlternators.vb
@@ -4,6 +4,7 @@ Imports System.Drawing
Imports System.Windows.Forms
Imports VectoAuxiliaries.Electrics
Imports System.ComponentModel
+Imports VectoAuxiliaries.DownstreamModules.Electrics
Imports VectoAuxiliaries.Hvac
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb b/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb
index 0d96c240f22b73072c6c0bfaba6cb0b8aeaa4a80..6c58400c0b03d56e846c223eca8f6fc79c8177ff 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb
@@ -3,6 +3,7 @@ Imports VectoAuxiliaries.Hvac
Imports System.ComponentModel
Imports System.Drawing
Imports System.Globalization
+Imports VectoAuxiliaries.DownstreamModules.HVAC
Public Class frmHVACTool
'Fields
diff --git a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
index 287a7e548c315be9eb2acf1dc419fa31c16920b9..2a4dac642ce862b84e453365bd98d270d78d3b1a 100644
--- a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
+++ b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
@@ -95,48 +95,14 @@
<Compile Include="DownstreamModules\cDelaunayMap.vb" />
<Compile Include="DownstreamModules\cFile V3.vb" />
<Compile Include="DownstreamModules\cMAP.vb" />
- <Compile Include="DownstreamModules\IM10.vb" />
- <Compile Include="DownstreamModules\IM11.vb" />
- <Compile Include="DownstreamModules\IM12.vb" />
- <Compile Include="DownstreamModules\IM13.vb" />
- <Compile Include="DownstreamModules\IM14.vb" />
- <Compile Include="DownstreamModules\IM6.vb" />
- <Compile Include="DownstreamModules\IM7.vb" />
- <Compile Include="DownstreamModules\IM8.vb" />
- <Compile Include="DownstreamModules\IM9.vb" />
- <Compile Include="DownstreamModules\M10.vb" />
- <Compile Include="DownstreamModules\M11.vb" />
- <Compile Include="DownstreamModules\M12.vb" />
- <Compile Include="DownstreamModules\M13.vb" />
- <Compile Include="DownstreamModules\M14.vb" />
- <Compile Include="DownstreamModules\M7.vb" />
- <Compile Include="DownstreamModules\M8.vb" />
- <Compile Include="DownstreamModules\M9.vb" />
<Compile Include="Electrics\Alternator.vb" />
- <Compile Include="Electrics\AlternatorMapValues.vb" />
<Compile Include="Electrics\AlternatorMap.vb" />
- <Compile Include="Electrics\AltUserInput.vb" />
<Compile Include="Electrics\CombinedAlternator.vb" />
<Compile Include="Electrics\CombinedAlternatorMapRow.vb" />
<Compile Include="Electrics\CombinedAlternatorSignals.vb" />
<Compile Include="Electrics\ElectricsUserInputsConfig.vb" />
- <Compile Include="Electrics\IAlternator.vb" />
- <Compile Include="Electrics\ICombinedAlternator.vb" />
- <Compile Include="Electrics\ICombinedAlternatorMapRow.vb" />
- <Compile Include="Electrics\ICombinedAlternatorSignals.vb" />
- <Compile Include="Electrics\IElectricsUserInputsConfig.vb" />
- <Compile Include="Electrics\IM0_5_SmartAlternatorSetEfficiency.vb" />
- <Compile Include="Electrics\IM2_AverageElectricalLoadDemand.vb" />
- <Compile Include="Electrics\IM5_SmartAlternatorSetGeneration.vb" />
- <Compile Include="Electrics\IResultCard.vb" />
- <Compile Include="Electrics\M0_5_SmartAlternatorSetEfficiency.vb" />
- <Compile Include="Electrics\M0_NonSmart_AlternatorsSetEfficiency.vb" />
<Compile Include="Electrics\ElectricalConsumerList.vb" />
- <Compile Include="Electrics\ElectricConstants.vb" />
- <Compile Include="Electrics\IM0_NonSmart_AlternatorsSetEfficiency.vb" />
- <Compile Include="Electrics\M5__SmartAlternatorSetGeneration.vb" />
<Compile Include="Electrics\ResultCard.vb" />
- <Compile Include="Electrics\SmartResult.vb" />
<Compile Include="FilePathUtils.vb" />
<Compile Include="Hvac\Bus.vb" />
<Compile Include="Hvac\BusDatabase.vb" />
@@ -146,23 +112,10 @@
<Compile Include="Hvac\EnvironmentalCondition.vb" />
<Compile Include="Hvac\EnvironmentalConditionsMap.vb" />
<Compile Include="Hvac\HVACConstants.vb" />
- <Compile Include="Electrics\IElectricalConsumerList.vb" />
<Compile Include="Hvac\HVACSteadyStateModel.vb" />
<Compile Include="Hvac\HVACUserInputsConfig.vb" />
<Compile Include="Hvac\IBus.vb" />
<Compile Include="Hvac\IBusDatabase.vb" />
- <Compile Include="Hvac\IEnvironmentalCondition.vb" />
- <Compile Include="Hvac\IEnvironmentalConditionsMap.vb" />
- <Compile Include="Hvac\IHVACConstants.vb" />
- <Compile Include="Hvac\IHVACSteadyStateModel.vb" />
- <Compile Include="Hvac\IHVACUserInputsConfig.vb" />
- <Compile Include="Hvac\IM1_AverageHVACLoadDemand.vb" />
- <Compile Include="Hvac\ISSMCalculate.vb" />
- <Compile Include="Hvac\ISSMGenInputs.vb" />
- <Compile Include="Hvac\ISSMRun.vb" />
- <Compile Include="Hvac\ISSMTechList.vb" />
- <Compile Include="Hvac\ISSMTOOL.vb" />
- <Compile Include="Hvac\ITechListBenefitLine.vb" />
<Compile Include="Hvac\SSMCalculate.vb" />
<Compile Include="Hvac\SSMGenInputs.vb" />
<Compile Include="Hvac\SSMRun.vb" />
@@ -170,19 +123,8 @@
<Compile Include="Hvac\SSMTOOL.vb" />
<Compile Include="Hvac\TechListBenefitLine.vb" />
<Compile Include="IAuxiliaryConfig.vb" />
- <Compile Include="DownstreamModules\M6.vb" />
- <Compile Include="Pneumatics\ActuationsKey.vb" />
- <Compile Include="Pneumatics\IM3_AveragePneumaticLoadDemand.vb" />
- <Compile Include="Pneumatics\M4_AirCompressor.vb" />
- <Compile Include="Electrics\M2_AverageElectricalLoadDemand.vb" />
- <Compile Include="Hvac\M1_AverageHVACLoadDemand.vb" />
- <Compile Include="Pneumatics\M3_AveragePneumaticLoadDemand.vb" />
<Compile Include="Pneumatics\CompressorMap.vb" />
<Compile Include="Electrics\ElectricalConsumer.vb" />
- <Compile Include="Electrics\IAlternatorMap.vb" />
- <Compile Include="Pneumatics\IM4_AirCompressor.vb" />
- <Compile Include="Pneumatics\ICompressorMap.vb" />
- <Compile Include="Electrics\IElectricalConsumer.vb" />
<Compile Include="My Project\AssemblyInfo.vb" />
<Compile Include="My Project\Application.Designer.vb">
<AutoGen>True</AutoGen>
@@ -198,9 +140,6 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
- <Compile Include="Pneumatics\IPneumaticActuationsMAP.vb" />
- <Compile Include="Pneumatics\IPneumaticsAuxilliariesConfig.vb" />
- <Compile Include="Pneumatics\IPneumaticUserInputsConfig.vb" />
<Compile Include="Pneumatics\PneumaticActuationsMap.vb" />
<Compile Include="Pneumatics\PneumaticsAuxilliariesConfig.vb" />
<Compile Include="Pneumatics\PneumaticUserInputsConfig.vb" />
@@ -300,6 +239,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>
</ItemGroup>
<ItemGroup>
<None Include="Resources\Open-icon.png" />