diff --git a/VECTO/GUI/F_VECTO.vb b/VECTO/GUI/F_VECTO.vb
index ea41fa18b81cf02dbedfdc8bdc498e3771b3c208..c048ad091b9fb038395346b066df563138accd0a 100644
--- a/VECTO/GUI/F_VECTO.vb
+++ b/VECTO/GUI/F_VECTO.vb
@@ -1377,17 +1377,26 @@ lbDlog:
If fileExists AndAlso validAAUXFile Then
mAAUX_Global.ConfigureAdvancedAuxiliaries(assembly.AssemblyName, assembly.AuxiliaryVersion, txtAdvancedAuxiliaryFile.Text, VECTOfile)
Else
- 'Find / Create file and configure.
- If fbAux.CustomDialog(absoluteAuxPath, False, False, tFbExtMode.ForceExt, False, String.Empty) Then
- txtAdvancedAuxiliaryFile.Text = fFileWoDir(fbAux.Files(0), fPATH(VECTOfile))
- assembly = DirectCast(cboAdvancedAuxiliaries.SelectedItem, cAdvancedAuxiliary)
- If IO.File.Exists(mAAUX_Global.ResolveAAUXFilePath(fPATH(VECTOfile), txtAdvancedAuxiliaryFile.Text)) OrElse MsgBox("Do you want to create a new .AAUX file?", MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
- mAAUX_Global.ConfigureAdvancedAuxiliaries(assembly.AssemblyName, assembly.AuxiliaryVersion, txtAdvancedAuxiliaryFile.Text, VECTOfile)
+ Dim needToFindOrCreateFile As Boolean = True
+
+ While needToFindOrCreateFile
+
+ 'Find / Create file and configure.
+ If fbAux.CustomDialog(absoluteAuxPath, False, False, tFbExtMode.ForceExt, False, String.Empty) Then
+ txtAdvancedAuxiliaryFile.Text = fFileWoDir(fbAux.Files(0), fPATH(VECTOfile))
+ assembly = DirectCast(cboAdvancedAuxiliaries.SelectedItem, cAdvancedAuxiliary)
+
+ If IO.File.Exists(mAAUX_Global.ResolveAAUXFilePath(fPATH(VECTOfile), txtAdvancedAuxiliaryFile.Text)) OrElse MsgBox("Do you want to create a new .AAUX file?", MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+ needToFindOrCreateFile = False
+ mAAUX_Global.ConfigureAdvancedAuxiliaries(assembly.AssemblyName, assembly.AuxiliaryVersion, txtAdvancedAuxiliaryFile.Text, VECTOfile)
+ End If
Else
- txtAdvancedAuxiliaryFile.Text = String.Empty
+ needToFindOrCreateFile = False
End If
- End If
+
+ End While
+
End If
Catch ex As Exception
@@ -1404,7 +1413,6 @@ lbDlog:
btnBrowseAAUXFile.Enabled = False
txtAdvancedAuxiliaryFile.Enabled = False
- txtAdvancedAuxiliaryFile.Text = String.Empty
Else
@@ -1413,10 +1421,6 @@ lbDlog:
End If
-
-
-
-
End Sub
'AA-TB
diff --git a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
index f2b84b510289220a8e458c786cfef4fea7c741b0..8f36f28056b537800ce106e948cf45fcbf525648 100644
--- a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
+++ b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
@@ -235,7 +235,7 @@ Public Class AdvancedAuxiliaries
Signals.CurrentCycleTimeInSeconds += 1
Catch ex As Exception
- MessageBox.Show("Exception: " + ex.Message)
+ MessageBox.Show("Exception: " + ex.Message + " Stack Trace: " + ex.StackTrace)
Return False
End Try
diff --git a/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb b/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb
index cbc062a7752f9cbf76d1c9d380bb3ecf856e93c6..0744553d153faa37aa2ac50147db95faa77cbccd 100644
--- a/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb
+++ b/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb
@@ -82,14 +82,6 @@ Namespace Pneumatics
End Get
End Property
-
-
- Private ReadOnly Property Sum5 As Single
- Get
-
- End Get
- End Property
-
Public ReadOnly Property TotalAirDemand As Single
Get
Return _totalAirDemand
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
index 1ca930d9c8a488148a59409d30b0c7a34371617a..95a905452d5d776519ca8d65cb6412624228c73a 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.Designer.vb
@@ -24,18 +24,18 @@ Partial Class frmAuxiliaryConfig
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAuxiliaryConfig))
- Dim DataGridViewCellStyle37 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle38 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle39 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle40 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle41 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle42 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle43 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle44 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle45 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle46 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle47 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle48 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.pnlMain = New System.Windows.Forms.Panel()
Me.btnCancel = New System.Windows.Forms.Button()
Me.btnSave = New System.Windows.Forms.Button()
@@ -70,6 +70,7 @@ Partial Class frmAuxiliaryConfig
Me.lblAlternatormapPath = New System.Windows.Forms.Label()
Me.lblPowerNetVoltage = New System.Windows.Forms.Label()
Me.tabPneumaticConfig = New System.Windows.Forms.TabPage()
+ Me.Label3 = New System.Windows.Forms.Label()
Me.pnlPneumaticsUserInput = New System.Windows.Forms.Panel()
Me.btnOpenAPAC = New System.Windows.Forms.Button()
Me.btnOpenACMP = New System.Windows.Forms.Button()
@@ -139,7 +140,6 @@ Partial Class frmAuxiliaryConfig
Me.CmFiles = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.Label3 = New System.Windows.Forms.Label()
Me.pnlMain.SuspendLayout()
Me.tabMain.SuspendLayout()
Me.tabGeneralConfig.SuspendLayout()
@@ -343,97 +343,97 @@ Partial Class frmAuxiliaryConfig
'
'gvResultsCardOverrun
'
- DataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle37.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle37.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle37.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle37.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle37.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardOverrun.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle37
+ DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardOverrun.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
Me.gvResultsCardOverrun.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle38.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle38.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle38.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle38.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle38.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardOverrun.DefaultCellStyle = DataGridViewCellStyle38
+ DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvResultsCardOverrun.DefaultCellStyle = DataGridViewCellStyle2
Me.gvResultsCardOverrun.Location = New System.Drawing.Point(613, 451)
Me.gvResultsCardOverrun.Name = "gvResultsCardOverrun"
- DataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle39.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle39.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle39.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle39.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle39.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardOverrun.RowHeadersDefaultCellStyle = DataGridViewCellStyle39
+ DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardOverrun.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
Me.gvResultsCardOverrun.Size = New System.Drawing.Size(246, 125)
Me.gvResultsCardOverrun.TabIndex = 18
'
'gvResultsCardTraction
'
- DataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle40.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle40.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle40.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle40.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle40.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardTraction.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle40
+ DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardTraction.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
Me.gvResultsCardTraction.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle41.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardTraction.DefaultCellStyle = DataGridViewCellStyle41
+ DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvResultsCardTraction.DefaultCellStyle = DataGridViewCellStyle5
Me.gvResultsCardTraction.Location = New System.Drawing.Point(325, 451)
Me.gvResultsCardTraction.Name = "gvResultsCardTraction"
- DataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle42.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle42.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle42.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle42.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle42.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardTraction.RowHeadersDefaultCellStyle = DataGridViewCellStyle42
+ DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardTraction.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
Me.gvResultsCardTraction.Size = New System.Drawing.Size(258, 125)
Me.gvResultsCardTraction.TabIndex = 17
'
'gvResultsCardIdle
'
- DataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle43.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardIdle.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle43
+ DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardIdle.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7
Me.gvResultsCardIdle.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle44.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle44.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle44.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle44.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle44.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardIdle.DefaultCellStyle = DataGridViewCellStyle44
+ DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvResultsCardIdle.DefaultCellStyle = DataGridViewCellStyle8
Me.gvResultsCardIdle.Location = New System.Drawing.Point(35, 451)
Me.gvResultsCardIdle.Name = "gvResultsCardIdle"
- DataGridViewCellStyle45.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle45.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle45.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle45.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle45.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle45.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle45.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardIdle.RowHeadersDefaultCellStyle = DataGridViewCellStyle45
+ DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardIdle.RowHeadersDefaultCellStyle = DataGridViewCellStyle9
Me.gvResultsCardIdle.Size = New System.Drawing.Size(256, 125)
Me.gvResultsCardIdle.TabIndex = 16
'
@@ -485,33 +485,33 @@ Partial Class frmAuxiliaryConfig
'
'gvElectricalConsumables
'
- DataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle46.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle46.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle46.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle46.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle46.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle46.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvElectricalConsumables.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle46
+ DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvElectricalConsumables.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10
Me.gvElectricalConsumables.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle47.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle47.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle47.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle47.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle47.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle47.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvElectricalConsumables.DefaultCellStyle = DataGridViewCellStyle47
+ DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvElectricalConsumables.DefaultCellStyle = DataGridViewCellStyle11
Me.gvElectricalConsumables.Location = New System.Drawing.Point(33, 200)
Me.gvElectricalConsumables.Name = "gvElectricalConsumables"
- DataGridViewCellStyle48.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle48.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle48.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- DataGridViewCellStyle48.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle48.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle48.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle48.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvElectricalConsumables.RowHeadersDefaultCellStyle = DataGridViewCellStyle48
+ DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvElectricalConsumables.RowHeadersDefaultCellStyle = DataGridViewCellStyle12
Me.gvElectricalConsumables.Size = New System.Drawing.Size(830, 220)
Me.gvElectricalConsumables.TabIndex = 10
'
@@ -594,6 +594,16 @@ Partial Class frmAuxiliaryConfig
Me.tabPneumaticConfig.Text = "Pneumatics"
Me.tabPneumaticConfig.UseVisualStyleBackColor = True
'
+ 'Label3
+ '
+ Me.Label3.AutoSize = True
+ Me.Label3.Location = New System.Drawing.Point(17, 565)
+ Me.Label3.MinimumSize = New System.Drawing.Size(120, 0)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(120, 13)
+ Me.Label3.TabIndex = 25
+ Me.Label3.Text = "NI - Normal Litres"
+ '
'pnlPneumaticsUserInput
'
Me.pnlPneumaticsUserInput.Controls.Add(Me.btnOpenAPAC)
@@ -710,9 +720,9 @@ Partial Class frmAuxiliaryConfig
Me.lblAdBlueDosing.AutoSize = True
Me.lblAdBlueDosing.Location = New System.Drawing.Point(13, 184)
Me.lblAdBlueDosing.Name = "lblAdBlueDosing"
- Me.lblAdBlueDosing.Size = New System.Drawing.Size(150, 13)
+ Me.lblAdBlueDosing.Size = New System.Drawing.Size(120, 13)
Me.lblAdBlueDosing.TabIndex = 26
- Me.lblAdBlueDosing.Text = "Air for AdBlue Injection Dosing"
+ Me.lblAdBlueDosing.Text = "AdBlue Injection Dosing"
'
'chkRetarderBrake
'
@@ -1237,16 +1247,6 @@ Partial Class frmAuxiliaryConfig
Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
Me.ShowInFolderToolStripMenuItem.Text = "Open In Folder"
'
- 'Label3
- '
- Me.Label3.AutoSize = True
- Me.Label3.Location = New System.Drawing.Point(17, 565)
- Me.Label3.MinimumSize = New System.Drawing.Size(120, 0)
- Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(120, 13)
- Me.Label3.TabIndex = 25
- Me.Label3.Text = "NI - Normal Litres"
- '
'frmAuxiliaryConfig
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
index 49af887c36d09ff377fdee3a58d48a776552a023..34332da34aad7741e699e8ff9dddebde5732c0f0 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
@@ -467,7 +467,6 @@ Public Class frmAuxiliaryConfig
Dim result As Boolean = True
Dim message As String = ""
-
'Validate abdb - Bus Database
Dim abdbFile As String = FilePathUtils.ResolveFilePath(vectoPath, txtBusDatabaseFilePath.Text)
Dim bdb As New BusDatabase()
@@ -574,7 +573,8 @@ Public Class frmAuxiliaryConfig
Dim result As DialogResult
- If Not auxConfig.ConfigValuesAreTheSameAs(originalConfig) Then
+ If Not File.Exists(FilePathUtils.ResolveFilePath(vectoPath, auxFile)) OrElse
+ Not auxConfig.ConfigValuesAreTheSameAs(originalConfig) Then
result = (MessageBox.Show("Would you like to save changes before closing?", "Save Changes", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question))
@@ -804,7 +804,7 @@ Public Class frmAuxiliaryConfig
Dim result As Boolean
- If Not ValidateAll Then Return False
+ If Not ValidateAll() Then Return False
result = auxConfig.Save(FilePathUtils.ResolveFilePath(vectoPath, auxFile))
@@ -854,77 +854,24 @@ Public Class frmAuxiliaryConfig
End Sub
Private Sub btnAlternatorMapPath_Click(sender As Object, e As EventArgs) Handles btnAlternatorMapPath.Click
-
-
- ' Dim fbAux As New cFileBrowser(True, False)
-
-
-
- '' Dim vectoFile As String = "C:\Users\tb28\Source\Workspaces\VECTO\AuxillaryTestHarness\bin\Debug\vectopath.vecto"
- ' Dim fname As String = fFILE(vectoFile, True)
-
- ' fbAux.Extensions = New String() {"AALT"}
- ' If fbAux.OpenDialog(fPATH(vectoFile)) Then
-
- ' txtAlternatorMapPath.Text = fFileWoDir(fbAux.Files(0), fPATH(vectoFile))
-
- ' End If
-
- ' Validate_Electrics()
-
- ' 'Causes Binding to fire
- ' txtAlternatorMapPath.Focus()
-
-
- Dim aauxFileValidated As Boolean = False
Dim fbAux As New cFileBrowser(True, False)
fbAux.Extensions = New String() {"AALT"}
- Dim frm As frmCombinedAlternators
- Dim suppliedAALTPath As String = String.Empty
- Dim absoluteAALTPath As String = String.Empty
+ Dim suppliedAALTPath As String = txtAlternatorMapPath.Text
+ Dim absoluteAALTPath As String = FilePathUtils.ResolveFilePath(fPATH(vectoFile), suppliedAALTPath)
Dim message As String = String.Empty
Dim newFile As Boolean = False
+ Dim validAALTFile As Boolean = FilePathUtils.ValidateFilePath(absoluteAALTPath, ".aalt", message)
+ Dim fileExists As Boolean = File.Exists(absoluteAALTPath)
- 'Trim ssmPath
- 'suppliedAALTPath = txtAlternatorMapPath.Text.Trim
-
-
- 'Is Filename NOT supplied, try and obtain it, still not supplied, then bail.
- If (txtAlternatorMapPath.Text.Length = 0) Then
-
- newFile = True
-
- If fbAux.CustomDialog(vectoPath, False, False, tFbExtMode.ForceExt, False, "") Then
- If fbAux.Files.Count = 0 Then
- Return
- Else
- suppliedAALTPath = fbAux.Files(0)
- End If
- Else
- 'No file given in text box, not given in browser, so bail
- Return
- End If
-
- Else
- suppliedAALTPath = txtAlternatorMapPath.Text
-
- End If
-
- 'Set Absolutes.
- absoluteAALTPath = FilePathUtils.ResolveFilePath(fPATH(VECTOfile), suppliedAALTPath)
-
- 'Is supplied filename NOT valid. bail
- If Not FilePathUtils.ValidateFilePath(absoluteAALTPath, ".aalt", Message) Then
+ If suppliedAALTPath.Length > 0 AndAlso Not validAALTFile Then
MessageBox.Show(message)
Return
End If
-
'If file Exists, Check validity, else fire up a default SSM Config.
- If File.Exists(absoluteAALTPath) Then
- 'is file valid Try ahsm - HVac Steady State Model
+ If fileExists Then
Try
Dim aaltFile As String = FilePathUtils.ResolveFilePath(vectoPath, absoluteAALTPath)
Dim combinedAlt As ICombinedAlternator = New CombinedAlternator(aaltFile)
@@ -932,37 +879,47 @@ Public Class frmAuxiliaryConfig
MessageBox.Show("The supplied .AALT File was invalid, aborting.")
Return
End Try
- Else
- newFile = True
-
End If
+ If Not fileExists Then
+ Dim needToFindOrCreateFile As Boolean = True
+ While needToFindOrCreateFile
- frm = New frmCombinedAlternators(absoluteAALTPath, New COmbinedAlternatorSignals)
-
-
- 'If Dialog result is OK, then take action else bail
- If frm.ShowDialog() = Windows.Forms.DialogResult.OK Then
+ 'Find / Create file and configure.
+ If fbAux.CustomDialog(absoluteAALTPath, False, False, tFbExtMode.ForceExt, False, String.Empty) Then
+ txtAlternatorMapPath.Text = fFileWoDir(fbAux.Files(0), fPATH(vectoFile))
+ suppliedAALTPath = txtAlternatorMapPath.Text
+ absoluteAALTPath = FilePathUtils.ResolveFilePath(fPATH(vectoFile), suppliedAALTPath)
- If suppliedAALTPath.Contains(":\") Then
-
- txtAlternatorMapPath.Text = If(suppliedAALTPath.Contains(vectoPath), suppliedAALTPath.replace(vectoPath, ""), suppliedAALTPath)
-
- Else
-
- txtAlternatorMapPath.Text = fFileWoDir(suppliedAALTPath)
+ If IO.File.Exists(absoluteAALTPath) OrElse MsgBox("Do you want to create a new .AALT file?", MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+ needToFindOrCreateFile = False
+ newFile = True
+ End If
+ Else
+ needToFindOrCreateFile = False
+ End If
- End If
+ End While
- Else
- Return
End If
+ If fileExists OrElse newFile Then
- frm.Dispose()
-
+ Using frm As New frmCombinedAlternators(absoluteAALTPath, New CombinedAlternatorSignals)
+ 'If Dialog result is OK, then take action else bail
+ If frm.ShowDialog() = Windows.Forms.DialogResult.OK Then
+ If suppliedAALTPath.Contains(":\") Then
+ txtAlternatorMapPath.Text = If(suppliedAALTPath.Contains(vectoPath), suppliedAALTPath.Replace(vectoPath, ""), suppliedAALTPath)
+ Else
+ txtAlternatorMapPath.Text = fFileWoDir(suppliedAALTPath)
+ End If
+ Else
+ Return
+ End If
+ End Using
+ End If
End Sub
Private Sub btnCompressorMap_Click(sender As Object, e As EventArgs) Handles btnCompressorMap.Click
@@ -1021,7 +978,6 @@ Public Class frmAuxiliaryConfig
Private Sub btnBusDatabaseSource_Click(sender As Object, e As EventArgs) Handles btnBusDatabaseSource.Click
Dim fbAux As New cFileBrowser(True, False)
- Dim ssmMap As Hvac.HVACSteadyStateModel
Dim message As String = String.Empty
@@ -1036,7 +992,7 @@ Public Class frmAuxiliaryConfig
If Not busDB.Initialise(FilePathUtils.ResolveFilePath(vectoPath, txtBusDatabaseFilePath.Text)) Then
- messagebox.Show("Unable to load")
+ MessageBox.Show("Unable to load")
End If
@@ -1048,56 +1004,23 @@ Public Class frmAuxiliaryConfig
End Sub
Private Sub btnSSMBSource_Click(sender As Object, e As EventArgs) Handles btnSSMBSource.Click
-
- Dim aauxFileValidated As Boolean = False
Dim fbAux As New cFileBrowser(True, False)
fbAux.Extensions = New String() {"AHSM"}
- Dim frm As frmHVACTool
- Dim suppliedSSMPath As String = String.Empty
- Dim absoluteSSMPath As String = String.Empty
- Dim absoluteBusDatabasePath As String = String.Empty
+ Dim suppliedSSMPath As String = txtSSMFilePath.Text.Trim()
+ Dim absoluteSSMPath As String = FilePathUtils.ResolveFilePath(fPATH(vectoFile), suppliedSSMPath)
+ Dim absoluteBusDatabasePath As String = FilePathUtils.ResolveFilePath(fPATH(vectoFile), Me.txtBusDatabaseFilePath.Text.Trim())
Dim message As String = String.Empty
Dim newFile As Boolean = False
+ Dim validSSMTFile As Boolean = FilePathUtils.ValidateFilePath(absoluteSSMPath, ".ahsm", message)
+ Dim fileExists As Boolean = File.Exists(absoluteSSMPath)
- 'Trim ssmPath
- txtSSMFilePath.Text.Trim()
-
-
- 'Is Filename NOT supplied, try and obtain it, still not supplied, then bail.
- If (txtSSMFilePath.Text.Length = 0) Then
-
- newFile = True
-
- If fbAux.CustomDialog(vectoPath, False, False, tFbExtMode.ForceExt, False, "") Then
- If fbAux.Files.Count = 0 Then
- Return
- Else
- suppliedSSMPath = fbAux.Files(0)
- End If
- Else
- 'No file given in text box, not given in browser, so bail
- Return
- End If
-
- Else
- suppliedSSMPath = txtSSMFilePath.Text
-
- End If
-
- 'Set Absolutes.
- absoluteSSMPath = FilePathUtils.ResolveFilePath(fPATH(VECTOfile), suppliedSSMPath)
- absoluteBusDatabasePath = FilePathUtils.ResolveFilePath(fPATH(VECTOfile), Me.txtBusDatabaseFilePath.Text)
-
-
- 'Is supplied filename NOT valid. bail
- If Not FilePathUtils.ValidateFilePath(absoluteSSMPath, ".ahsm", Message) Then
+ If suppliedSSMPath.Length > 0 AndAlso Not validSSMTFile Then
MessageBox.Show(message)
Return
End If
-
'If file Exists, Check validity, else fire up a default SSM Config.
If File.Exists(absoluteSSMPath) Then
'is file valid Try ahsm - HVac Steady State Model
@@ -1109,51 +1032,48 @@ Public Class frmAuxiliaryConfig
MessageBox.Show("The supplied AHSM File was invalid, aborting.")
Return
End Try
- Else
- newFile = True
-
End If
+ If Not fileExists Then
- 'If newFile then use Defaults
- If newFile Then
- frm = New frmHVACTool(absoluteBusDatabasePath, absoluteSSMPath, vectoFile, True)
+ Dim needToFindOrCreateFile As Boolean = True
+ While needToFindOrCreateFile
- Else
- frm = New frmHVACTool(absoluteBusDatabasePath, absoluteSSMPath, vectoFile)
-
- End If
-
-
-
-
- 'If Dialog result is OK, then take action else bail
- If frm.ShowDialog() = Windows.Forms.DialogResult.OK Then
-
- If suppliedSSMPath.Contains(":\") Then
-
- txtSSMFilePath.Text = If(suppliedSSMPath.Contains(vectoPath), suppliedSSMPath.Replace(vectoPath, ""), suppliedSSMPath)
-
- Else
-
- txtSSMFilePath.Text = fFileWoDir(suppliedSSMPath)
+ 'Find / Create file and configure.
+ If fbAux.CustomDialog(absoluteSSMPath, False, False, tFbExtMode.ForceExt, False, String.Empty) Then
+ txtSSMFilePath.Text = fFileWoDir(fbAux.Files(0), fPATH(vectoFile))
+ suppliedSSMPath = txtSSMFilePath.Text
+ absoluteSSMPath = FilePathUtils.ResolveFilePath(fPATH(vectoFile), suppliedSSMPath)
+ If IO.File.Exists(absoluteSSMPath) OrElse MsgBox("Do you want to create a new .AHSM file?", MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+ needToFindOrCreateFile = False
+ newFile = True
+ End If
+ Else
+ needToFindOrCreateFile = False
+ End If
- End If
+ End While
- Else
- Return
End If
+ If fileExists OrElse newFile Then
- frm.Dispose()
-
+ Using frm As New frmHVACTool(absoluteBusDatabasePath, absoluteSSMPath, vectoFile, Not fileExists)
+ If frm.ShowDialog() = Windows.Forms.DialogResult.OK Then
+ If suppliedSSMPath.Contains(":\") Then
+ txtSSMFilePath.Text = If(suppliedSSMPath.Contains(vectoPath), suppliedSSMPath.Replace(vectoPath, ""), suppliedSSMPath)
+ Else
+ txtSSMFilePath.Text = fFileWoDir(suppliedSSMPath)
+ End If
+ Else
+ Return
+ End If
+ End Using
+ End If
End Sub
-
-
-
#End Region
Private Sub chkSmartElectricals_CheckedChanged(sender As Object, e As EventArgs) Handles chkSmartElectricals.CheckedChanged
@@ -1164,30 +1084,30 @@ Public Class frmAuxiliaryConfig
Private Sub btnAALTOpen_Click(sender As Object, e As EventArgs) Handles btnAALTOpen.Click
- OpenFiles(fFileRepl(Me.txtAlternatorMapPath.Text, fPATH(VECTOfile)))
+ OpenFiles(fFileRepl(Me.txtAlternatorMapPath.Text, fPATH(vectoFile)))
End Sub
Private Sub btnOpenACMP_Click(sender As Object, e As EventArgs) Handles btnOpenACMP.Click
- OpenFiles(fFileRepl(Me.txtCompressorMap.Text, fPATH(VECTOfile)))
+ OpenFiles(fFileRepl(Me.txtCompressorMap.Text, fPATH(vectoFile)))
End Sub
Private Sub btnOpenAPAC_Click(sender As Object, e As EventArgs) Handles btnOpenAPAC.Click
- OpenFiles(fFileRepl(Me.txtActuationsMap.Text, fPATH(VECTOfile)))
+ OpenFiles(fFileRepl(Me.txtActuationsMap.Text, fPATH(vectoFile)))
End Sub
Private Sub btnOpenAHSM_Click(sender As Object, e As EventArgs) Handles btnOpenAHSM.Click
- OpenFiles(fFileRepl(Me.txtSSMFilePath.Text, fPATH(VECTOfile)))
+ OpenFiles(fFileRepl(Me.txtSSMFilePath.Text, fPATH(vectoFile)))
End Sub
Private Sub btnOpenABDB_Click(sender As Object, e As EventArgs) Handles btnOpenABDB.Click
- OpenFiles(fFileRepl(Me.txtBusDatabaseFilePath.Text, fPATH(VECTOfile)))
+ OpenFiles(fFileRepl(Me.txtBusDatabaseFilePath.Text, fPATH(vectoFile)))
End Sub
@@ -1221,7 +1141,7 @@ Public Class frmAuxiliaryConfig
If files.Length = 0 Then Exit Sub
- CmFilesList = files
+ cmFilesList = files
OpenWithToolStripMenuItem.Text = "Open with notepad"
@@ -1229,12 +1149,12 @@ Public Class frmAuxiliaryConfig
End Sub
Private Sub OpenWithToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles OpenWithToolStripMenuItem.Click
- If Not FileOpenAlt(CmFilesList(0)) Then MsgBox("Failed to open file!")
+ If Not FileOpenAlt(cmFilesList(0)) Then MsgBox("Failed to open file!")
End Sub
Private Sub ShowInFolderToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles ShowInFolderToolStripMenuItem.Click
- If IO.File.Exists(CmFilesList(0)) Then
+ If IO.File.Exists(cmFilesList(0)) Then
Try
- System.Diagnostics.Process.Start("explorer", "/select,""" & CmFilesList(0) & "")
+ System.Diagnostics.Process.Start("explorer", "/select,""" & cmFilesList(0) & "")
Catch ex As Exception
MsgBox("Failed to open file!")
End Try
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmCombinedAlternators.vb b/VECTOAux/VectoAuxiliaries/UI/frmCombinedAlternators.vb
index 58c23307e1fa910a312780117b8e6f9a4903db71..35616ea45f25bae500c0c0c436a50d7d403f73bf 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmCombinedAlternators.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmCombinedAlternators.vb
@@ -268,13 +268,6 @@ Public Class frmCombinedAlternators
End Function
- Private Function ValidateAll() As Boolean
-
-
-
-
- End Function
-
'Other events
Private Sub groupBoxUserInput_Paint(sender As Object, e As Windows.Forms.PaintEventArgs) Handles grpTable2000PRM.Paint, grpTable6000PRM.Paint, grpTable4000PRM.Paint
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb b/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb
index 90b063cf41db7bc6bf69d803661498e16efb256c..a7090020c88f376739ff5750d9a9925204126cfc 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.vb
@@ -870,7 +870,7 @@ Public Class frmHVACTool
Dim row As Integer = gvTechBenefitLines.SelectedCells(0).OwningRow.Index
- Dim benefitName, category, units As String
+ Dim benefitName, category As String
benefitName = gvTechBenefitLines.Rows(row).Cells("BenefitName").Value
category = gvTechBenefitLines.Rows(row).Cells("Category").Value
diff --git a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
index 966357be22d2566c7b5952c960140fa2116dbdcb..75e111c632be616ce2d3187d0abd2ea48dae4f55 100644
--- a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
+++ b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
@@ -52,9 +52,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>3rdPartyLibraries\DocumentFormat.OpenXml.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>3rdPartyLibraries\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>..\..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Omu.ValueInjecter">
<HintPath>..\..\packages\valueinjecter.2.3.3\lib\net35\Omu.ValueInjecter.dll</HintPath>
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
index 16a3ac53886110160a511d8bdf77a1cb84d5ee45..406a2d2592c58fa191c11212628e99481028ca6c 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
@@ -8,519 +8,512 @@ Imports VectoAuxiliaries.Hvac
Namespace UnitTests
- <TestFixture()>
- Public Class CombinedAlternatorTests
-
- private Alt1ExpectedTable2000 As new List(Of AltUserInput)
- private Alt1ExpectedTable4000 As new List(Of AltUserInput)
- private Alt1ExpectedTable6000 As new List(Of AltUserInput)
- private Alt2ExpectedTable2000 As new List(Of AltUserInput)
- private Alt2ExpectedTable4000 As new List(Of AltUserInput)
- private Alt2ExpectedTable6000 As new List(Of AltUserInput)
- private Alt3ExpectedTable2000 As new List(Of AltUserInput)
- private Alt3ExpectedTable4000 As new List(Of AltUserInput)
- private Alt3ExpectedTable6000 As new List(Of AltUserInput)
- private Alt4ExpectedTable2000 As new List(Of AltUserInput)
- private Alt4ExpectedTable4000 As new List(Of AltUserInput)
- private Alt4ExpectedTable6000 As new List(Of AltUserInput)
- Private RangeTableExpected As New List(Of AltUserInput)
-
-
-
- Private Const COMBINEDALT_GOODMAP = "testfiles\testCombinedAlternatorMap.aalt"
-
-
- Sub new ()
-
- Alt1ExpectedTable2000 = New List(Of AltUserInput)() from { New AltUserInput( 0,50), _
- New AltUserInput( 10,50), _
- New AltUserInput( 40,50), _
- New AltUserInput( 60,50), _
- New AltUserInput( 61,50), _
- New AltUserInput(200,50) }
-
- Alt1ExpectedTable4000 = New List(Of AltUserInput)() from { New AltUserInput( 0,70), _
- New AltUserInput( 10,70), _
- New AltUserInput( 40,70), _
- New AltUserInput( 60,70), _
- New AltUserInput( 61,70), _
- New AltUserInput(200,70) }
+ <TestFixture()>
+ Public Class CombinedAlternatorTests
+
+ Private Alt1ExpectedTable2000 As New List(Of AltUserInput)
+ Private Alt1ExpectedTable4000 As New List(Of AltUserInput)
+ Private Alt1ExpectedTable6000 As New List(Of AltUserInput)
+ Private Alt2ExpectedTable2000 As New List(Of AltUserInput)
+ Private Alt2ExpectedTable4000 As New List(Of AltUserInput)
+ Private Alt2ExpectedTable6000 As New List(Of AltUserInput)
+ Private Alt3ExpectedTable2000 As New List(Of AltUserInput)
+ Private Alt3ExpectedTable4000 As New List(Of AltUserInput)
+ Private Alt3ExpectedTable6000 As New List(Of AltUserInput)
+ Private Alt4ExpectedTable2000 As New List(Of AltUserInput)
+ Private Alt4ExpectedTable4000 As New List(Of AltUserInput)
+ Private Alt4ExpectedTable6000 As New List(Of AltUserInput)
+ Private RangeTableExpected As New List(Of AltUserInput)
+
+
+
+ Private Const COMBINEDALT_GOODMAP = "testfiles\testCombinedAlternatorMap.aalt"
+
+
+ Sub New()
+
+ Alt1ExpectedTable2000 = New List(Of AltUserInput)() From {New AltUserInput(0, 50), _
+ New AltUserInput(10, 50), _
+ New AltUserInput(40, 50), _
+ New AltUserInput(60, 50), _
+ New AltUserInput(61, 50), _
+ New AltUserInput(200, 50)}
+
+ Alt1ExpectedTable4000 = New List(Of AltUserInput)() From {New AltUserInput(0, 70), _
+ New AltUserInput(10, 70), _
+ New AltUserInput(40, 70), _
+ New AltUserInput(60, 70), _
+ New AltUserInput(61, 70), _
+ New AltUserInput(200, 70)}
- Alt1ExpectedTable6000 = New List(Of AltUserInput)() from { New AltUserInput( 0,60), _
- New AltUserInput( 10,60), _
- New AltUserInput( 40,60), _
- New AltUserInput( 60,60), _
- New AltUserInput( 61,60), _
- New AltUserInput(200,60) }
-
- 'ALT 2
- Alt2ExpectedTable2000 = New List(Of AltUserInput)() from { New AltUserInput( 0,80), _
- New AltUserInput( 10,80), _
- New AltUserInput( 40,80), _
- New AltUserInput( 60,80), _
- New AltUserInput( 61,80), _
- New AltUserInput(200,80) }
-
- Alt2ExpectedTable4000 = New List(Of AltUserInput)() from { New AltUserInput( 0,40), _
- New AltUserInput( 10,40), _
- New AltUserInput( 40,40), _
- New AltUserInput( 60,40), _
- New AltUserInput( 61,40), _
- New AltUserInput(200,40) }
-
-
- Alt2ExpectedTable6000 = New List(Of AltUserInput)() from { New AltUserInput( 0,60), _
- New AltUserInput( 10,60), _
- New AltUserInput( 40,60), _
- New AltUserInput( 60,60), _
- New AltUserInput( 61,60), _
- New AltUserInput(200,60) }
-
-
- 'ALT 3
- Alt3ExpectedTable2000 = New List(Of AltUserInput)() from { New AltUserInput( 0,95), _
- New AltUserInput( 10,95), _
- New AltUserInput( 40,50), _
- New AltUserInput( 60,90), _
- New AltUserInput(62.5,95), _
- New AltUserInput(200, 95) }
-
- Alt3ExpectedTable4000 = New List(Of AltUserInput)() from { New AltUserInput( 0,99), _
- New AltUserInput( 10,99), _
- New AltUserInput( 40, 1), _
- New AltUserInput( 60,55), _
- New AltUserInput( 76.2962963,99), _
- New AltUserInput(200,99) }
+ Alt1ExpectedTable6000 = New List(Of AltUserInput)() From {New AltUserInput(0, 60), _
+ New AltUserInput(10, 60), _
+ New AltUserInput(40, 60), _
+ New AltUserInput(60, 60), _
+ New AltUserInput(61, 60), _
+ New AltUserInput(200, 60)}
+ 'ALT 2
+ Alt2ExpectedTable2000 = New List(Of AltUserInput)() From {New AltUserInput(0, 80), _
+ New AltUserInput(10, 80), _
+ New AltUserInput(40, 80), _
+ New AltUserInput(60, 80), _
+ New AltUserInput(61, 80), _
+ New AltUserInput(200, 80)}
- Alt3ExpectedTable6000 = New List(Of AltUserInput)() from { New AltUserInput( 0,94), _
- New AltUserInput( 10,94), _
- New AltUserInput( 40, 86), _
- New AltUserInput( 60,13), _
- New AltUserInput( 63.5616438,0), _
- New AltUserInput(200,0) }
-
-
- 'ALT 4
- Alt4ExpectedTable2000 = New List(Of AltUserInput)() from { New AltUserInput( 0,55), _
- New AltUserInput( 10,55), _
- New AltUserInput( 40,45), _
- New AltUserInput( 60,67), _
- New AltUserInput( 60,67), _
- New AltUserInput(200,67) }
-
- Alt4ExpectedTable4000 = New List(Of AltUserInput)() from { New AltUserInput( 0,77), _
- New AltUserInput( 10,77), _
- New AltUserInput( 40,39), _
- New AltUserInput( 60,23), _
- New AltUserInput( 88.75,0), _
- New AltUserInput(200,0) }
-
+ Alt2ExpectedTable4000 = New List(Of AltUserInput)() From {New AltUserInput(0, 40), _
+ New AltUserInput(10, 40), _
+ New AltUserInput(40, 40), _
+ New AltUserInput(60, 40), _
+ New AltUserInput(61, 40), _
+ New AltUserInput(200, 40)}
- Alt4ExpectedTable6000 = New List(Of AltUserInput)() from { New AltUserInput( 0,34), _
- New AltUserInput( 10,34), _
- New AltUserInput( 40, 67), _
- New AltUserInput( 60,35), _
- New AltUserInput( 81.875,0), _
- New AltUserInput(200,0) }
+ Alt2ExpectedTable6000 = New List(Of AltUserInput)() From {New AltUserInput(0, 60), _
+ New AltUserInput(10, 60), _
+ New AltUserInput(40, 60), _
+ New AltUserInput(60, 60), _
+ New AltUserInput(61, 60), _
+ New AltUserInput(200, 60)}
- 'RangeTable
- RangeTableExpected = New List(Of AltUserInput)() from { New AltUserInput(-3001 , 0), _
- New AltUserInput(-3000 , 0), _
- New AltUserInput(2000 ,50), _
- New AltUserInput(4000 ,70), _
- New AltUserInput(6000 ,60), _
- New AltUserInput(18000 , 0), _
- New AltUserInput(18001 , 0) }
+ 'ALT 3
+ Alt3ExpectedTable2000 = New List(Of AltUserInput)() From {New AltUserInput(0, 95), _
+ New AltUserInput(10, 95), _
+ New AltUserInput(40, 50), _
+ New AltUserInput(60, 90), _
+ New AltUserInput(62.5, 95), _
+ New AltUserInput(200, 95)}
-
+ Alt3ExpectedTable4000 = New List(Of AltUserInput)() From {New AltUserInput(0, 99), _
+ New AltUserInput(10, 99), _
+ New AltUserInput(40, 1), _
+ New AltUserInput(60, 55), _
+ New AltUserInput(76.2962963, 99), _
+ New AltUserInput(200, 99)}
+ Alt3ExpectedTable6000 = New List(Of AltUserInput)() From {New AltUserInput(0, 94), _
+ New AltUserInput(10, 94), _
+ New AltUserInput(40, 86), _
+ New AltUserInput(60, 13), _
+ New AltUserInput(63.5616438, 0), _
+ New AltUserInput(200, 0)}
+ 'ALT 4
+ Alt4ExpectedTable2000 = New List(Of AltUserInput)() From {New AltUserInput(0, 55), _
+ New AltUserInput(10, 55), _
+ New AltUserInput(40, 45), _
+ New AltUserInput(60, 67), _
+ New AltUserInput(60, 67), _
+ New AltUserInput(200, 67)}
+ Alt4ExpectedTable4000 = New List(Of AltUserInput)() From {New AltUserInput(0, 77), _
+ New AltUserInput(10, 77), _
+ New AltUserInput(40, 39), _
+ New AltUserInput(60, 23), _
+ New AltUserInput(88.75, 0), _
+ New AltUserInput(200, 0)}
- End Sub
+ Alt4ExpectedTable6000 = New List(Of AltUserInput)() From {New AltUserInput(0, 34), _
+ New AltUserInput(10, 34), _
+ New AltUserInput(40, 67), _
+ New AltUserInput(60, 35), _
+ New AltUserInput(81.875, 0), _
+ New AltUserInput(200, 0)}
- <Test()> _
- <TestCase(1,2,50f)> _
- <TestCase(1,4,70)> _
- <TestCase(1,6,60)> _
- <TestCase(2,2,80)> _
- <TestCase(2,4,40)> _
- <TestCase(2,6,60)> _
- <TestCase(3,2,55)> _
- <TestCase(3,4,7.75f)> _
- <TestCase(3,6,76.875f)> _
- <TestCase(4,2,47.75f)> _
- <TestCase(4,4,37)> _
- <TestCase(4,6,63)>
- Public Sub Interpolate4Table4( alt As Integer, rpmK As integer, expected As single)
- Dim interpValue As Single
- Select Case alt
+ 'RangeTable
+ RangeTableExpected = New List(Of AltUserInput)() From {New AltUserInput(-3001, 0), _
+ New AltUserInput(-3000, 0), _
+ New AltUserInput(2000, 50), _
+ New AltUserInput(4000, 70), _
+ New AltUserInput(6000, 60), _
+ New AltUserInput(18000, 0), _
+ New AltUserInput(18001, 0)}
- Case 1
-
- Select Case rpmK
-
- Case 2
- interpValue= Alternator.Iterpolate( Alt1ExpectedTable2000,42.5)
- Case 4
- interpValue= Alternator.Iterpolate( Alt1ExpectedTable4000,42.5)
- Case 6
- interpValue= Alternator.Iterpolate( Alt1ExpectedTable6000,42.5)
- End Select
- Case 2
- Select Case rpmK
-
- Case 2
- interpValue= Alternator.Iterpolate( Alt2ExpectedTable2000,42.5)
- Case 4
- interpValue= Alternator.Iterpolate( Alt2ExpectedTable4000,42.5)
- Case 6
- interpValue= Alternator.Iterpolate( Alt2ExpectedTable6000,42.5)
- End Select
- Case 3
- Select Case rpmK
-
- Case 2
- interpValue= Alternator.Iterpolate( Alt3ExpectedTable2000,42.5)
- Case 4
- interpValue= Alternator.Iterpolate( Alt3ExpectedTable4000,42.5)
- Case 6
- interpValue= Alternator.Iterpolate( Alt3ExpectedTable6000,42.5)
- End Select
+ End Sub
- Case 4
+ <Test()> _
+ <TestCase(1, 2, 50.0F)> _
+ <TestCase(1, 4, 70)> _
+ <TestCase(1, 6, 60)> _
+ <TestCase(2, 2, 80)> _
+ <TestCase(2, 4, 40)> _
+ <TestCase(2, 6, 60)> _
+ <TestCase(3, 2, 55)> _
+ <TestCase(3, 4, 7.75F)> _
+ <TestCase(3, 6, 76.875F)> _
+ <TestCase(4, 2, 47.75F)> _
+ <TestCase(4, 4, 37)> _
+ <TestCase(4, 6, 63)>
+ Public Sub Interpolate4Table4(alt As Integer, rpmK As Integer, expected As Single)
- Select Case rpmK
-
- Case 2
- interpValue= Alternator.Iterpolate( Alt4ExpectedTable2000,42.5)
- Case 4
- interpValue= Alternator.Iterpolate( Alt4ExpectedTable4000,42.5)
- Case 6
- interpValue= Alternator.Iterpolate( Alt4ExpectedTable6000,42.5)
+ Dim interpValue As Single
- End Select
+ Select Case alt
- End Select
+ Case 1
+ Select Case rpmK
- Assert.AreEqual( interpValue, expected)
+ Case 2
+ interpValue = Alternator.Iterpolate(Alt1ExpectedTable2000, 42.5)
+ Case 4
+ interpValue = Alternator.Iterpolate(Alt1ExpectedTable4000, 42.5)
+ Case 6
+ interpValue = Alternator.Iterpolate(Alt1ExpectedTable6000, 42.5)
+ End Select
- End Sub
+ Case 2
- <Test()>
- Public Sub Alt1TableConstructTest()
+ Select Case rpmK
+ Case 2
+ interpValue = Alternator.Iterpolate(Alt2ExpectedTable2000, 42.5)
+ Case 4
+ interpValue = Alternator.Iterpolate(Alt2ExpectedTable4000, 42.5)
+ Case 6
+ interpValue = Alternator.Iterpolate(Alt2ExpectedTable6000, 42.5)
- 'Arrange
- Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals
+ End Select
+ Case 3
- 'Act
- Dim alt As new CombinedAlternator(COMBINEDALT_GOODMAP)
+ Select Case rpmK
+ Case 2
+ interpValue = Alternator.Iterpolate(Alt3ExpectedTable2000, 42.5)
+ Case 4
+ interpValue = Alternator.Iterpolate(Alt3ExpectedTable4000, 42.5)
+ Case 6
+ interpValue = Alternator.Iterpolate(Alt3ExpectedTable6000, 42.5)
+ End Select
- Dim idx As integer
+ Case 4
- For idx = 0 to alt.Alternators(0).InputTable2000.Count-1
- Assert.IsTrue( alt.Alternators(0).InputTable2000(idx).IsEqual( Alt1ExpectedTable2000(idx)))
- Next
+ Select Case rpmK
- For idx = 0 to alt.Alternators(0).InputTable4000.Count-1
- Assert.IsTrue( alt.Alternators(0).InputTable4000(idx).IsEqual( Alt1ExpectedTable4000(idx)))
- Next
+ Case 2
+ interpValue = Alternator.Iterpolate(Alt4ExpectedTable2000, 42.5)
+ Case 4
+ interpValue = Alternator.Iterpolate(Alt4ExpectedTable4000, 42.5)
+ Case 6
+ interpValue = Alternator.Iterpolate(Alt4ExpectedTable6000, 42.5)
- For idx = 0 to alt.Alternators(0).InputTable6000.Count-1
- Assert.IsTrue( alt.Alternators(0).InputTable6000(idx).IsEqual( Alt1ExpectedTable6000(idx)))
- Next
+ End Select
+ End Select
- End Sub
- <Test()>
- Public Sub Alt2TableConstructTest()
+ Assert.AreEqual(interpValue, expected)
+ End Sub
- 'Arrange
- 'Act
- Dim alt As new CombinedAlternator(COMBINEDALT_GOODMAP)
-
+ <Test()>
+ Public Sub Alt1TableConstructTest()
- Dim idx As integer
- For idx = 0 to alt.Alternators(1).InputTable2000.Count-1
- Assert.IsTrue( alt.Alternators(1).InputTable2000(idx).IsEqual( Alt2ExpectedTable2000(idx)))
- Next
+ 'Arrange
+ Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals
- For idx = 0 to alt.Alternators(1).InputTable4000.Count-1
- Assert.IsTrue( alt.Alternators(1).InputTable4000(idx).IsEqual( Alt2ExpectedTable4000(idx)))
- Next
- For idx = 0 to alt.Alternators(1).InputTable6000.Count-1
- Assert.IsTrue( alt.Alternators(1).InputTable6000(idx).IsEqual( Alt2ExpectedTable6000(idx)))
- Next
-
+ 'Act
+ Dim alt As New CombinedAlternator(COMBINEDALT_GOODMAP)
- End Sub
- <Test()>
- Public Sub Alt3TableConstructTest()
- 'Arrange
- Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals
+ Dim idx As Integer
+ For idx = 0 To alt.Alternators(0).InputTable2000.Count - 1
+ Assert.IsTrue(alt.Alternators(0).InputTable2000(idx).IsEqual(Alt1ExpectedTable2000(idx)))
+ Next
- 'Act
- Dim alt As new CombinedAlternator(COMBINEDALT_GOODMAP)
-
+ For idx = 0 To alt.Alternators(0).InputTable4000.Count - 1
+ Assert.IsTrue(alt.Alternators(0).InputTable4000(idx).IsEqual(Alt1ExpectedTable4000(idx)))
+ Next
- Dim idx As integer
+ For idx = 0 To alt.Alternators(0).InputTable6000.Count - 1
+ Assert.IsTrue(alt.Alternators(0).InputTable6000(idx).IsEqual(Alt1ExpectedTable6000(idx)))
+ Next
- For idx = 0 to alt.Alternators(2).InputTable2000.Count-1
- Assert.IsTrue( alt.Alternators(2).InputTable2000(idx).IsEqual( Alt3ExpectedTable2000(idx)))
- Next
- For idx = 0 to alt.Alternators(2).InputTable4000.Count-1
- Assert.IsTrue( alt.Alternators(2).InputTable4000(idx).IsEqual( Alt3ExpectedTable4000(idx),3))
- Next
+ End Sub
- For idx = 0 to alt.Alternators(2).InputTable6000.Count-1
- Assert.IsTrue( alt.Alternators(2).InputTable6000(idx).IsEqual( Alt3ExpectedTable6000(idx),3))
- Next
-
+ <Test()>
+ Public Sub Alt2TableConstructTest()
- End Sub
- <Test()>
- Public Sub Alt4TableConstructTest()
- 'Arrange
- Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals
+ 'Arrange
- 'Act
- Dim alt As new CombinedAlternator(COMBINEDALT_GOODMAP)
-
+ 'Act
+ Dim alt As New CombinedAlternator(COMBINEDALT_GOODMAP)
- Dim idx As integer
- For idx = 0 to alt.Alternators(3).InputTable2000.Count-1
- Assert.IsTrue( alt.Alternators(3).InputTable2000(idx).IsEqual( Alt4ExpectedTable2000(idx)))
- Next
+ Dim idx As Integer
- For idx = 0 to alt.Alternators(3).InputTable4000.Count-1
- Assert.IsTrue( alt.Alternators(3).InputTable4000(idx).IsEqual( Alt4ExpectedTable4000(idx),3))
- Next
+ For idx = 0 To alt.Alternators(1).InputTable2000.Count - 1
+ Assert.IsTrue(alt.Alternators(1).InputTable2000(idx).IsEqual(Alt2ExpectedTable2000(idx)))
+ Next
- For idx = 0 to alt.Alternators(3).InputTable6000.Count-1
- Assert.IsTrue( alt.Alternators(3).InputTable6000(idx).IsEqual( Alt4ExpectedTable6000(idx),3))
- Next
-
+ For idx = 0 To alt.Alternators(1).InputTable4000.Count - 1
+ Assert.IsTrue(alt.Alternators(1).InputTable4000(idx).IsEqual(Alt2ExpectedTable4000(idx)))
+ Next
- End Sub
+ For idx = 0 To alt.Alternators(1).InputTable6000.Count - 1
+ Assert.IsTrue(alt.Alternators(1).InputTable6000(idx).IsEqual(Alt2ExpectedTable6000(idx)))
+ Next
- 'testCombinedAlternatorMap
- <Test()>
- Public Sub InitialiseCombinedAlternatorMapFromFile()
+ End Sub
+ <Test()>
+ Public Sub Alt3TableConstructTest()
- 'Arrange
- Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals
+ 'Arrange
+ Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals
- 'Act
- Dim target As new CombinedAlternator(COMBINEDALT_GOODMAP)
+ 'Act
+ Dim alt As New CombinedAlternator(COMBINEDALT_GOODMAP)
+ Dim idx As Integer
- 'Assert
+ For idx = 0 To alt.Alternators(2).InputTable2000.Count - 1
+ Assert.IsTrue(alt.Alternators(2).InputTable2000(idx).IsEqual(Alt3ExpectedTable2000(idx)))
+ Next
- Assert.AreEqual( target.Alternators.Count,4)
+ For idx = 0 To alt.Alternators(2).InputTable4000.Count - 1
+ Assert.IsTrue(alt.Alternators(2).InputTable4000(idx).IsEqual(Alt3ExpectedTable4000(idx), 3))
+ Next
-
+ For idx = 0 To alt.Alternators(2).InputTable6000.Count - 1
+ Assert.IsTrue(alt.Alternators(2).InputTable6000(idx).IsEqual(Alt3ExpectedTable6000(idx), 3))
+ Next
- End Sub
- <Test()>
- Public Sub InitialiseCombinedAlternatorMapFromDefault()
+ End Sub
+ <Test()>
+ Public Sub Alt4TableConstructTest()
+ 'Arrange
+ Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals
- 'Arrange
- Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals
+ 'Act
+ Dim alt As New CombinedAlternator(COMBINEDALT_GOODMAP)
- 'Act
- Dim target As new CombinedAlternator("123.aalt")
+ Dim idx As Integer
+ For idx = 0 To alt.Alternators(3).InputTable2000.Count - 1
+ Assert.IsTrue(alt.Alternators(3).InputTable2000(idx).IsEqual(Alt4ExpectedTable2000(idx)))
+ Next
- 'Assert
+ For idx = 0 To alt.Alternators(3).InputTable4000.Count - 1
+ Assert.IsTrue(alt.Alternators(3).InputTable4000(idx).IsEqual(Alt4ExpectedTable4000(idx), 3))
+ Next
- Assert.AreEqual( target.Alternators.Count,4)
+ For idx = 0 To alt.Alternators(3).InputTable6000.Count - 1
+ Assert.IsTrue(alt.Alternators(3).InputTable6000(idx).IsEqual(Alt4ExpectedTable6000(idx), 3))
+ Next
-
- End Sub
+ End Sub
- <Test()>
- Public Sub AveragedEfficiency( )
+ 'testCombinedAlternatorMap
+ <Test()>
+ Public Sub InitialiseCombinedAlternatorMapFromFile()
- ' Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals() With {.CrankRPM=1750, .CurrentDemandAmps=170}
+ 'Arrange
+ Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals
- Dim ca As new CombinedAlternator("abc.aalt")
- ca.Initialise()
-
+ 'Act
+ Dim target As New CombinedAlternator(COMBINEDALT_GOODMAP)
- Dim actual As AlternatorMapValues = ca.GetEfficiency(1750,170)
- Assert.AreEqual(0.56015625f,actual.Efficiency)
+ 'Assert
- End Sub
+ Assert.AreEqual(target.Alternators.Count, 4)
- '<Test()>
- Public Sub Performance()
- Dim ca As new CombinedAlternator("abc.aalt")
+ End Sub
- ca.Initialise()
-
- Dim startDT As DateTime = DateTime.Now
- Dim endDateDT As DateTime
- Dim crank As Single
- Dim demand As single
- Dim rand As New Random(50)
+ <Test()>
+ Public Sub InitialiseCombinedAlternatorMapFromDefault()
- Dim min As Single = 0.1
- Dim max As single = 0.1
+ 'Arrange
+ Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals
- For x = 1 to 500000
+ 'Act
+ Dim target As New CombinedAlternator("123.aalt")
- 'crank = rand.Next(500,3000)
- 'demand = rand.Next(1,200)
+ 'Assert
+ Assert.AreEqual(target.Alternators.Count, 2)
- crank = rand.Next(0,0)
- demand = rand.Next(0,0)
+ End Sub
- Dim actual As AlternatorMapValues = ca.GetEfficiency(crank,demand)
- If actual.Efficiency < min then min=actual.Efficiency
+ <Test()>
+ Public Sub AveragedEfficiency()
- If actual.Efficiency > max then max = actual.Efficiency
- Next
+ ' Dim signals As ICombinedAlternatorSignals = New CombinedAlternatorSignals() With {.CrankRPM=1750, .CurrentDemandAmps=170}
- endDateDT = DateTime.Now
-
- Dim secs As Single = (endDateDT-startDT).Seconds
+ Dim ca As New CombinedAlternator("abc.aalt")
+ ca.Initialise()
- End Sub
+ Dim actual As AlternatorMapValues = ca.GetEfficiency(1750, 170)
- <Test()>
- Public Sub AlternatorsAreEqual()
+ Assert.AreEqual(0.5601562F, actual.Efficiency)
- Dim ca As ICombinedAlternator= new CombinedAlternator("abc.aalt")
- Dim original as ICombinedAlternator = new CombinedAlternator("abc.aalt")
-
- Assert.IsTrue( ca.IsEqualTo( original))
+ End Sub
- End Sub
+ '<Test()>
+ Public Sub Performance()
- <Test()>
- Public Sub AlternatorsUnequalName()
+ Dim ca As New CombinedAlternator("abc.aalt")
- Dim ca As new CombinedAlternator("abc.aalt")
- Dim original As new CombinedAlternator("abc.aalt")
+ ca.Initialise()
- ca.Alternators(0).AlternatorName="ZCZZCZCZCZCXXXYYY"
-
- Assert.IsFalse(ca.IsEqualTo( original))
+ Dim startDT As DateTime = DateTime.Now
+ Dim endDateDT As DateTime
+ Dim crank As Single
+ Dim demand As Single
+ Dim rand As New Random(50)
- End Sub
+ Dim min As Single = 0.1
+ Dim max As Single = 0.1
- <Test()>
- Public Sub AlternatorsUnequalPulley()
+ For x = 1 To 500000
+ 'crank = rand.Next(500,3000)
+ 'demand = rand.Next(1,200)
- Dim ca As new CombinedAlternator("abc.aalt")
- Dim original As new CombinedAlternator("abc.aalt")
+ crank = rand.Next(0, 0)
+ demand = rand.Next(0, 0)
- ca.Alternators(0).PulleyRatio=9
-
- Assert.IsFalse(ca.IsEqualTo( original))
+ Dim actual As AlternatorMapValues = ca.GetEfficiency(crank, demand)
- End Sub
+ If actual.Efficiency < min Then min = actual.Efficiency
- '<Test()>
- ' Public Sub AlternatorsUnequalEfficiency()
+ If actual.Efficiency > max Then max = actual.Efficiency
+ Next
- ' Dim ca As new CombinedAlternator("abc.aalt")
- ' Dim original As new CombinedAlternator("abc.aalt")
+ endDateDT = DateTime.Now
- ' ca.Alternators(0).InputTable2000(1).Eff=0.99999
-
- ' 'Only tests efficiency values table row 1-3
- ' Assert.IsFalse(ca.IsEqualTo( original))
+ Dim secs As Single = (endDateDT - startDT).Seconds
- ' End Sub
+ End Sub
- <Test()>
- Public Sub AlternatorsUnequalEfficiency()
+ <Test()>
+ Public Sub AlternatorsAreEqual()
- Dim ca As new CombinedAlternator("abc.aalt")
- Dim original As new CombinedAlternator("abc.aalt")
- ca.Alternators(0).InputTable2000(1).Eff=0.99999
-
- 'Only tests efficiency values table row 1-3
- Assert.IsFalse(ca.IsEqualTo( original))
+ Dim ca As ICombinedAlternator = New CombinedAlternator("abc.aalt")
+ Dim original As ICombinedAlternator = New CombinedAlternator("abc.aalt")
- End Sub
+ Assert.IsTrue(ca.IsEqualTo(original))
+ End Sub
+ <Test()>
+ Public Sub AlternatorsUnequalName()
+ Dim ca As New CombinedAlternator("abc.aalt")
+ Dim original As New CombinedAlternator("abc.aalt")
+ ca.Alternators(0).AlternatorName = "ZCZZCZCZCZCXXXYYY"
- End Class
+ Assert.IsFalse(ca.IsEqualTo(original))
+
+ End Sub
+
+ <Test()>
+ Public Sub AlternatorsUnequalPulley()
+
+
+ Dim ca As New CombinedAlternator("abc.aalt")
+ Dim original As New CombinedAlternator("abc.aalt")
+
+ ca.Alternators(0).PulleyRatio = 9
+
+ Assert.IsFalse(ca.IsEqualTo(original))
+
+ End Sub
+
+ '<Test()>
+ ' Public Sub AlternatorsUnequalEfficiency()
+
+
+ ' Dim ca As new CombinedAlternator("abc.aalt")
+ ' Dim original As new CombinedAlternator("abc.aalt")
+
+ ' ca.Alternators(0).InputTable2000(1).Eff=0.99999
+
+ ' 'Only tests efficiency values table row 1-3
+ ' Assert.IsFalse(ca.IsEqualTo( original))
+
+ ' End Sub
+
+
+ <Test()>
+ Public Sub AlternatorsUnequalEfficiency()
+
+
+ Dim ca As New CombinedAlternator("abc.aalt")
+ Dim original As New CombinedAlternator("abc.aalt")
+
+ ca.Alternators(0).InputTable2000(1).Eff = 0.99999
+
+ 'Only tests efficiency values table row 1-3
+ Assert.IsFalse(ca.IsEqualTo(original))
+
+ End Sub
+
+
+
+
+
+
+ End Class
End Namespace
-
+
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
index 7d847c25a5cac367dc27e2dcd29468c0f9063ff8..5d7abf9dc084d9da147faa558860a926334eea27 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
@@ -5,119 +5,93 @@ Imports VectoAuxiliariesTests.Mocks
Imports VectoAuxiliaries.Electrics
Imports VectoAuxiliaries.Hvac
-
-
Namespace UnitTests
-<TestFixture()>
-Public Class M0_NonSmart_AlternatorsSetEfficiencyTests
+ <TestFixture()>
+ Public Class M0_NonSmart_AlternatorsSetEfficiencyTests
-Private Const cstrAlternatorsEfficiencyMapLocation As String = "tests\testAlternatorMap.aalt"
-Private Const cstrHVACMapLocation As String = "TestFiles\TestHvacMap.csv"
-Private Const cstrAlternatorMap As String = "TestFiles\testAlternatorMap.aalt"
+ Private Const cstrAlternatorsEfficiencyMapLocation As String = "tests\testAlternatorMap.aalt"
+ Private Const cstrHVACMapLocation As String = "TestFiles\TestHvacMap.csv"
+ Private Const cstrAlternatorMap As String = "TestFiles\testAlternatorMap.aalt"
-Private elecConsumers As IElectricalConsumerList
+ Private elecConsumers As IElectricalConsumerList
-Private alternatorMap As IAlternatorMap
-Private signals As Signals = New Signals
-Private powernetVoltage As Single = 26.3
-Private ssm As IHVACSteadyStateModel = New HVACSteadyStateModel(100,100,100)
+ Private alternatorMap As IAlternatorMap
+ Private signals As Signals = New Signals
+ Private powernetVoltage As Single = 26.3
+ Private ssm As IHVACSteadyStateModel = New HVACSteadyStateModel(100, 100, 100)
-Private Function GetSSM() As ISSMTOOL
+ Private Function GetSSM() As ISSMTOOL
-
- Const _SSMMAP As String = "TestFiles\ssm.Ahsm
- Const _BusDatabase As String ="TestFiles\BusDatabase.abdb
+ Const _SSMMAP As String = "TestFiles\ssm.Ahsm"
Dim ssm As ISSMTOOL = New SSMTOOL(_SSMMAP, New HVACConstants())
+ ssm.Load(_SSMMAP)
+ Return ssm
- ssm.Load( _SSMMAP)
-
-
- Return ssm
-
-
-End Function
-
-
-Public Sub New()
-
-
- signals.EngineSpeed=2000
-
- 'Setup consumers and HVAC ( 1 Consumer in Test Category )
- elecConsumers = CType(New ElectricalConsumerList(0.096,26.3), IElectricalConsumerList)
- elecConsumers.AddConsumer(New ElectricalConsumer(False, "TEST", "CONSUMER1", 20, 0.5, 26.3, 1,""))
-
-
- 'Alternator Map
- alternatorMap = CType(New AlternatorMap(cstrAlternatorMap), IAlternatorMap)
- alternatorMap.Initialise()
-
-
-
-End Sub
-
-<Test()>
-Public Sub CreateNewTest()
- Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, alternatorMap, powernetVoltage,signals,GetSSM())
- 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, alternatorMap, powernetVoltage,signals,GetSSM())
-End Sub
-
-
-
-
-
-
-<Test()>
-<ExpectedException("System.ArgumentException")>
-Public Sub CreateNew_MissingAlternatorMap_ThrowArgumentExceptionTest()
- Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, Nothing, powernetVoltage,signals,GetSSM())
-End Sub
+ End Function
+ Public Sub New()
+ signals.EngineSpeed = 2000
-<Test()>
-Public Sub EfficiencyValueTest()
- Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, alternatorMap, powernetVoltage,signals,GetSSM())
+ 'Setup consumers and HVAC ( 1 Consumer in Test Category )
+ elecConsumers = CType(New ElectricalConsumerList(0.096, 26.3), IElectricalConsumerList)
+ elecConsumers.AddConsumer(New ElectricalConsumer(False, "TEST", "CONSUMER1", 20, 0.5, 26.3, 1, ""))
- Dim actual As Single = target.AlternatorsEfficiency
+ 'Alternator Map
+ alternatorMap = CType(New AlternatorMap(cstrAlternatorMap), IAlternatorMap)
+ alternatorMap.Initialise()
- Dim expected As Single = 0.6720275
+ End Sub
- Assert.AreEqual(expected, actual)
+ <Test()>
+ Public Sub CreateNewTest()
+ Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, alternatorMap, powernetVoltage, signals, GetSSM())
+ 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, alternatorMap, powernetVoltage, signals, GetSSM())
+ End Sub
-End Sub
+ <Test()>
+ <ExpectedException("System.ArgumentException")>
+ Public Sub CreateNew_MissingAlternatorMap_ThrowArgumentExceptionTest()
+ Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, Nothing, powernetVoltage, signals, GetSSM())
+ End Sub
+ <Test()>
+ Public Sub EfficiencyValueTest()
+ Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, alternatorMap, powernetVoltage, signals, GetSSM())
-<Test()>
-Public Sub HVAC_PowerDemandAmpsTest()
+ Dim actual As Single = target.AlternatorsEfficiency
- Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, alternatorMap, powernetVoltage,signals,GetSSM())
+ Dim expected As Single = 0.6720275
- Dim actual As Single
- Dim expected As Single = 18.81821
+ Assert.AreEqual(expected, actual)
- actual = target.GetHVACElectricalPowerDemandAmps()
+ End Sub
- Assert.AreEqual(expected, actual)
+ <Test()>
+ Public Sub HVAC_PowerDemandAmpsTest()
+ Dim target As M0_NonSmart_AlternatorsSetEfficiency = New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, alternatorMap, powernetVoltage, signals, GetSSM())
-End Sub
+ Dim actual As Single
+ Dim expected As Single = 18.81821
+ actual = target.GetHVACElectricalPowerDemandAmps()
-End Class
+ Assert.AreEqual(expected, actual)
+ End Sub
+ End Class
End Namespace
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
index dd32a8ae6d965454afb89002df50b8a5f9c0b423..b0782531a018b095079fc9b0079fa8b207674213 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
@@ -6,700 +6,686 @@ Imports VectoAuxiliaries.Hvac
Namespace UnitTests
- <TestFixture()>
- Public Class _SSMTOOLTests
-
- 'TechBenefitsList - FilePath Constants
- Private Const GOODTechList As String = "TestFiles\testSSMTechBenefits.csv"
- Private Const GOODTechListALLON As String = "TestFiles\testSSMTechBenefitsALLON.csv"
- Private Const GOODTechListALLOFF As String = "TestFiles\testSSMTechBenefitsALLOFF.csv"
- Private Const GOODTechListEMPTYLIST As String = "TestFiles\testSSMTechBenefitsEMPTYLIST.csv"
-
- 'Helpers
- Private Function AddDefaultTechLine( source As ISSMTOOL ) As ITechListBenefitLine
-
-
- Dim src As SSMTOOL = DirectCast( source, SSMTOOL)
-
- Dim newItem As ITechListBenefitLine = New TechListBenefitLine( src.genInputs)
-
- newItem.Units = "fraction"
- newItem.Category = "Insulation"
- newItem.BenefitName= "Benefit1"
-
- newItem.LowFloorH =0.1
- newItem.LowFloorV =0.1
- newItem.LowFloorC =0.1
-
- newItem.SemiLowFloorH =0.1
- newItem.SemiLowFloorV =0.1
- newItem.SemiLowFloorC =0.1
-
- newItem.RaisedFloorH =0.1
- newItem.RaisedFloorV =0.1
- newItem.RaisedFloorC =0.1
-
- newItem.OnVehicle = true
- newItem.ActiveVH = true
- newItem.ActiveVV = true
- newItem.ActiveVC = true
- newItem.LineType = TechLineType.Normal
-
- Dim feedback As String = String.Empty
-
- Assert.istrue(src.TechList.Add( newItem, feedback))
-
- End Function
-
- 'SSMGenInputTests
- <Test()> _
- <TestCase("BusParameterisation")> _
- <TestCase("BoundaryConditions")> _
- <TestCase("EnvironmentalConditions")> _
- <TestCase("AC-System")> _
- <TestCase("Ventilation")> _
- <TestCase("AuxHeater")> _
- Public Sub InstantiateDefaultSSMGenInputsTest( section As string)
-
- Dim target As ISSMGenInputs = New SSMGenInputs(true)
-
- If section="BusParameterisation" then
-
-
-
-
- 'BUS Parameterisation
- '********************
- Assert.AreEqual(47 ,target.BP_NumberOfPassengers )
- Assert.AreEqual("raised floor" ,target.BP_BusFloorType )
- Assert.AreEqual(24.1102486R ,target.BP_BusFloorSurfaceArea,2 )
- Assert.AreEqual(114.42325R ,target.BP_BusSurfaceAreaM2 )
- Assert.AreEqual(20.98R ,Math.Round(target.BP_BusWindowSurface,2) )
- Assert.AreEqual(61.81231875R ,target.BP_BusVolume )
- Assert.AreEqual(10.655R ,target.BP_BusLength )
- Assert.AreEqual(2.55R ,target.BP_BusWidth )
-
- End If
-
- If section = "BoundaryConditions" Then
- 'BOUNDRY CONDITIONS
- '******************
- Assert.AreEqual(1.0R ,target.BC_GFactor )
- Assert.AreEqual(0.8R ,target.BC_SolarClouding )
- Assert.AreEqual(80 ,target.BC_HeatPerPassengerIntoCabinW )
- Assert.AreEqual(13 ,target.BC_PassengerBoundaryTemperature )
- Assert.AreEqual(3.0R ,target.BC_PassengerDensityLowFloor )
- Assert.AreEqual(2.0R ,target.BC_PassengerDensitySemiLowFloor )
- Assert.AreEqual(1.4R ,target.BC_PassengerDensityRaisedFloor )
- Assert.AreEqual(33.7543R ,Math.Round(target.BC_CalculatedPassengerNumber,4))
- Assert.AreEqual(3.0R ,target.BC_UValues )
- Assert.AreEqual(20 ,target.BC_HeatingBoundaryTemperature )
- Assert.AreEqual(24 ,target.BC_CoolingBoundaryTemperature )
- Assert.AreEqual(25 ,target.BC_HighVentilation )
- Assert.AreEqual(8 ,target.BC_lowVentilation )
- Assert.AreEqual(1545.30796875R ,target.BC_High )
- Assert.AreEqual(494.49855000 ,target.BC_Low )
- Assert.AreEqual(927.18478125 ,target.BC_HighVentPowerW )
- Assert.AreEqual(296.69913000R ,target.BC_LowVentPowerW )
- Assert.AreEqual(0.6R ,target.BC_SpecificVentilationPower )
- Assert.AreEqual(1 ,target.BC_AuxHeaterEfficiency )
- Assert.AreEqual(13 ,target.BC_GCVDieselOrHeatingOil )
- Assert.AreEqual(1.5R ,target.BC_WindowAreaPerUnitBusLength )
- Assert.AreEqual(5 ,target.BC_FrontRearWindowArea )
- Assert.AreEqual(4 ,target.BC_MaxTemperatureDeltaForLowFloorBusses )
- Assert.AreEqual(0.03R ,target.BC_MaxPossibleBenefitFromTechnologyList )
-
- End if
-
-
- If section="EnvironmentalConditions" Then
-
- 'Environmental Conditions
- '************************
- Assert.AreEqual( 25.00 ,target.EC_EnviromentalTemperature )
- Assert.AreEqual( 400.00 ,target.EC_Solar )
+ <TestFixture()>
+ Public Class _SSMTOOLTests
+
+ 'TechBenefitsList - FilePath Constants
+ Private Const GOODTechList As String = "TestFiles\testSSMTechBenefits.csv"
+ Private Const GOODTechListALLON As String = "TestFiles\testSSMTechBenefitsALLON.csv"
+ Private Const GOODTechListALLOFF As String = "TestFiles\testSSMTechBenefitsALLOFF.csv"
+ Private Const GOODTechListEMPTYLIST As String = "TestFiles\testSSMTechBenefitsEMPTYLIST.csv"
+
+ 'Helpers
+ Private Function AddDefaultTechLine(source As ISSMTOOL) As ITechListBenefitLine
+
+
+ Dim src As SSMTOOL = DirectCast(source, SSMTOOL)
+
+ Dim newItem As ITechListBenefitLine = New TechListBenefitLine(src.genInputs)
+
+ newItem.Units = "fraction"
+ newItem.Category = "Insulation"
+ newItem.BenefitName = "Benefit1"
+
+ newItem.LowFloorH = 0.1
+ newItem.LowFloorV = 0.1
+ newItem.LowFloorC = 0.1
+
+ newItem.SemiLowFloorH = 0.1
+ newItem.SemiLowFloorV = 0.1
+ newItem.SemiLowFloorC = 0.1
+
+ newItem.RaisedFloorH = 0.1
+ newItem.RaisedFloorV = 0.1
+ newItem.RaisedFloorC = 0.1
+
+ newItem.OnVehicle = True
+ newItem.ActiveVH = True
+ newItem.ActiveVV = True
+ newItem.ActiveVC = True
+ newItem.LineType = TechLineType.Normal
+
+ Dim feedback As String = String.Empty
+
+ Assert.istrue(src.TechList.Add(newItem, feedback))
+
+ End Function
+
+ 'SSMGenInputTests
+ <Test()> _
+ <TestCase("BusParameterisation")> _
+ <TestCase("BoundaryConditions")> _
+ <TestCase("EnvironmentalConditions")> _
+ <TestCase("AC-System")> _
+ <TestCase("Ventilation")> _
+ <TestCase("AuxHeater")> _
+ Public Sub InstantiateDefaultSSMGenInputsTest(section As String)
+
+ Dim target As ISSMGenInputs = New SSMGenInputs(True)
+
+ If section = "BusParameterisation" Then
+ 'BUS Parameterisation
+ '********************
+ Assert.AreEqual(47, target.BP_NumberOfPassengers)
+ Assert.AreEqual("raised floor", target.BP_BusFloorType)
+ Assert.AreEqual(24.1102486R, target.BP_BusFloorSurfaceArea, 2)
+ Assert.AreEqual(114.42325R, target.BP_BusSurfaceAreaM2)
+ Assert.AreEqual(20.98R, Math.Round(target.BP_BusWindowSurface, 2))
+ Assert.AreEqual(61.81231875D, Math.Round(target.BP_BusVolume, 8))
+ Assert.AreEqual(10.655R, target.BP_BusLength)
+ Assert.AreEqual(2.55R, target.BP_BusWidth)
+ End If
+
+ If section = "BoundaryConditions" Then
+ 'BOUNDRY CONDITIONS
+ '******************
+ Assert.AreEqual(0.95R, target.BC_GFactor)
+ Assert.AreEqual(0.8R, target.BC_SolarClouding)
+ Assert.AreEqual(80, target.BC_HeatPerPassengerIntoCabinW)
+ Assert.AreEqual(12, target.BC_PassengerBoundaryTemperature)
+ Assert.AreEqual(3.0R, target.BC_PassengerDensityLowFloor)
+ Assert.AreEqual(2.2R, target.BC_PassengerDensitySemiLowFloor)
+ Assert.AreEqual(1.4R, target.BC_PassengerDensityRaisedFloor)
+ Assert.AreEqual(34.0R, Math.Round(target.BC_CalculatedPassengerNumber, 4))
+ Assert.AreEqual(3.0R, target.BC_UValues)
+ Assert.AreEqual(18, target.BC_HeatingBoundaryTemperature)
+ Assert.AreEqual(23, target.BC_CoolingBoundaryTemperature)
+ Assert.AreEqual(20, target.BC_HighVentilation)
+ Assert.AreEqual(7, target.BC_lowVentilation)
+ Assert.AreEqual(1236.25, Math.Round(target.BC_High, 2))
+ Assert.AreEqual(432.69, Math.Round(target.BC_Low, 2))
+ Assert.AreEqual(692.3, Math.Round(target.BC_HighVentPowerW, 2))
+ Assert.AreEqual(242.3, Math.Round(target.BC_LowVentPowerW, 2))
+ Assert.AreEqual(0.56R, target.BC_SpecificVentilationPower)
+ Assert.AreEqual(0.84, target.BC_AuxHeaterEfficiency)
+ Assert.AreEqual(11.8, target.BC_GCVDieselOrHeatingOil)
+ Assert.AreEqual(1.5R, target.BC_WindowAreaPerUnitBusLength)
+ Assert.AreEqual(5, target.BC_FrontRearWindowArea)
+ Assert.AreEqual(3, target.BC_MaxTemperatureDeltaForLowFloorBusses)
+ Assert.AreEqual(0.5R, target.BC_MaxPossibleBenefitFromTechnologyList)
+ End If
- End If
- If section="AC-System" Then
+ If section = "EnvironmentalConditions" Then
+ 'Environmental Conditions
+ '************************
+ Assert.AreEqual(25.0, target.EC_EnviromentalTemperature)
+ Assert.AreEqual(400.0, target.EC_Solar)
- 'AC-SYSTEM
- '*********
- Assert.AreEqual( "mechanical" , target.AC_CompressorType )
- Assert.AreEqual( 18 , target.AC_CompressorCapacitykW )
- Assert.AreEqual(4, target.AC_COP)
- End If
+ End If
- If section = "Ventilation" Then
+ If section = "AC-System" Then
+ 'AC-SYSTEM
+ '*********
+ Assert.AreEqual("2-stage", target.AC_CompressorType)
+ Assert.AreEqual(18, target.AC_CompressorCapacitykW)
+ Assert.AreEqual(3.5, target.AC_COP)
+ End If
- 'VENTILATION
- '***********
- Assert.Areequal(True ,target.VEN_VentilationOnDuringHeating )
- Assert.Areequal(True ,target.VEN_VentilationWhenBothHeatingAndACInactive )
- Assert.Areequal(True ,target.VEN_VentilationDuringAC )
- Assert.Areequal("high" ,target.VEN_VentilationFlowSettingWhenHeatingAndACInactive )
- Assert.Areequal("high" ,target.VEN_VentilationDuringHeating )
- Assert.Areequal("low" ,target.VEN_VentilationDuringCooling )
+ If section = "Ventilation" Then
+ 'VENTILATION
+ '***********
+ Assert.Areequal(True, target.VEN_VentilationOnDuringHeating)
+ Assert.Areequal(True, target.VEN_VentilationWhenBothHeatingAndACInactive)
+ Assert.Areequal(True, target.VEN_VentilationDuringAC)
+ Assert.Areequal("high", target.VEN_VentilationFlowSettingWhenHeatingAndACInactive)
+ Assert.Areequal("high", target.VEN_VentilationDuringHeating)
+ Assert.AreEqual("high", target.VEN_VentilationDuringCooling)
+ End If
+ If section = "AuxHeater" Then
+ 'AUX HEATER
+ '**********
+ Assert.AreEqual(0, target.AH_EngineWasteHeatkW)
+ Assert.AreEqual(30, target.AH_FuelFiredHeaterkW)
+ End If
+ End Sub
- End If
+ 'Basic TechListTests
+ <Test()>
+ Public Sub Instantiate_TechListTest()
- If section="AuxHeater" then
- 'AUX HEATER
- '**********
- Assert.AreEqual( 2.0 ,target.AH_EngineWasteHeatkW )
- Assert.AreEqual(10.0 ,target.AH_FuelFiredHeaterkW )
- End If
+ Dim gen As ISSMGenInputs = New SSMGenInputs(True)
- End Sub
-
- 'Basic TechListTests
- <Test()>
-Public Sub Instantiate_TechListTest()
+ Dim target As ISSMTechList = New SSMTechList(GOODTechList, gen)
- Dim gen As ISSMGenInputs = New SSMGenInputs(true)
+ Assert.IsTrue(target.Initialise())
- Dim target As ISSMTechList = New SSMTechList( GOODTechList , gen)
-
- Assert.IsTrue( target.Initialise())
+ End Sub
+ <Test()>
+ Public Sub Instantiate_TechListTestALLON()
-End Sub
- <Test()>
-Public Sub Instantiate_TechListTestALLON()
+ Dim gen As ISSMGenInputs = New SSMGenInputs(True)
+ Dim target As ISSMTechList = New SSMTechList(GOODTechListALLON, gen)
- Dim gen As ISSMGenInputs = New SSMGenInputs(true)
+ Dim v As Double = target.CValueVariation
- Dim target As ISSMTechList = New SSMTechList( GOODTechListALLON , gen)
- Dim v As Double = target.CValueVariation
+ Assert.IsTrue(target.Initialise())
+ Assert.AreEqual(0.142, Math.Round(target.HValueVariation, 3))
+ Assert.AreEqual(0.006, Math.Round(target.VHValueVariation, 3))
+ Assert.AreEqual(0.006, Math.Round(target.VVValueVariation, 3))
+ Assert.AreEqual(0.006, Math.Round(target.VCValueVariation, 3))
+ Assert.AreEqual(0.259, Math.Round(target.CValueVariation, 3))
+ Assert.AreEqual(0.0, Math.Round(target.VHValueVariationKW, 3))
+ Assert.AreEqual(0.0, Math.Round(target.VVValueVariationKW, 3))
+ Assert.AreEqual(0.0, Math.Round(target.VCValueVariationKW, 3))
+ Assert.AreEqual(0.0, Math.Round(target.VCValueVariationKW, 3))
+ Assert.AreEqual(-0.2, Math.Round(target.CValueVariationKW, 3))
- Assert.IsTrue(target.Initialise())
- Assert.AreEqual(0.142 ,Math.Round(target.HValueVariation,3))
- Assert.AreEqual(0.006 ,Math.Round(target.VHValueVariation,3))
- Assert.AreEqual(0.006 ,Math.Round(target.VVValueVariation,3))
- Assert.AreEqual(0.006 ,Math.Round(target.VCValueVariation,3))
- Assert.AreEqual(0.259 ,Math.Round(target.CValueVariation,3))
- Assert.AreEqual(0.000 ,Math.Round(target.VHValueVariationKW,3))
- Assert.AreEqual(0.000 ,Math.Round(target.VVValueVariationKW,3))
- Assert.AreEqual(0.000 ,Math.Round(target.VCValueVariationKW,3))
- Assert.AreEqual(0.000 ,Math.Round(target.VCValueVariationKW,3))
- Assert.AreEqual(-0.200 ,Math.Round(target.CValueVariationKW,3))
+ End Sub
+ 'List Management Methods
+ <Test()>
+ Public Sub Instantiate_TechListTestEMPTYList()
-End Sub
-
- 'List Management Methods
- <Test()>
- Public Sub Instantiate_TechListTestEMPTYList()
+ Dim gen As ISSMGenInputs = New SSMGenInputs(True)
- Dim gen As ISSMGenInputs = New SSMGenInputs(true)
+ Dim target As ISSMTechList = New SSMTechList(GOODTechListEMPTYLIST, gen)
- Dim target As ISSMTechList = New SSMTechList( GOODTechListEMPTYLIST , gen)
+ Assert.IsTrue(target.Initialise())
- Assert.IsTrue(target.Initialise())
+ Assert.IsTrue(target.TechLines.Count = 0)
- Assert.IsTrue( target.TechLines.Count=0)
+ End Sub
+ <Test()>
+ Public Sub Instantiate_TechListTestEMPTYListADD1()
- End Sub
- <Test()>
- Public Sub Instantiate_TechListTestEMPTYListADD1()
+ Dim gen As ISSMGenInputs = New SSMGenInputs(True)
- Dim gen As ISSMGenInputs = New SSMGenInputs(true)
+ Dim target As ISSMTechList = New SSMTechList(GOODTechListEMPTYLIST, gen)
- Dim target As ISSMTechList = New SSMTechList( GOODTechListEMPTYLIST , gen)
+ Dim newItem As ITechListBenefitLine = New TechListBenefitLine(gen)
- Dim newItem As ITechListBenefitLine = New TechListBenefitLine( gen)
-
- newItem.Units = "fraction"
- newItem.Category = "Insulation"
- newItem.BenefitName= "Benefit1"
+ newItem.Units = "fraction"
+ newItem.Category = "Insulation"
+ newItem.BenefitName = "Benefit1"
- newItem.LowFloorH =0.1
- newItem.LowFloorV =0.1
- newItem.LowFloorC =0.1
-
- newItem.SemiLowFloorH =0.1
- newItem.SemiLowFloorV =0.1
- newItem.SemiLowFloorC =0.1
-
- newItem.RaisedFloorH =0.1
- newItem.RaisedFloorV =0.1
- newItem.RaisedFloorC =0.1
+ newItem.LowFloorH = 0.1
+ newItem.LowFloorV = 0.1
+ newItem.LowFloorC = 0.1
- newItem.OnVehicle = true
- newItem.ActiveVH = true
- newItem.ActiveVV = true
- newItem.ActiveVC = true
- newItem.LineType = TechLineType.Normal
+ newItem.SemiLowFloorH = 0.1
+ newItem.SemiLowFloorV = 0.1
+ newItem.SemiLowFloorC = 0.1
- Dim feedback As String = String.Empty
+ newItem.RaisedFloorH = 0.1
+ newItem.RaisedFloorV = 0.1
+ newItem.RaisedFloorC = 0.1
- Assert.istrue(target.Add( newItem, feedback))
+ newItem.OnVehicle = True
+ newItem.ActiveVH = True
+ newItem.ActiveVV = True
+ newItem.ActiveVC = True
+ newItem.LineType = TechLineType.Normal
+ Dim feedback As String = String.Empty
- Assert.IsTrue( target.TechLines.Count=1)
+ Assert.istrue(target.Add(newItem, feedback))
- End Sub
- <Test()>
- Public Sub Instantiate_TechListTestEMPTYListADD1Duplicate()
+ Assert.IsTrue(target.TechLines.Count = 1)
- Dim gen As ISSMGenInputs = New SSMGenInputs(true)
+ End Sub
+ <Test()>
+ Public Sub Instantiate_TechListTestEMPTYListADD1Duplicate()
- Dim target As ISSMTechList = New SSMTechList( GOODTechListEMPTYLIST , gen)
- Dim newItem As ITechListBenefitLine = New TechListBenefitLine( gen)
-
- newItem.Units = "fraction"
- newItem.Category = "Insulation"
- newItem.BenefitName= "Benefit1"
+ Dim gen As ISSMGenInputs = New SSMGenInputs(True)
- newItem.LowFloorH =0.1
- newItem.LowFloorV =0.1
- newItem.LowFloorC =0.1
-
- newItem.SemiLowFloorH =0.1
- newItem.SemiLowFloorV =0.1
- newItem.SemiLowFloorC =0.1
-
- newItem.RaisedFloorH =0.1
- newItem.RaisedFloorV =0.1
- newItem.RaisedFloorC =0.1
+ Dim target As ISSMTechList = New SSMTechList(GOODTechListEMPTYLIST, gen)
- newItem.OnVehicle = true
- newItem.ActiveVH = true
- newItem.ActiveVV = true
- newItem.ActiveVC = true
- newItem.LineType = TechLineType.Normal
+ Dim newItem As ITechListBenefitLine = New TechListBenefitLine(gen)
- Dim feedback As String = String.Empty
+ newItem.Units = "fraction"
+ newItem.Category = "Insulation"
+ newItem.BenefitName = "Benefit1"
- Assert.istrue(target.Add( newItem, feedback))
- Assert.isFalse(target.Add( newItem, feedback))
+ newItem.LowFloorH = 0.1
+ newItem.LowFloorV = 0.1
+ newItem.LowFloorC = 0.1
- Assert.IsTrue( target.TechLines.Count=1)
+ newItem.SemiLowFloorH = 0.1
+ newItem.SemiLowFloorV = 0.1
+ newItem.SemiLowFloorC = 0.1
+ newItem.RaisedFloorH = 0.1
+ newItem.RaisedFloorV = 0.1
+ newItem.RaisedFloorC = 0.1
- End Sub
- <Test()>
- Public Sub Instantiate_TechListTestEMPTYListADD1AndClear()
+ newItem.OnVehicle = True
+ newItem.ActiveVH = True
+ newItem.ActiveVV = True
+ newItem.ActiveVC = True
+ newItem.LineType = TechLineType.Normal
+ Dim feedback As String = String.Empty
- Dim gen As ISSMGenInputs = New SSMGenInputs(true)
+ Assert.istrue(target.Add(newItem, feedback))
+ Assert.isFalse(target.Add(newItem, feedback))
- Dim target As ISSMTechList = New SSMTechList( GOODTechListEMPTYLIST , gen)
+ Assert.IsTrue(target.TechLines.Count = 1)
- Dim newItem As ITechListBenefitLine = New TechListBenefitLine( gen)
-
- newItem.Units = "fraction"
- newItem.Category = "Insulation"
- newItem.BenefitName= "Benefit1"
- newItem.LowFloorH =0.1
- newItem.LowFloorV =0.1
- newItem.LowFloorC =0.1
-
- newItem.SemiLowFloorH =0.1
- newItem.SemiLowFloorV =0.1
- newItem.SemiLowFloorC =0.1
-
- newItem.RaisedFloorH =0.1
- newItem.RaisedFloorV =0.1
- newItem.RaisedFloorC =0.1
+ End Sub
+ <Test()>
+ Public Sub Instantiate_TechListTestEMPTYListADD1AndClear()
- newItem.OnVehicle = true
- newItem.ActiveVH = true
- newItem.ActiveVV = true
- newItem.ActiveVC = true
- newItem.LineType = TechLineType.Normal
- Dim feedback As String = String.Empty
+ Dim gen As ISSMGenInputs = New SSMGenInputs(True)
- Assert.IsTrue(target.Add(newItem, feedback))
- Assert.IsTrue( target.TechLines.Count=1)
- target.Clear()
- Assert.IsTrue( target.TechLines.Count=0)
+ Dim target As ISSMTechList = New SSMTechList(GOODTechListEMPTYLIST, gen)
+ Dim newItem As ITechListBenefitLine = New TechListBenefitLine(gen)
- End Sub
- <Test()>
- Public Sub Instantiate_TechListTestEMPTYListADD1AndModify()
+ newItem.Units = "fraction"
+ newItem.Category = "Insulation"
+ newItem.BenefitName = "Benefit1"
+ newItem.LowFloorH = 0.1
+ newItem.LowFloorV = 0.1
+ newItem.LowFloorC = 0.1
- Dim gen As ISSMGenInputs = New SSMGenInputs(true)
+ newItem.SemiLowFloorH = 0.1
+ newItem.SemiLowFloorV = 0.1
+ newItem.SemiLowFloorC = 0.1
- Dim target As ISSMTechList = New SSMTechList( GOODTechListEMPTYLIST , gen)
+ newItem.RaisedFloorH = 0.1
+ newItem.RaisedFloorV = 0.1
+ newItem.RaisedFloorC = 0.1
- Dim newItem As ITechListBenefitLine = New TechListBenefitLine( gen)
-
- newItem.Units = "fraction"
- newItem.Category = "Insulation"
- newItem.BenefitName= "Benefit1"
+ newItem.OnVehicle = True
+ newItem.ActiveVH = True
+ newItem.ActiveVV = True
+ newItem.ActiveVC = True
+ newItem.LineType = TechLineType.Normal
- newItem.LowFloorH =0.1
- newItem.LowFloorV =0.1
- newItem.LowFloorC =0.1
-
- newItem.SemiLowFloorH =0.1
- newItem.SemiLowFloorV =0.1
- newItem.SemiLowFloorC =0.1
-
- newItem.RaisedFloorH =0.1
- newItem.RaisedFloorV =0.1
- newItem.RaisedFloorC =0.1
-
- newItem.OnVehicle = true
- newItem.ActiveVH = true
- newItem.ActiveVV = true
- newItem.ActiveVC = true
- newItem.LineType = TechLineType.Normal
+ Dim feedback As String = String.Empty
- Dim feedback As String = String.Empty
+ Assert.IsTrue(target.Add(newItem, feedback))
+ Assert.IsTrue(target.TechLines.Count = 1)
+ target.Clear()
+ Assert.IsTrue(target.TechLines.Count = 0)
- 'Add
- Assert.IsTrue(target.Add(newItem, feedback))
- 'Modify
- newItem.LowFloorC=.99
- Assert.IsTrue( target.TechLines(0).IsEqualTo(newItem))
+ End Sub
+ <Test()>
+ Public Sub Instantiate_TechListTestEMPTYListADD1AndModify()
+ Dim gen As ISSMGenInputs = New SSMGenInputs(True)
- End Sub
- <Test()>
- Public Sub Instantiate_TechListTestEMPTYListADD1andDeleteIt()
+ Dim target As ISSMTechList = New SSMTechList(GOODTechListEMPTYLIST, gen)
+ Dim newItem As ITechListBenefitLine = New TechListBenefitLine(gen)
- Dim gen As ISSMGenInputs = New SSMGenInputs(true)
+ newItem.Units = "fraction"
+ newItem.Category = "Insulation"
+ newItem.BenefitName = "Benefit1"
- Dim target As ISSMTechList = New SSMTechList( GOODTechListEMPTYLIST , gen)
+ newItem.LowFloorH = 0.1
+ newItem.LowFloorV = 0.1
+ newItem.LowFloorC = 0.1
- Dim newItem As ITechListBenefitLine = New TechListBenefitLine( gen)
-
- newItem.Units = "fraction"
- newItem.Category = "Insulation"
- newItem.BenefitName= "Benefit1"
+ newItem.SemiLowFloorH = 0.1
+ newItem.SemiLowFloorV = 0.1
+ newItem.SemiLowFloorC = 0.1
- newItem.LowFloorH =0.1
- newItem.LowFloorV =0.1
- newItem.LowFloorC =0.1
-
- newItem.SemiLowFloorH =0.1
- newItem.SemiLowFloorV =0.1
- newItem.SemiLowFloorC =0.1
-
- newItem.RaisedFloorH =0.1
- newItem.RaisedFloorV =0.1
- newItem.RaisedFloorC =0.1
-
- newItem.OnVehicle = true
- newItem.ActiveVH = true
- newItem.ActiveVV = true
- newItem.ActiveVC = true
- newItem.LineType = TechLineType.Normal
+ newItem.RaisedFloorH = 0.1
+ newItem.RaisedFloorV = 0.1
+ newItem.RaisedFloorC = 0.1
- Dim feedback As String = String.Empty
+ newItem.OnVehicle = True
+ newItem.ActiveVH = True
+ newItem.ActiveVV = True
+ newItem.ActiveVC = True
+ newItem.LineType = TechLineType.Normal
- Assert.IsTrue( target.Add( newItem , feedback))
- Assert.IsTrue( target.TechLines.Count=1)
- Assert.IsTrue( target.Delete( newItem,feedback))
- Assert.IsTrue( target.TechLines.Count=0)
+ Dim feedback As String = String.Empty
+ 'Add
+ Assert.IsTrue(target.Add(newItem, feedback))
- End Sub
- <Test()>
- Public Sub Instantiate_TechListTestEMPTYListandDeleteNonExistantItem()
+ 'Modify
+ newItem.LowFloorC = 0.99
+ Assert.IsTrue(target.TechLines(0).IsEqualTo(newItem))
- Dim gen As ISSMGenInputs = New SSMGenInputs(true)
- Dim target As ISSMTechList = New SSMTechList( GOODTechListEMPTYLIST , gen)
-
- Dim newItem As ITechListBenefitLine = New TechListBenefitLine( gen)
-
- newItem.Units = "fraction"
- newItem.Category = "Insulation"
- newItem.BenefitName= "Benefit1"
-
- newItem.LowFloorH =0.1
- newItem.LowFloorV =0.1
- newItem.LowFloorC =0.1
-
- newItem.SemiLowFloorH =0.1
- newItem.SemiLowFloorV =0.1
- newItem.SemiLowFloorC =0.1
-
- newItem.RaisedFloorH =0.1
- newItem.RaisedFloorV =0.1
- newItem.RaisedFloorC =0.1
-
- newItem.OnVehicle = true
- newItem.ActiveVH = true
- newItem.ActiveVV = true
- newItem.ActiveVC = true
- newItem.LineType = TechLineType.Normal
-
- Dim feedback As String = String.Empty
-
- Assert.IsFalse( target.Delete( newItem,feedback))
-
- End Sub
-
- 'TechListLineTests
- <Test()>
- Public Sub Instantiate_NewTechListLine()
-
- Dim gen As ISSMGenInputs = New SSMGenInputs(true)
-
- Dim ttl As ITechListBenefitLine = New TechListBenefitLine( gen)
+ End Sub
+ <Test()>
+ Public Sub Instantiate_TechListTestEMPTYListADD1andDeleteIt()
- Assert.IsNotNull( ttl )
+ Dim gen As ISSMGenInputs = New SSMGenInputs(True)
- End Sub
- <Test()>
- Public Sub TechBenefitLineCompareAsEqual()
-
- Dim gen As ISSMGenInputs = New SSMGenInputs(true)
+ Dim target As ISSMTechList = New SSMTechList(GOODTechListEMPTYLIST, gen)
- Dim ttl1 As ITechListBenefitLine = New TechListBenefitLine( gen)
- Dim ttl2 As ITechListBenefitLine = New TechListBenefitLine( gen)
-
- Assert.IsTrue( ttl1.IsEqualTo(ttl2) )
-
-
- End Sub
- <Test()> _
- <TestCase("Category" )> _
- <TestCase("BenefitName" )> _
- <TestCase("ActiveVC" )> _
- <TestCase("ActiveVH" )> _
- <TestCase("ActiveVV" )> _
- <TestCase("LineType" )> _
- <TestCase("LowFloorC" )> _
- <TestCase("LowFloorV" )> _
- <TestCase("LowFloorH" )> _
- <TestCase("SemiLowFloorC" )> _
- <TestCase("SemiLowFloorH" )> _
- <TestCase("SemiLowFloorV" )> _
- <TestCase("RaisedFloorC" )> _
- <TestCase("RaisedFloorH" )> _
- <TestCase("RaisedFloorV" )> _
- <TestCase("Units" )> _
- <TestCase("OnVehicle" )> _
- Public Sub TechBenefitLineCompareAsUnequal( prop As string)
+ Dim newItem As ITechListBenefitLine = New TechListBenefitLine(gen)
- Dim gen As ISSMGenInputs = New SSMGenInputs(true)
+ newItem.Units = "fraction"
+ newItem.Category = "Insulation"
+ newItem.BenefitName = "Benefit1"
- Dim ttl1 As ITechListBenefitLine = New TechListBenefitLine( gen)
- Dim ttl2 As ITechListBenefitLine = New TechListBenefitLine( gen)
+ newItem.LowFloorH = 0.1
+ newItem.LowFloorV = 0.1
+ newItem.LowFloorC = 0.1
- Select Case prop
+ newItem.SemiLowFloorH = 0.1
+ newItem.SemiLowFloorV = 0.1
+ newItem.SemiLowFloorC = 0.1
+ newItem.RaisedFloorH = 0.1
+ newItem.RaisedFloorV = 0.1
+ newItem.RaisedFloorC = 0.1
- Case "Category"
- ttl2.Category="NOT"
- Case "BenefitName"
- ttl2.BenefitName="NOT"
- Case "ActiveVC"
- ttl2.ActiveVC=True
- Case "ActiveVH"
- ttl2.ActiveVH=True
- Case "ActiveVV"
- ttl2.ActiveVV=True
- Case "LineType"
- ttl2.LineType = TechLineType.HVCActiveSelection
- Case "LowFloorC"
- ttl2.LowFloorC=1
- Case "LowFloorV"
- ttl2.LowFloorV=1
- Case "LowFloorH"
- ttl2.LowFloorH=1
- Case "SemiLowFloorC"
- ttl2.SemiLowFloorC=1
- Case "SemiLowFloorH"
- ttl2.SemiLowFloorH=1
- Case "SemiLowFloorV"
- ttl2.SemiLowFloorH=1
- Case "RaisedFloorC"
- ttl2.RaisedFloorC=1
- Case "RaisedFloorH"
- ttl2.RaisedFloorH=1
- Case "RaisedFloorV"
- ttl2.RaisedFloorV=1
- Case "Units"
- ttl2.Units ="NONE"
- Case "OnVehicle"
- ttl2.OnVehicle =True
+ newItem.OnVehicle = True
+ newItem.ActiveVH = True
+ newItem.ActiveVV = True
+ newItem.ActiveVC = True
+ newItem.LineType = TechLineType.Normal
- End Select
+ Dim feedback As String = String.Empty
-
- Assert.IsFalse(ttl1.IsEqualTo(ttl2) )
+ Assert.IsTrue(target.Add(newItem, feedback))
+ Assert.IsTrue(target.TechLines.Count = 1)
+ Assert.IsTrue(target.Delete(newItem, feedback))
+ Assert.IsTrue(target.TechLines.Count = 0)
- End Sub
+ End Sub
+ <Test()>
+ Public Sub Instantiate_TechListTestEMPTYListandDeleteNonExistantItem()
- 'SSMTOOL Persistance
- <Test()>
- Public Sub SaveAndRetreiveTest()
- const filePath as string = "SSMTOOLTestSaveRetreive.json"
+ Dim gen As ISSMGenInputs = New SSMGenInputs(True)
- Dim target As SSMTOOL = New SSMTOOL(filePath, New HVACConstants(), True)
+ Dim target As ISSMTechList = New SSMTechList(GOODTechListEMPTYLIST, gen)
- target.Save(filePath)
+ Dim newItem As ITechListBenefitLine = New TechListBenefitLine(gen)
- 'change something
- target.genInputs.BP_BusLength=202.202
+ newItem.Units = "fraction"
+ newItem.Category = "Insulation"
+ newItem.BenefitName = "Benefit1"
- Assert.AreEqual( target.genInputs.BP_BusLength,202.202)
-
- 'Retreive
- target.Load( filePath )
-
- Assert.AreEqual( target.genInputs.BP_BusLength,10.655)
-
-
- End Sub
-
- 'GenInputs Comparison
- <Test()>
- Public Sub SSMTOOL_COMPARISON_GENINPUTS_EQUAL()
-
- const filePath as string = "SSMTOOLTestSaveRetreive.json"
+ newItem.LowFloorH = 0.1
+ newItem.LowFloorV = 0.1
+ newItem.LowFloorC = 0.1
+
+ newItem.SemiLowFloorH = 0.1
+ newItem.SemiLowFloorV = 0.1
+ newItem.SemiLowFloorC = 0.1
+
+ newItem.RaisedFloorH = 0.1
+ newItem.RaisedFloorV = 0.1
+ newItem.RaisedFloorC = 0.1
+
+ newItem.OnVehicle = True
+ newItem.ActiveVH = True
+ newItem.ActiveVV = True
+ newItem.ActiveVC = True
+ newItem.LineType = TechLineType.Normal
+
+ Dim feedback As String = String.Empty
+
+ Assert.IsFalse(target.Delete(newItem, feedback))
+
+ End Sub
+
+ 'TechListLineTests
+ <Test()>
+ Public Sub Instantiate_NewTechListLine()
+
+ Dim gen As ISSMGenInputs = New SSMGenInputs(True)
+
+ Dim ttl As ITechListBenefitLine = New TechListBenefitLine(gen)
+
+ Assert.IsNotNull(ttl)
+
+
+ End Sub
+ <Test()>
+ Public Sub TechBenefitLineCompareAsEqual()
+
+ Dim gen As ISSMGenInputs = New SSMGenInputs(True)
+
+ Dim ttl1 As ITechListBenefitLine = New TechListBenefitLine(gen)
+ Dim ttl2 As ITechListBenefitLine = New TechListBenefitLine(gen)
+
+ Assert.IsTrue(ttl1.IsEqualTo(ttl2))
+
+
+ End Sub
+ <Test()> _
+ <TestCase("Category")> _
+ <TestCase("BenefitName")> _
+ <TestCase("ActiveVC")> _
+ <TestCase("ActiveVH")> _
+ <TestCase("ActiveVV")> _
+ <TestCase("LineType")> _
+ <TestCase("LowFloorC")> _
+ <TestCase("LowFloorV")> _
+ <TestCase("LowFloorH")> _
+ <TestCase("SemiLowFloorC")> _
+ <TestCase("SemiLowFloorH")> _
+ <TestCase("SemiLowFloorV")> _
+ <TestCase("RaisedFloorC")> _
+ <TestCase("RaisedFloorH")> _
+ <TestCase("RaisedFloorV")> _
+ <TestCase("Units")> _
+ <TestCase("OnVehicle")> _
+ Public Sub TechBenefitLineCompareAsUnequal(prop As String)
+
+ Dim gen As ISSMGenInputs = New SSMGenInputs(True)
+
+ Dim ttl1 As ITechListBenefitLine = New TechListBenefitLine(gen)
+ Dim ttl2 As ITechListBenefitLine = New TechListBenefitLine(gen)
+
+ Select Case prop
+
+
+ Case "Category"
+ ttl2.Category = "NOT"
+ Case "BenefitName"
+ ttl2.BenefitName = "NOT"
+ Case "ActiveVC"
+ ttl2.ActiveVC = True
+ Case "ActiveVH"
+ ttl2.ActiveVH = True
+ Case "ActiveVV"
+ ttl2.ActiveVV = True
+ Case "LineType"
+ ttl2.LineType = TechLineType.HVCActiveSelection
+ Case "LowFloorC"
+ ttl2.LowFloorC = 1
+ Case "LowFloorV"
+ ttl2.LowFloorV = 1
+ Case "LowFloorH"
+ ttl2.LowFloorH = 1
+ Case "SemiLowFloorC"
+ ttl2.SemiLowFloorC = 1
+ Case "SemiLowFloorH"
+ ttl2.SemiLowFloorH = 1
+ Case "SemiLowFloorV"
+ ttl2.SemiLowFloorH = 1
+ Case "RaisedFloorC"
+ ttl2.RaisedFloorC = 1
+ Case "RaisedFloorH"
+ ttl2.RaisedFloorH = 1
+ Case "RaisedFloorV"
+ ttl2.RaisedFloorV = 1
+ Case "Units"
+ ttl2.Units = "NONE"
+ Case "OnVehicle"
+ ttl2.OnVehicle = True
+
+ End Select
+
+
+ Assert.IsFalse(ttl1.IsEqualTo(ttl2))
+
+
+ End Sub
+
+ 'SSMTOOL Persistance
+ <Test()>
+ Public Sub SaveAndRetreiveTest()
+
+ Const filePath As String = "SSMTOOLTestSaveRetreive.json"
+
+ Dim target As SSMTOOL = New SSMTOOL(filePath, New HVACConstants(), False, True)
+
+ target.Save(filePath)
+
+ 'change something
+ target.GenInputs.BP_BusLength = 202.202
+
+ Assert.AreEqual(target.GenInputs.BP_BusLength, 202.202)
+
+ 'Retreive
+ target.Load(filePath)
+
+ Assert.AreEqual(target.GenInputs.BP_BusLength, 10.655)
+
+ End Sub
+
+ 'GenInputs Comparison
+ <Test()>
+ Public Sub SSMTOOL_COMPARISON_GENINPUTS_EQUAL()
+
+ Const filePath As String = "SSMTOOLTestSaveRetreive.json"
Dim ssmTool1 As SSMTOOL = New SSMTOOL(filePath, New HVACConstants())
Dim ssmTool2 As SSMTOOL = New SSMTOOL(filePath, New HVACConstants())
- Assert.IsTrue ( ssmTool1.IsEqualTo( ssmTool2))
+ Assert.IsTrue(ssmTool1.IsEqualTo(ssmTool2))
- End Sub
- <Test()>
- Public Sub SSMTOOL_COMPARISON_GENINPUTS_UNEQUAL()
+ End Sub
+ <Test()>
+ Public Sub SSMTOOL_COMPARISON_GENINPUTS_UNEQUAL()
- const filePath as string = "SSMTOOLTestSaveRetreive.json"
+ Const filePath As String = "SSMTOOLTestSaveRetreive.json"
Dim ssmTool1 As SSMTOOL = New SSMTOOL(filePath, New HVACConstants())
- 'Alter somthing
- ssmTool1.genInputs.BP_BusLength=11
+ 'Alter somthing
+ ssmTool1.genInputs.BP_BusLength = 11
Dim ssmTool2 As SSMTOOL = New SSMTOOL(filePath, New HVACConstants())
- Assert.IsFalse ( ssmTool1.IsEqualTo( ssmTool2))
+ Assert.IsFalse(ssmTool1.IsEqualTo(ssmTool2))
- End Sub
-
- 'TechListBenefitLine Comparison
- <Test()>
- Public Sub SSMTOOL_COMPARISON_TECHLIST_EQUAL()
+ End Sub
- const filePath as string = "SSMTOOLTestSaveRetreive.json"
+ 'TechListBenefitLine Comparison
+ <Test()>
+ Public Sub SSMTOOL_COMPARISON_TECHLIST_EQUAL()
+
+ Const filePath As String = "SSMTOOLTestSaveRetreive.json"
Dim ssmTool1 As SSMTOOL = New SSMTOOL(filePath, New HVACConstants())
Dim ssmTool2 As SSMTOOL = New SSMTOOL(filePath, New HVACConstants())
- Assert.IsTrue ( ssmTool1.IsEqualTo( ssmTool2))
+ Assert.IsTrue(ssmTool1.IsEqualTo(ssmTool2))
- End Sub
- <Test()>
- Public Sub SSMTOOL_COMPARISON_TECHLIST_EMPTYLISTS_UNEQUALCOUNT()
+ End Sub
+ <Test()>
+ Public Sub SSMTOOL_COMPARISON_TECHLIST_EMPTYLISTS_UNEQUALCOUNT()
- const filePath as string = "SSMTOOLTestSaveRetreive.json"
+ Const filePath As String = "SSMTOOLTestSaveRetreive.json"
Dim ssmTool1 As SSMTOOL = New SSMTOOL(filePath, New HVACConstants())
Dim ssmTool2 As SSMTOOL = New SSMTOOL(filePath, New HVACConstants())
- 'Change something on techlist
- AddDefaultTechLine( ssmTool1)
+ 'Change something on techlist
+ AddDefaultTechLine(ssmTool1)
- Assert.IsFalse ( ssmTool1.IsEqualTo( ssmTool2))
+ Assert.IsFalse(ssmTool1.IsEqualTo(ssmTool2))
- End Sub
- <Test()>
- Public Sub SSMTOOL_COMPARISON_TECHLIST_IDENTICAL_EQUAL()
+ End Sub
+ <Test()>
+ Public Sub SSMTOOL_COMPARISON_TECHLIST_IDENTICAL_EQUAL()
- const filePath as string = "SSMTOOLTestSaveRetreive.json"
+ Const filePath As String = "SSMTOOLTestSaveRetreive.json"
Dim ssmTool1 As SSMTOOL = New SSMTOOL(filePath, New HVACConstants())
Dim ssmTool2 As SSMTOOL = New SSMTOOL(filePath, New HVACConstants())
- 'Change something on techlist
- AddDefaultTechLine( ssmTool1)
- AddDefaultTechLine( ssmTool2)
+ 'Change something on techlist
+ AddDefaultTechLine(ssmTool1)
+ AddDefaultTechLine(ssmTool2)
- Assert.IsTrue ( ssmTool1.IsEqualTo( ssmTool2))
+ Assert.IsTrue(ssmTool1.IsEqualTo(ssmTool2))
- End Sub
- <Test()>
- Public Sub SSMTOOL_COMPARISON_TECHLIST_IDENTICAL_SINGLEKeyValueDifference()
+ End Sub
+ <Test()>
+ Public Sub SSMTOOL_COMPARISON_TECHLIST_IDENTICAL_SINGLEKeyValueDifference()
- const filePath as string = "SSMTOOLTestSaveRetreive.json"
+ Const filePath As String = "SSMTOOLTestSaveRetreive.json"
Dim ssmTool1 As SSMTOOL = New SSMTOOL(filePath, New HVACConstants())
Dim ssmTool2 As SSMTOOL = New SSMTOOL(filePath, New HVACConstants())
- 'Change something on techlist
- AddDefaultTechLine( ssmTool1)
- AddDefaultTechLine( ssmTool2)
+ 'Change something on techlist
+ AddDefaultTechLine(ssmTool1)
+ AddDefaultTechLine(ssmTool2)
- 'Make Unequal
- ssmTool2.TechList.TechLines(0).BenefitName="Doobie"
+ 'Make Unequal
+ ssmTool2.TechList.TechLines(0).BenefitName = "Doobie"
- Assert.IsFalse ( ssmTool1.IsEqualTo( ssmTool2))
+ Assert.IsFalse(ssmTool1.IsEqualTo(ssmTool2))
- End Sub
- <Test()>
- Public Sub SSMTOOL_COMPARISON_TECHLIST_IDENTICAL_SINGLEValueDifference()
+ End Sub
+ <Test()>
+ Public Sub SSMTOOL_COMPARISON_TECHLIST_IDENTICAL_SINGLEValueDifference()
- const filePath as string = "SSMTOOLTestSaveRetreive.json"
+ Const filePath As String = "SSMTOOLTestSaveRetreive.json"
Dim ssmTool1 As SSMTOOL = New SSMTOOL(filePath, New HVACConstants())
Dim ssmTool2 As SSMTOOL = New SSMTOOL(filePath, New HVACConstants())
- 'Change something on techlist
- AddDefaultTechLine( ssmTool1)
- AddDefaultTechLine( ssmTool2)
+ 'Change something on techlist
+ AddDefaultTechLine(ssmTool1)
+ AddDefaultTechLine(ssmTool2)
+
+ 'Make Unequal
+ ssmTool2.TechList.TechLines(0).ActiveVV = False
- 'Make Unequal
- ssmTool2.TechList.TechLines(0).ActiveVV=False
+ Assert.IsFalse(ssmTool1.IsEqualTo(ssmTool2))
- Assert.IsFalse ( ssmTool1.IsEqualTo( ssmTool2))
+ End Sub
- End Sub
-
- End Class
+ End Class
End Namespace