From 1fca36fe0f19adf317a14da838516bf98ba150d9 Mon Sep 17 00:00:00 2001
From: "Burns, Terry" <Terry.Burns@ricardo.com>
Date: Thu, 23 Apr 2015 15:17:38 +0000
Subject: [PATCH] General Tidy up of AA Code. Adding comments, removing
redundant files straightening up etc etc.
git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C1905
---
.../VectoAuxiliaries/AdvancedAuxiliaries.vb | 1 -
VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb | 7 +-
.../VectoAuxiliaries/DownstreamModules/M14.vb | 2 +-
.../Electrics/AltUserInput.vb | 32 ++--
.../Electrics/CombinedAlternator.vb | 15 +-
.../Electrics/CombinedAlternatorMapRow.vb | 13 +-
.../Electrics/CombinedAlternatorSignals.vb | 31 ++--
.../Electrics/ElectricConstants.vb | 2 +-
.../Electrics/ElectricalConsumerList.vb | 3 +-
.../VectoAuxiliaries/Electrics/IAlternator.vb | 7 +-
.../Electrics/ICombinedAlternator.vb | 4 +-
.../Electrics/ICombinedAlternatorMapRow.vb | 20 ++-
.../Electrics/ICombinedAlternatorSignals.vb | 2 +-
.../VectoAuxiliaries/Hvac/SSMCalculate.vb | 137 +++++++++---------
.../VectoAuxiliaries/Hvac/SSMGenInputs.vb | 9 +-
VECTOAux/VectoAuxiliaries/Hvac/SSMRun.vb | 6 +-
VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb | 3 +
VECTOAux/VectoAuxiliaries/Hvac/SSMTechList.vb | 2 +-
.../Hvac/TechListBenefitLine.vb | 5 +-
.../VectoAuxiliaries/VectoAuxiliaries.vbproj | 5 -
20 files changed, 153 insertions(+), 153 deletions(-)
diff --git a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
index 424be3eece..4ff2eda38d 100644
--- a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
+++ b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
@@ -239,7 +239,6 @@ End Sub
Catch ex As Exception
- 'TODO: Should this raise an event ?
MessageBox.Show("Im an exception")
Return false
diff --git a/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
index fe8a0bd85e..02f363ea6b 100644
--- a/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb
@@ -276,8 +276,7 @@ Public Function Save( auxFile As String ) As Boolean Implements IAuxiliaryConf
File.WriteAllText(auxFile , output)
Catch ex as Exception
-
- 'TODO:Do something meaningfull here perhaps logging
+
returnValue= False
End Try
@@ -305,9 +304,7 @@ Public Function Load( auxFile As String ) As Boolean Implements IAuxiliaryCon
AssumeValuesOfOther( tmpAux )
Catch ex as Exception
-
- 'TODO:Do something meaningfull here perhaps logging
-
+
returnValue= False
End Try
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M14.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M14.vb
index 8fe320d013..28d4f1dba2 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M14.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M14.vb
@@ -74,7 +74,7 @@ Public Class M14
Return S7 / constants.FuelDensity835GramsPerLitre
End Get
End Property
- Public ReadOnly Property TotalCycleFCGrams As Single Implements IM14.TotalCycleFCGrams
+ Public ReadOnly Property TotalCycleFCGrams As Single Implements IM14.TotalCycleFCGrams
Get
Return S7
End Get
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/AltUserInput.vb b/VECTOAux/VectoAuxiliaries/Electrics/AltUserInput.vb
index 2e26b66a0a..947d0e98c0 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/AltUserInput.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/AltUserInput.vb
@@ -3,31 +3,31 @@
Namespace Electrics
-
-Public class AltUserInput
-
- Public Amps As Single
- Public Eff As Single
-
- Sub new( amps As Single , eff As single)
+'Used by the Combined Alternator Form/Classes to accept user input for the combined alternators efficiency
+'At different Current Demands
+ Public class AltUserInput
+
+ Public Amps As Single
+ Public Eff As Single
+
+ 'Constructor
+ Sub new( amps As Single , eff As single)
Me.Amps=amps
Me.Eff = eff
End Sub
-
-
- Public Function IsEqual( other As AltUserInput, Optional rounding As Integer=7) As Boolean
+
+ 'Equality
+ Public Function IsEqual( other As AltUserInput, Optional rounding As Integer=7) As Boolean
Return Math.round(Me.Amps,rounding)= Math.Round(other.Amps,rounding) AndAlso _
Math.Round(Me.Eff,rounding) = Math.Round(other.eff,rounding)
- End Function
-
-
-End class
-
-
+ End Function
+
+
+ End class
End Namespace
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternator.vb b/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternator.vb
index 33f5f76c30..c579fb70f6 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternator.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternator.vb
@@ -8,7 +8,7 @@ Imports System.Text
Imports System.IO
Imports DocumentFormat.OpenXml
Imports DocumentFormat.OpenXml.Spreadsheet
-Imports SpreadsheetLight
+
Imports Newtonsoft.Json
Imports VectoAuxiliaries
Imports System.Globalization
@@ -20,14 +20,9 @@ Public Class CombinedAlternator
Implements IAlternatorMap, ICombinedAlternator
-
-
Private map As New List(Of ICombinedAlternatorMapRow)
-
-
Public Property Alternators As New List(Of IAlternator) Implements ICombinedAlternator.Alternators
Private OriginalAlternators As New List(Of IAlternator)
-
Private FilePath As String
Private altSignals As ICombinedAlternatorSignals
@@ -335,7 +330,9 @@ End Function
'Can be used to send messages to Vecto.
Public Event AuxiliaryEvent(ByRef sender As Object, message As String, messageType As AdvancedAuxiliaryMessageType) Implements IAuxiliaryEvent.AuxiliaryEvent
-
+ 'This is used to generate a diagnostics output which enables the user to
+ 'Determine if they beleive the resulting map is what is expected
+ 'Basically it is a check against the model/Spreadsheet
Public Overrides Function ToString() As String
Dim sb As New StringBuilder()
@@ -395,8 +392,8 @@ End Function
End Function
-
- Public Function IsEqualTo(other As ICombinedAlternator) As Boolean Implements ICombinedAlternator.IsEqualTo
+ 'Equality
+ Public Function IsEqualTo(other As ICombinedAlternator) As Boolean Implements ICombinedAlternator.IsEqualTo
'Count Check.
If Me.Alternators.Count <> other.Alternators.Count then Return False
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorMapRow.vb b/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorMapRow.vb
index 11271358bc..eb0b9f7488 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorMapRow.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorMapRow.vb
@@ -1,15 +1,18 @@
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.
Public Class CombinedAlternatorMapRow
Implements ICombinedAlternatorMapRow
- public property AlternatorName As String implements ICombinedAlternatorMapRow.AlternatorName
- public property RPM As Single implements ICombinedAlternatorMapRow.RPM
- public property Amps As Single implements ICombinedAlternatorMapRow.Amps
- public property Efficiency As Single implements ICombinedAlternatorMapRow.Efficiency
- public property PulleyRatio As Single implements ICombinedAlternatorMapRow.PulleyRatio
+ Public Property AlternatorName As String implements ICombinedAlternatorMapRow.AlternatorName
+ Public Property RPM As Single implements ICombinedAlternatorMapRow.RPM
+ Public Property Amps As Single implements ICombinedAlternatorMapRow.Amps
+ Public Property Efficiency As Single implements ICombinedAlternatorMapRow.Efficiency
+ Public Property PulleyRatio As Single implements ICombinedAlternatorMapRow.PulleyRatio
+ 'Constructors
Sub new ()
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorSignals.vb b/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorSignals.vb
index 64ab6a8772..58e7d363a9 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorSignals.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternatorSignals.vb
@@ -2,22 +2,21 @@
Namespace Electrics
-
-Public Class CombinedAlternatorSignals
- Implements ICombinedAlternatorSignals
-
-
-
- Public Property CrankRPM As Single Implements ICombinedAlternatorSignals.CrankRPM
-
- Public Property CurrentDemandAmps As Single Implements ICombinedAlternatorSignals.CurrentDemandAmps
-
- Public Property NumberOfAlternators As Single Implements ICombinedAlternatorSignals.NumberOfAlternators
-
-
-
-End Class
-
+'Used by the CombinedAlternator class and any other related classes.
+ Public Class CombinedAlternatorSignals
+ Implements ICombinedAlternatorSignals
+
+
+ Public Property CrankRPM As Single Implements ICombinedAlternatorSignals.CrankRPM
+
+ Public Property CurrentDemandAmps As Single Implements ICombinedAlternatorSignals.CurrentDemandAmps
+
+ 'Number of alternators in the Combined Alternator
+ Public Property NumberOfAlternators As Single Implements ICombinedAlternatorSignals.NumberOfAlternators
+
+
+
+ End Class
End Namespace
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ElectricConstants.vb b/VECTOAux/VectoAuxiliaries/Electrics/ElectricConstants.vb
index 952e2035d6..ec06814647 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/ElectricConstants.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ElectricConstants.vb
@@ -30,7 +30,7 @@ Public Class ElectricConstants
public const AlternatorPulleyEfficiencyMin as single =0.1
public const AlternatorPulleyEfficiencyMax as single =1
- 'Battery
+ 'Stored Energy Efficiency
Public Const StoredEnergyEfficiency As Single = 0.935
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb b/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
index 2c96418117..9fd97c799b 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb
@@ -38,7 +38,8 @@ Namespace Electrics
End Sub
-
+ 'Transfers the Info comments from a default set of consumables to a live set.
+ 'This way makes the comments not dependent on saved data.
Public Sub MergeInfoData() Implements IElectricalConsumerList.MergeInfoData
If _items.Count <> GetDefaultConsumerList().Count then return
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/IAlternator.vb b/VECTOAux/VectoAuxiliaries/Electrics/IAlternator.vb
index ee08387065..035d8e9694 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/IAlternator.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/IAlternator.vb
@@ -1,8 +1,8 @@

Namespace Electrics
-
- Public Interface IAlternator
+ 'Used By Combined Alternator.
+ Public Interface IAlternator
Property AlternatorName As String
@@ -19,9 +19,10 @@ Namespace Electrics
Property RangeTable AS List(Of Table4Row)
-
+ 'Clone values
Sub Clone( other As IAlternator)
+ 'Test Equality
Function IsEqualTo(other As IAlternator) As Boolean
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ICombinedAlternator.vb b/VECTOAux/VectoAuxiliaries/Electrics/ICombinedAlternator.vb
index 04e16b11ab..6d890da720 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/ICombinedAlternator.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ICombinedAlternator.vb
@@ -4,10 +4,10 @@ Namespace Electrics
Public Interface ICombinedAlternator
-
+ 'Alternators List
Property Alternators As List(Of IAlternator)
-
+ 'Test Equality
Function IsEqualTo( other As ICombinedAlternator ) As Boolean
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ICombinedAlternatorMapRow.vb b/VECTOAux/VectoAuxiliaries/Electrics/ICombinedAlternatorMapRow.vb
index 0b937fb153..6620d8f339 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/ICombinedAlternatorMapRow.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ICombinedAlternatorMapRow.vb
@@ -1,11 +1,19 @@
-Public Interface ICombinedAlternatorMapRow
+
+Namespace Electrics
+'Reflects stored data in pesisted CombinedAlternator Map .AALT
+Public Interface ICombinedAlternatorMapRow
- property AlternatorName As String
- property RPM As Single
- property Amps As Single
- property Efficiency As Single
- property PulleyRatio As Single
+
+ Property AlternatorName As String
+ Property RPM As Single
+ Property Amps As Single
+ Property Efficiency As Single
+ Property PulleyRatio As Single
End Interface
+
+
+End Namespace
+
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/ICombinedAlternatorSignals.vb b/VECTOAux/VectoAuxiliaries/Electrics/ICombinedAlternatorSignals.vb
index 6a0e71d3cb..bc83dd2f73 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/ICombinedAlternatorSignals.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/ICombinedAlternatorSignals.vb
@@ -1,7 +1,7 @@

Namespace Electrics
-
+'Used by CombinedAlternator
Public Interface ICombinedAlternatorSignals
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb
index 36039e4247..e4fccdf523 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb
@@ -8,20 +8,20 @@ Namespace Hvac
Public Class SSMCalculate
Implements ISSMCalculate
- Private ssmTOOL As ISSMTOOL
- Private Property Run1 As ISSMRun Implements ISSMCalculate.Run1
- Private Property Run2 As ISSMRun Implements ISSMCalculate.Run2
+ Private ssmTOOL As ISSMTOOL
+ Private Property Run1 As ISSMRun Implements ISSMCalculate.Run1
+ Private Property Run2 As ISSMRun Implements ISSMCalculate.Run2
- 'Constructor
- Sub New(ssmTool As ISSMTOOL)
+ 'Constructor
+ Sub New(ssmTool As ISSMTOOL)
- Me.ssmTOOL = ssmTool
- Run1 = New SSMRun(Me.ssmTOOL, 1)
- Run2 = New SSMRun(Me.ssmTOOL, 2)
+ Me.ssmTOOL = ssmTool
+ Run1 = New SSMRun(Me.ssmTOOL, 1)
+ Run2 = New SSMRun(Me.ssmTOOL, 2)
- End Sub
+ End Sub
- #Region "Main Outputs"
+ #Region "Main Outputs"
'BASE RESULTS
Public ReadOnly Property ElectricalWBase As Single Implements ISSMCalculate.ElectricalWBase
@@ -140,8 +140,8 @@ Public Class SSMCalculate
#End Region
-
- #Region "Staging Calculations"
+
+ #Region "Staging Calculations"
'Base Values
Public ReadOnly Property BaseHeatingW_Mechanical As Double Implements ISSMCalculate.BaseHeatingW_Mechanical
@@ -441,11 +441,12 @@ Public Class SSMCalculate
#End Region
- Public Overrides Function ToString() As String
-
- Dim sb As New StringBuilder()
+ 'Provides Diagnostic Information for the user which can be displayed on the form.
+ 'Based on the inputs generated, can be used to cross reference the Excel Model with the
+ 'Outputs generated here.
+ Public Overrides Function ToString() As String
-
+ Dim sb As New StringBuilder()
sb.AppendLine("")
sb.AppendLine("TechList Detail")
@@ -464,68 +465,62 @@ Public Class SSMCalculate
For Each line As ITechListBenefitLine In ssmTOOL.TechList.TechLines
+ With line
+
+ Dim extraNameSpaces, extraCatSpaces , extraUnitSpaces As Integer
+
+ extraNameSpaces = nameLength -.BenefitName.Length
+ extraCatSpaces = catLength - .Category.Length
+ extraUnitSpaces = unitLength - .Units.Length
+
+ cat=line.Category.Substring(0,Math.Min(line.Category.Length,catLength)) + Space( If(extraCatSpaces<0,0,extraCatSpaces)).Replace(" ",".")
+ name=line.BenefitName.Substring(0,Math.Min(line.BenefitName.Length,nameLength)) + Space(If(extraNameSpaces<0,0,extraNameSpaces)).Replace(" ",".")
+ units=line.Units.Substring(0,Math.Min(line.Units.Length,unitLength)) + Space(If(extraUnitSpaces<0,0,extraUnitSpaces)).Replace(" ",".")
+
+ sb.AppendLine(String.Format( Units + cat + name + " {0}{1}{0}{2}{0}{3}{0}{4}{0}{5}", vbtab , .H.ToString("0.000") , .VH.ToString("0.000"), .VV.ToString("0.000"), .VC.ToString("0.000"), .C.ToString("0.000")))
+
+ End With
+ Next
+
+ sb.AppendLine("")
+ sb.AppendLine("TechList Totals")
+ sb.AppendLine("***********************")
+
+ With ssmTOOL.TechList
+
+ sb.AppendLine( vbTab + vbTab + "H" +vbTab + "VH" + vbTab + "VV" + vbTab + "VC" + vbTab + "C")
+ sb.AppendLine(String.Format("Base Var % {0}{1}{0}{2}{0}{3}{0}{4}{0}{5}", vbtab, .HValueVariation.ToString("0.000") , .VHValueVariation.ToString("0.000"), .VVValueVariation.ToString("0.000"), .VCValueVariation.ToString("0.000"), .CValueVariation.ToString("0.000")))
+ sb.AppendLine(String.Format("Base Var KW {0}{1}{0}{2}{0}{3}{0}{4}{0}{5}", vbtab, .HValueVariationKW.ToString("0.000") , .VHValueVariationKW.ToString("0.000"), .VVValueVariationKW.ToString("0.000"), .VCValueVariationKW.ToString("0.000"), .CValueVariationKW.ToString("0.000")))
+
+ End With
- With line
-
-
- Dim extraNameSpaces, extraCatSpaces , extraUnitSpaces As Integer
-
-
-
- extraNameSpaces = nameLength -.BenefitName.Length
- extraCatSpaces = catLength - .Category.Length
- extraUnitSpaces = unitLength - .Units.Length
-
- cat=line.Category.Substring(0,Math.Min(line.Category.Length,catLength)) + Space( If(extraCatSpaces<0,0,extraCatSpaces)).Replace(" ",".")
- name=line.BenefitName.Substring(0,Math.Min(line.BenefitName.Length,nameLength)) + Space(If(extraNameSpaces<0,0,extraNameSpaces)).Replace(" ",".")
- units=line.Units.Substring(0,Math.Min(line.Units.Length,unitLength)) + Space(If(extraUnitSpaces<0,0,extraUnitSpaces)).Replace(" ",".")
-
-
- sb.AppendLine(String.Format( Units + cat + name + " {0}{1}{0}{2}{0}{3}{0}{4}{0}{5}", vbtab , .H.ToString("0.000") , .VH.ToString("0.000"), .VV.ToString("0.000"), .VC.ToString("0.000"), .C.ToString("0.000")))
-
- End With
-
- Next
-
- sb.AppendLine("")
- sb.AppendLine("TechList Totals")
- sb.AppendLine("***********************")
-
- With ssmTOOL.TechList
-
- sb.AppendLine( vbTab + vbTab + "H" +vbTab + "VH" + vbTab + "VV" + vbTab + "VC" + vbTab + "C")
- sb.AppendLine(String.Format("Base Var % {0}{1}{0}{2}{0}{3}{0}{4}{0}{5}", vbtab, .HValueVariation.ToString("0.000") , .VHValueVariation.ToString("0.000"), .VVValueVariation.ToString("0.000"), .VCValueVariation.ToString("0.000"), .CValueVariation.ToString("0.000")))
- sb.AppendLine(String.Format("Base Var KW {0}{1}{0}{2}{0}{3}{0}{4}{0}{5}", vbtab, .HValueVariationKW.ToString("0.000") , .VHValueVariationKW.ToString("0.000"), .VVValueVariationKW.ToString("0.000"), .VCValueVariationKW.ToString("0.000"), .CValueVariationKW.ToString("0.000")))
-
- End With
-
-
-
- 'Runs
- sb.AppendLine( Run1.ToString())
- sb.AppendLine( Run2.ToString())
-
- 'Staging Calcs
- sb.AppendLine("Staging Base Values")
- sb.AppendLine("*******************")
- sb.AppendLine( vbTab + vbTab + vbTab + "Mechanical" +vbTab + "Elec Cool/Heat" + vbTab + "Elec Vent" + vbTab + "Fuel Fired Heating")
- sb.AppendLine(String.Format("Heating {0}{1}{0}{2}{0}{3}{0}{4}",vbTab + vbtab, BaseHeatingW_Mechanical.ToString("0.00"), BaseHeatingW_ElectricalCoolingHeating.ToString("0.00"), BaseHeatingW_ElectricalVentilation.ToString("0.00"), BaseHeatingW_FuelFiredHeating.ToString("0.00") ))
- sb.AppendLine(String.Format("Cooling {0}{1}{0}{2}{0}{3}{0}{4}",vbTab + vbtab, BaseCoolingW_Mechanical.ToString("0.00"), BaseCoolingW_ElectricalCoolingHeating.ToString("0.00"), BaseCoolingW_ElectricalVentilation.ToString("0.00"), BaseCoolingW_FuelFiredHeating.ToString("0.00") ))
- sb.AppendLine(String.Format("Ventilate {0}{1}{0}{2}{0}{3}{0}{4}",vbTab + vbtab, BaseVentilationW_Mechanical.ToString("0.00"), BaseVentilationW_ElectricalCoolingHeating.ToString("0.00"), BaseVentilationW_ElectricalVentilation.ToString("0.00"), BaseVentilationW_FuelFiredHeating.ToString("0.00") ))
-
- sb.AppendLine("")
- sb.AppendLine("Staging Adjusted Values")
- sb.AppendLine("***********************")
- sb.AppendLine(String.Format("Heating {0}{1}{0}{2}{0}{3}{0}{4}",vbTab + vbtab, TechListAdjustedHeatingW_Mechanical.ToString("0.00"), TechListAdjustedHeatingW_ElectricalCoolingHeating.ToString("0.00"), TechListAdjustedHeatingW_ElectricalVentilation.ToString("0.00"), TechListAdjustedHeatingW_FuelFiredHeating.ToString("0.00") ))
- sb.AppendLine(String.Format("Cooling {0}{1}{0}{2}{0}{3}{0}{4}",vbTab + vbtab, TechListAdjustedCoolingW_Mechanical.ToString("0.00"), TechListAdjustedCoolingW_ElectricalCoolingHeating.ToString("0.00"), TechListAdjustedCoolingW_ElectricalVentilation.ToString("0.00"), TechListAdjustedCoolingW_FuelFiredHeating.ToString("0.00") ))
- sb.AppendLine(String.Format("Ventilate {0}{1}{0}{2}{0}{3}{0}{4}",vbTab + vbtab, TechListAdjustedVentilationW_Mechanical.ToString("0.00"), TechListAdjustedVentilationW_ElectricalCoolingHeating.ToString("0.00"), TechListAdjustedVentilationW_ElectricalVentilation.ToString("0.00"), TechListAdjustedVentilationW_FuelFiredHeating.ToString("0.00") ))
+ 'Runs
+ sb.AppendLine( Run1.ToString())
+ sb.AppendLine( Run2.ToString())
+
+ 'Staging Calcs
+ sb.AppendLine("Staging Base Values")
+ sb.AppendLine("*******************")
+ sb.AppendLine( vbTab + vbTab + vbTab + "Mechanical" +vbTab + "Elec Cool/Heat" + vbTab + "Elec Vent" + vbTab + "Fuel Fired Heating")
+
+ sb.AppendLine(String.Format("Heating {0}{1}{0}{2}{0}{3}{0}{4}",vbTab + vbtab, BaseHeatingW_Mechanical.ToString("0.00"), BaseHeatingW_ElectricalCoolingHeating.ToString("0.00"), BaseHeatingW_ElectricalVentilation.ToString("0.00"), BaseHeatingW_FuelFiredHeating.ToString("0.00") ))
+ sb.AppendLine(String.Format("Cooling {0}{1}{0}{2}{0}{3}{0}{4}",vbTab + vbtab, BaseCoolingW_Mechanical.ToString("0.00"), BaseCoolingW_ElectricalCoolingHeating.ToString("0.00"), BaseCoolingW_ElectricalVentilation.ToString("0.00"), BaseCoolingW_FuelFiredHeating.ToString("0.00") ))
+ sb.AppendLine(String.Format("Ventilate {0}{1}{0}{2}{0}{3}{0}{4}",vbTab + vbtab, BaseVentilationW_Mechanical.ToString("0.00"), BaseVentilationW_ElectricalCoolingHeating.ToString("0.00"), BaseVentilationW_ElectricalVentilation.ToString("0.00"), BaseVentilationW_FuelFiredHeating.ToString("0.00") ))
+
+ sb.AppendLine("")
+ sb.AppendLine("Staging Adjusted Values")
+ sb.AppendLine("***********************")
+
+ sb.AppendLine(String.Format("Heating {0}{1}{0}{2}{0}{3}{0}{4}",vbTab + vbtab, TechListAdjustedHeatingW_Mechanical.ToString("0.00"), TechListAdjustedHeatingW_ElectricalCoolingHeating.ToString("0.00"), TechListAdjustedHeatingW_ElectricalVentilation.ToString("0.00"), TechListAdjustedHeatingW_FuelFiredHeating.ToString("0.00") ))
+ sb.AppendLine(String.Format("Cooling {0}{1}{0}{2}{0}{3}{0}{4}",vbTab + vbtab, TechListAdjustedCoolingW_Mechanical.ToString("0.00"), TechListAdjustedCoolingW_ElectricalCoolingHeating.ToString("0.00"), TechListAdjustedCoolingW_ElectricalVentilation.ToString("0.00"), TechListAdjustedCoolingW_FuelFiredHeating.ToString("0.00") ))
+ sb.AppendLine(String.Format("Ventilate {0}{1}{0}{2}{0}{3}{0}{4}",vbTab + vbtab, TechListAdjustedVentilationW_Mechanical.ToString("0.00"), TechListAdjustedVentilationW_ElectricalCoolingHeating.ToString("0.00"), TechListAdjustedVentilationW_ElectricalVentilation.ToString("0.00"), TechListAdjustedVentilationW_FuelFiredHeating.ToString("0.00") ))
- Return sb.ToString()
+ Return sb.ToString()
End Function
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMGenInputs.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMGenInputs.vb
index 0c2dd73e7e..9c7fb41019 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/SSMGenInputs.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMGenInputs.vb
@@ -1,12 +1,13 @@

Namespace Hvac
-
+
+ 'Used by SSMHVAC Class
Public Class SSMGenInputs
- Implements ISSMGenInputs
+ Implements ISSMGenInputs
- 'BUS Parameterisation
+ 'BUS Parameterisation
'********************
'C4/D4
Public Property BP_BusModel As String Implements ISSMGenInputs.BP_BusModel
@@ -44,7 +45,7 @@ Namespace Hvac
'D12/C12 - ( M )
Public Property BP_BusWidth As Double Implements ISSMGenInputs.BP_BusWidth
- 'BOUNDRY CONDITIONS
+ 'BOUNDRY CONDITIONS
'******************
'C15
Public Property BC_GFactor As Double Implements ISSMGenInputs.BC_GFactor
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMRun.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMRun.vb
index d93c018bca..2eb4045fd1 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/SSMRun.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMRun.vb
@@ -3,7 +3,7 @@ Imports Microsoft.VisualBasic
Namespace Hvac
-
+'Used By SSMHVAC Class
Public Class SSMRun
Implements ISSMRun
@@ -182,8 +182,8 @@ Public Class SSMRun
End Property
-
-
+ 'Provides Diagnostic Information
+ 'To be utilised by the User.
Public Overrides Function ToString() As String
Dim sb As New StringBuilder()
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb
index a9c93c0121..8a01d87348 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb
@@ -7,6 +7,9 @@ Imports System.Text
Namespace Hvac
+'Used by frmHVACTool
+'Replaces Spreadsheet model which does the same calculation
+'Version of which appears on the form title.
Public Class SSMTOOL
Implements ISSMTOOL
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMTechList.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMTechList.vb
index 16f99cd907..2ff634cd10 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/SSMTechList.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMTechList.vb
@@ -2,7 +2,7 @@
Namespace Hvac
-
+'Used By SSMTOOL Class.
Public Class SSMTechList
Implements ISSMTechList
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/TechListBenefitLine.vb b/VECTOAux/VectoAuxiliaries/Hvac/TechListBenefitLine.vb
index 6a9c0195de..0f0a8a0db2 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/TechListBenefitLine.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/TechListBenefitLine.vb
@@ -17,12 +17,13 @@ Public Enum PowerType
End Enum
+'Used by SSMTOOL Class, refer to original spreadsheet model
+'Or PDF Model Document which articulates the same spreadsheet functionality
+'But within the context of the Vecto interpretation of the same.
Public Class TechListBenefitLine
Implements ITechListBenefitLine
-
-
Private _h,_vh,_vv,_vc,_c As Single
Public inputSheet As ISSMGenInputs
diff --git a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
index 427c500faf..e3a76bf50d 100644
--- a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
+++ b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
@@ -110,12 +110,9 @@
<Compile Include="Electrics\AlternatorMapValues.vb" />
<Compile Include="Electrics\AlternatorMap.vb" />
<Compile Include="Electrics\AltUserInput.vb" />
- <Compile Include="Electrics\CombinedAltEntry.vb" />
<Compile Include="Electrics\CombinedAlternator.vb" />
<Compile Include="Electrics\CombinedAlternatorMapRow.vb" />
<Compile Include="Electrics\CombinedAlternatorSignals.vb" />
- <Compile Include="Electrics\ImageCell.vb" />
- <Compile Include="Electrics\ImageColumn.vb" />
<Compile Include="Electrics\ElectricsUserInputsConfig.vb" />
<Compile Include="Electrics\IAlternator.vb" />
<Compile Include="Electrics\ICombinedAlternator.vb" />
@@ -125,7 +122,6 @@
<Compile Include="Electrics\IM0_5_SmartAlternatorSetEfficiency.vb" />
<Compile Include="Electrics\IM2_AverageElectricalLoadDemand.vb" />
<Compile Include="Electrics\IM5_SmartAlternatorSetGeneration.vb" />
- <Compile Include="Electrics\IncDecValuePair.vb" />
<Compile Include="Electrics\IResultCard.vb" />
<Compile Include="Electrics\M0_5_SmartAlternatorSetEfficiency.vb" />
<Compile Include="Electrics\M0_NonSmart_AlternatorsSetEfficiency.vb" />
@@ -276,7 +272,6 @@
</ItemGroup>
<ItemGroup>
<Folder Include="3rdPartyLibraries\" />
- <Folder Include="ExternalAssemblies\" />
</ItemGroup>
<ItemGroup>
<None Include="Images\application-export-icon-small.png" />
--
GitLab