From 156842619f34b90f6e9230869e31651a3064fa3b Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Thu, 19 Sep 2019 14:30:22 +0200
Subject: [PATCH] updating imports in vb-aux project
---
.../VectoAuxiliaries/AdvancedAuxiliaries.vb | 45 ++++++++-----
VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb | 2 +
.../VectoAuxiliaries/Electrics/Alternator.vb | 13 +---
.../Electrics/AlternatorMap.vb | 1 +
.../Electrics/CombinedAlternator.vb | 1 +
.../Electrics/CombinedAlternatorMapRow.vb | 4 +-
.../Electrics/CombinedAlternatorSignals.vb | 1 +
.../Electrics/ElectricalConsumer.vb | 1 +
.../Electrics/ElectricalConsumerList.vb | 7 +-
.../Electrics/ElectricsUserInputsConfig.vb | 1 +
.../VectoAuxiliaries/Electrics/ResultCard.vb | 1 +
.../Hvac/EnvironmentalCondition.vb | 4 +-
.../Hvac/EnvironmentalConditionsMap.vb | 1 +
.../VectoAuxiliaries/Hvac/HVACConstants.vb | 1 +
.../Hvac/HVACSteadyStateModel.vb | 1 +
.../Hvac/HVACUserInputsConfig.vb | 1 +
.../VectoAuxiliaries/Hvac/SSMCalculate.vb | 1 +
.../VectoAuxiliaries/Hvac/SSMGenInputs.vb | 1 +
VECTOAux/VectoAuxiliaries/Hvac/SSMRun.vb | 1 +
VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb | 1 +
VECTOAux/VectoAuxiliaries/Hvac/SSMTechList.vb | 1 +
.../Hvac/TechListBenefitLine.vb | 8 +--
VECTOAux/VectoAuxiliaries/IAuxiliaryConfig.vb | 2 +
.../VectoAuxiliaries/UI/frmAuxiliaryConfig.vb | 4 +-
.../UI/frmCombinedAlternators.vb | 1 +
VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb | 1 +
.../VectoAuxiliaries/VectoAuxiliaries.vbproj | 65 ++-----------------
27 files changed, 72 insertions(+), 99 deletions(-)
diff --git a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
index 9cd035d9f5..3935d4eec9 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 0478e8fff6..c6da995095 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 179102eca4..d9e2121ee4 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 1456fb3291..4639751628 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 bfa3f81396..30fa83cc75 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 d9a141dbbd..d93a0d83b5 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 873d569f5c..bf834a54d5 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 8fff90df77..151f476e71 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 132c93c0e9..8763262a9b 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 db1bc9a072..f15fb640c0 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 c6a0d60ed9..8064c0f5e9 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 0d9eabda44..a65e0068ef 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 fe22582b61..d3a66c320e 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 3812cd6436..fccca9573b 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 fe840ffd87..f3a058b7f7 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 3a806dcd8a..ccd2bd8cb5 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 12b5ac6fea..4d9c9d2963 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 46f55fe022..2acc4f2202 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 2eb4045fd1..82c4d9b060 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 e483f29f7b..4dda1634c9 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 45dd0d5736..221a48554d 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 e4748490ca..80e29ac70f 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 0ea2a7543e..2e7609e5fc 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 bc17e7d3e4..f3662198d3 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 8b14f2d0f6..d9fd4bf56f 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 0d96c240f2..6c58400c0b 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 287a7e548c..2a4dac642c 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" />
--
GitLab