diff --git a/AuxillaryTestHarness/Dashboard.Designer.vb b/AuxillaryTestHarness/Dashboard.Designer.vb
index 4e74240c2bb28aedc80b16eab37ad2a1db6c0d4f..151d2762b88d7c0cfdbf0227d5feaf43937d7127 100644
--- a/AuxillaryTestHarness/Dashboard.Designer.vb
+++ b/AuxillaryTestHarness/Dashboard.Designer.vb
@@ -23,18 +23,18 @@ Partial Class Dashboard
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
- Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle36 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.btnForward = New System.Windows.Forms.Button()
@@ -206,6 +206,7 @@ Partial Class Dashboard
Me.DeleteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ErrorProvider = New System.Windows.Forms.ErrorProvider(Me.components)
Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
+ Me.Button2 = New System.Windows.Forms.Button()
Me.pnlMain.SuspendLayout
Me.tabMain.SuspendLayout
Me.tabGeneralConfig.SuspendLayout
@@ -373,97 +374,97 @@ Partial Class Dashboard
'
'gvResultsCardOverrun
'
- DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardOverrun.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle13
+ DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardOverrun.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle25
Me.gvResultsCardOverrun.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardOverrun.DefaultCellStyle = DataGridViewCellStyle14
+ DataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvResultsCardOverrun.DefaultCellStyle = DataGridViewCellStyle26
Me.gvResultsCardOverrun.Location = New System.Drawing.Point(590, 451)
Me.gvResultsCardOverrun.Name = "gvResultsCardOverrun"
- DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardOverrun.RowHeadersDefaultCellStyle = DataGridViewCellStyle15
+ DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardOverrun.RowHeadersDefaultCellStyle = DataGridViewCellStyle27
Me.gvResultsCardOverrun.Size = New System.Drawing.Size(246, 125)
Me.gvResultsCardOverrun.TabIndex = 18
'
'gvResultsCardTraction
'
- DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardTraction.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle16
+ DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardTraction.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle28
Me.gvResultsCardTraction.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardTraction.DefaultCellStyle = DataGridViewCellStyle17
+ DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvResultsCardTraction.DefaultCellStyle = DataGridViewCellStyle29
Me.gvResultsCardTraction.Location = New System.Drawing.Point(311, 451)
Me.gvResultsCardTraction.Name = "gvResultsCardTraction"
- DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardTraction.RowHeadersDefaultCellStyle = DataGridViewCellStyle18
+ DataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardTraction.RowHeadersDefaultCellStyle = DataGridViewCellStyle30
Me.gvResultsCardTraction.Size = New System.Drawing.Size(258, 125)
Me.gvResultsCardTraction.TabIndex = 17
'
'gvResultsCardIdle
'
- DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardIdle.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle19
+ DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle31.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardIdle.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle31
Me.gvResultsCardIdle.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardIdle.DefaultCellStyle = DataGridViewCellStyle20
+ DataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle32.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvResultsCardIdle.DefaultCellStyle = DataGridViewCellStyle32
Me.gvResultsCardIdle.Location = New System.Drawing.Point(35, 451)
Me.gvResultsCardIdle.Name = "gvResultsCardIdle"
- DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardIdle.RowHeadersDefaultCellStyle = DataGridViewCellStyle21
+ DataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle33.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardIdle.RowHeadersDefaultCellStyle = DataGridViewCellStyle33
Me.gvResultsCardIdle.Size = New System.Drawing.Size(256, 125)
Me.gvResultsCardIdle.TabIndex = 16
'
@@ -515,33 +516,33 @@ Partial Class Dashboard
'
'gvElectricalConsumables
'
- DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvElectricalConsumables.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22
+ DataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvElectricalConsumables.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle34
Me.gvElectricalConsumables.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvElectricalConsumables.DefaultCellStyle = DataGridViewCellStyle23
+ DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvElectricalConsumables.DefaultCellStyle = DataGridViewCellStyle35
Me.gvElectricalConsumables.Location = New System.Drawing.Point(33, 170)
Me.gvElectricalConsumables.Name = "gvElectricalConsumables"
- DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvElectricalConsumables.RowHeadersDefaultCellStyle = DataGridViewCellStyle24
+ DataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle36.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvElectricalConsumables.RowHeadersDefaultCellStyle = DataGridViewCellStyle36
Me.gvElectricalConsumables.Size = New System.Drawing.Size(803, 250)
Me.gvElectricalConsumables.TabIndex = 10
'
@@ -1221,6 +1222,7 @@ Partial Class Dashboard
'tabPlayground
'
Me.tabPlayground.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.tabPlayground.Controls.Add(Me.Button2)
Me.tabPlayground.Controls.Add(Me.lblM5_SmartAltSetGeneration)
Me.tabPlayground.Controls.Add(Me.Panel3)
Me.tabPlayground.Controls.Add(Me.PictureBox1)
@@ -1956,6 +1958,15 @@ Partial Class Dashboard
'Timer1
'
'
+ 'Button2
+ '
+ Me.Button2.Location = New System.Drawing.Point(603, 50)
+ Me.Button2.Name = "Button2"
+ Me.Button2.Size = New System.Drawing.Size(75, 23)
+ Me.Button2.TabIndex = 38
+ Me.Button2.Text = "Button2"
+ Me.Button2.UseVisualStyleBackColor = true
+ '
'Dashboard
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
@@ -2175,5 +2186,6 @@ End Sub
Friend WithEvents txtEngineMotoringPower As System.Windows.Forms.TextBox
Friend WithEvents txtEngineDrivelineTorque As System.Windows.Forms.TextBox
Friend WithEvents txtEngineDrivelinePower As System.Windows.Forms.TextBox
+ Friend WithEvents Button2 As System.Windows.Forms.Button
End Class
diff --git a/AuxillaryTestHarness/Dashboard.vb b/AuxillaryTestHarness/Dashboard.vb
index 39a2f2c7a67401f1507421d18e5f3322c3dee67d..333b62370dffc6bab7a75b7ab59283a74e995a44 100644
--- a/AuxillaryTestHarness/Dashboard.vb
+++ b/AuxillaryTestHarness/Dashboard.vb
@@ -966,4 +966,92 @@ Private Sub btnFinish_Click( sender As Object, e As EventArgs) Handles btnFinis
End Sub
+Private Sub Button2_Click( sender As Object, e As EventArgs) Handles Button2.Click
+
+ Dim altMap As IAlternatorMap = New AlternatorMap("testAlternatorMap.csv")
+ Dim efficiency , rpm, amp As Single
+
+ altMap.Initialise()
+
+ Dim CrankSpeed As New System.Collections.Generic.List(Of single)
+ CrankSpeed.AddRange(New single() {1500,2000,4000,6000,7000})
+ Dim amps As New List(Of single)
+ amps.AddRange(New single() {10,27,53,63,68,125,136})
+
+ 'On Boundaries
+ Console.WriteLine("On BOUNDARY TESTS")
+ Console.WriteLine("_________________")
+ Console.WriteLine("")
+ For Each rpm in CrankSpeed
+ For Each amp In amps
+ efficiency = altMap.GetEfficiency( rpm, amp).Efficiency
+ Console.WriteLine(String.Format("RPM:{0} , AMP:{1}, EFF:{2})",rpm.ToString(),amp.ToString(),efficiency.ToString()))
+ Next
+ Next
+
+ Console.WriteLine("")
+ Console.WriteLine("Four Corner Points With Interpolated other")
+ Console.WriteLine("_________________")
+ Console.WriteLine("")
+
+ rpm=1500 : amp=55
+ efficiency = altMap.GetEfficiency( rpm, amp).Efficiency
+ Console.WriteLine(String.Format("RPM:{0} , AMP:{1}, EFF:{2})",rpm.ToString(),amp.ToString(),efficiency.ToString()))
+ rpm=7000 : amp=55
+ efficiency = altMap.GetEfficiency( rpm, amp).Efficiency
+ Console.WriteLine(String.Format("RPM:{0} , AMP:{1}, EFF:{2})",rpm.ToString(),amp.ToString(),efficiency.ToString()))
+ rpm=3000 : amp=10
+ efficiency = altMap.GetEfficiency( rpm, amp).Efficiency
+ Console.WriteLine(String.Format("RPM:{0} , AMP:{1}, EFF:{2})",rpm.ToString(),amp.ToString(),efficiency.ToString()))
+ rpm=3000 : amp=136
+ efficiency = altMap.GetEfficiency( rpm, amp).Efficiency
+ Console.WriteLine(String.Format("RPM:{0} , AMP:{1}, EFF:{2})",rpm.ToString(),amp.ToString(),efficiency.ToString()))
+
+ Console.WriteLine("")
+ Console.WriteLine("Interpolated Both - four data points")
+ Console.WriteLine("_________________")
+ Console.WriteLine("")
+
+ rpm=1750 : amp=18
+ efficiency = altMap.GetEfficiency( rpm, amp).Efficiency
+ Console.WriteLine(String.Format("RPM:{0} , AMP:{1}, EFF:{2})",rpm.ToString(),amp.ToString(),efficiency.ToString()))
+ rpm=6500 : amp=18
+ efficiency = altMap.GetEfficiency( rpm, amp).Efficiency
+ Console.WriteLine(String.Format("RPM:{0} , AMP:{1}, EFF:{2})",rpm.ToString(),amp.ToString(),efficiency.ToString()))
+
+ rpm=1750 : amp=130
+ efficiency = altMap.GetEfficiency( rpm, amp).Efficiency
+ Console.WriteLine(String.Format("RPM:{0} , AMP:{1}, EFF:{2})",rpm.ToString(),amp.ToString(),efficiency.ToString()))
+ rpm=6500 : amp=130
+ efficiency = altMap.GetEfficiency( rpm, amp).Efficiency
+ Console.WriteLine(String.Format("RPM:{0} , AMP:{1}, EFF:{2})",rpm.ToString(),amp.ToString(),efficiency.ToString()))
+
+ Console.WriteLine("")
+ Console.WriteLine("Range Limiting")
+ Console.WriteLine("_________________")
+ Console.WriteLine("")
+
+ rpm=0 : amp=0
+ efficiency = altMap.GetEfficiency( rpm, amp).Efficiency
+ Console.WriteLine(String.Format("RPM:{0} , AMP:{1}, EFF:{2})",rpm.ToString(),amp.ToString(),efficiency.ToString()))
+ rpm=0 : amp=10
+ efficiency = altMap.GetEfficiency( rpm, amp).Efficiency
+ Console.WriteLine(String.Format("RPM:{0} , AMP:{1}, EFF:{2})",rpm.ToString(),amp.ToString(),efficiency.ToString()))
+ rpm=0 : amp=200
+ efficiency = altMap.GetEfficiency( rpm, amp).Efficiency
+ Console.WriteLine(String.Format("RPM:{0} , AMP:{1}, EFF:{2})",rpm.ToString(),amp.ToString(),efficiency.ToString()))
+ rpm=1500 : amp=200
+ efficiency = altMap.GetEfficiency( rpm, amp).Efficiency
+ Console.WriteLine(String.Format("RPM:{0} , AMP:{1}, EFF:{2})",rpm.ToString(),amp.ToString(),efficiency.ToString()))
+ rpm=7000 : amp=200
+ efficiency = altMap.GetEfficiency( rpm, amp).Efficiency
+ Console.WriteLine(String.Format("RPM:{0} , AMP:{1}, EFF:{2})",rpm.ToString(),amp.ToString(),efficiency.ToString()))
+ rpm=8000 : amp=200
+ efficiency = altMap.GetEfficiency( rpm, amp).Efficiency
+ Console.WriteLine(String.Format("RPM:{0} , AMP:{1}, EFF:{2})",rpm.ToString(),amp.ToString(),efficiency.ToString()))
+
+
+End Sub
+
+
End Class
\ No newline at end of file
diff --git a/AuxillaryTestHarness/testCompressorMap.csv b/AuxillaryTestHarness/testCompressorMap.csv
index cbad21704e6b3ff68a64c68e8e669ac49cdd8d08..a44deaf06b638e90ad0a4469dd13eccf969dcd79 100644
--- a/AuxillaryTestHarness/testCompressorMap.csv
+++ b/AuxillaryTestHarness/testCompressorMap.csv
@@ -1,8 +1,8 @@
-rpm,flowRate [l/min],power [on] [kW],power [off] [kW]
-1500,200,2,1
-2000,400,4,2
-3000,600,6,3
-4000,800,8,4
-5000,1000,10,5
-6000,1200,12,6
-7000,1400,14,7
\ No newline at end of file
+rpm,flowRate [l/min],power [on] [W],power [off] [W]
+1500,200,2000,1000
+2000,400,4000,2000
+3000,600,6000,3000
+4000,800,8000,4000
+5000,1000,10000,5000
+6000,1200,12000,6000
+7000,1400,14000,7000
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/AlternatorMap.vb b/VECTOAux/VectoAuxiliaries/Electrics/AlternatorMap.vb
index ec7b3d51f0db3cb7a070ebab0b6e892798c2773b..ec88a9b0397b4316c2c2e688540fbbe1c6108cef 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/AlternatorMap.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/AlternatorMap.vb
@@ -103,9 +103,19 @@ Namespace Electrics
Dim min As AlternatorMapKey = map.Keys.Min()
Dim max As AlternatorMapKey = map.Keys.Max()
- If mapKey.amps < min.amps Or mapKey.amps > max.amps Or mapKey.rpm < min.rpm Or mapKey.rpm > max.rpm Then
- Throw New ArgumentOutOfRangeException(String.Format("Extrapolation - Amp/Rpm Values should should be in the range {0} to {1}", min.ToString(), max.ToString()))
- End If
+ 'If mapKey.amps < min.amps Or mapKey.amps > max.amps Or mapKey.rpm < min.rpm Or mapKey.rpm > max.rpm Then
+ ' Throw New ArgumentOutOfRangeException(String.Format("Extrapolation - Amp/Rpm Values should should be in the range {0} to {1}", min.ToString(), max.ToString()))
+ 'End If
+
+
+ 'LIMITING
+ If mapKey.amps < min.amps then mapKey.amps=min.amps
+ If mapKey.amps > max.amps then mapKey.amps = max.amps
+ If mapKey.rpm < min.rpm then mapKey.rpm = min.rpm
+ If mapKey.rpm > max.rpm then mapKey.rpm= max.rpm
+
+
+
'Check if the rpm is in the current memo
'If supplied present key, we can just return the values
@@ -126,11 +136,58 @@ Namespace Electrics
Dim intAmpsPre As Integer
Dim intAmpsPost As Integer
+
intRpmPre = (From m In map Where m.Key.rpm <= mapKey.rpm Select m.Key.rpm).Last()
intRpmPost = (From m In map Where m.Key.rpm => mapKey.rpm Select m.Key.rpm).First()
intAmpsPre = (From m In map Where m.Key.amps <= mapKey.amps Select m.Key.amps).Last()
intAmpsPost = (From m In map Where m.Key.amps => mapKey.amps Select m.Key.amps).First()
+
+ Dim dAmps As Single
+ dim dAmpEfficiency as single
+ Dim ampsEfficiencySlope as single
+ Dim dRpm As Integer
+ Dim dRpmEfficiency as single
+ Dim rpmEfficiencySlope As Single
+ Dim interpolatedEfficiency As single
+ Dim ampPreEfficiency As Single
+ Dim ampPostEfficiency As Single
+ Dim rpmPreEfficiency As Single
+ Dim rpmPostEfficiency As Single
+
+
+ '*********** IF PRE AND POST RPM OR PRE AND POST AMPS are the same, the calculation is different. ***********
+ 'SO
+
+ 'Case RPM is the same
+ If intRpmPre = intRpmPost then
+
+ dAmps = intAmpsPost - intAmpsPre
+ ampPreEfficiency = map( New AlternatorMapKey( intAmpsPre, intRpmPre)).Efficiency
+ ampPostEfficiency = map( New AlternatorMapKey( intAmpsPost, intRpmPre)).Efficiency
+
+ interpolatedEfficiency = ampPreEfficiency + ( ( ampPostEfficiency-ampPreEfficiency ) * (( mapKey.amps - intAmpsPre ) / ( intAmpsPost-intAmpsPre )))
+
+ Return New AlternatorMapValues(interpolatedEfficiency)
+
+ End If
+
+
+ If intAmpsPre = intAmpsPost then
+
+ rpmPreEfficiency = map( New AlternatorMapKey( intAmpsPre, intRpmPre)).Efficiency
+ rpmPostEfficiency = map( New AlternatorMapKey( intAmpsPre, intRpmPost)).Efficiency
+
+ interpolatedEfficiency = rpmPreEfficiency + ( ( rpmPostEfficiency-rpmPreEfficiency ) * (( mapKey.rpm - intRpmPre ) / ( intRpmPost-intRpmPre )))
+
+ Return New AlternatorMapValues(interpolatedEfficiency)
+
+
+ End If
+
+
+
+
rpmPre = map(New AlternatorMapKey(intAmpsPre, intRpmPre))
rpmPost = map(New AlternatorMapKey(intAmpsPre, intRpmPost))
@@ -150,17 +207,18 @@ Namespace Electrics
'
'*** A-B Efficiency ( Lower Using Lower Amps )
'get the delta values for rpm and the values
- Dim dRpm As Integer = intRpmPost - intRpmPre
- Dim dRpmEfficiency As Single = rpmPost.Efficiency - rpmPre.Efficiency
+ dRpm = intRpmPost - intRpmPre
+ dRpmEfficiency = rpmPost.Efficiency - rpmPre.Efficiency
'calculate the slopes
- Dim rpmEfficiencySlope As Single = dRpmEfficiency / dRpm
+ rpmEfficiencySlope = dRpmEfficiency / dRpm
'calculate the new values
- Dim AB_Efficiency As Single = If( drpm=0,rpmPre.Efficiency, ((mapKey.rpm - intRpmPre) * rpmEfficiencySlope) + rpmPre.Efficiency)
+ 'Dim AB_Efficiency As Single = If( drpm=0,rpmPre.Efficiency, ((mapKey.rpm - intRpmPre) * rpmEfficiencySlope) + rpmPre.Efficiency)
+ Dim AB_Efficiency As Single = ((mapKey.rpm - intRpmPre) * rpmEfficiencySlope) + rpmPre.Efficiency
'*** C-D Efficiency ( Using Higher Amps )
- 'get the delta values for rpm and the values
+ 'get the delta values for rpm and the values
dRpm = intRpmPost - intRpmPre
dRpmEfficiency = ampsPost.Efficiency - ampsPre.Efficiency
@@ -168,19 +226,20 @@ Namespace Electrics
rpmEfficiencySlope = dRpmEfficiency / dRpm
'calculate the new values
- Dim CD_Efficiency As Single = If( dRpm=0, rpmPre.Efficiency, ((mapKey.rpm - intRpmPre) * rpmEfficiencySlope) + ampsPre.Efficiency)
-
+ 'Dim CD_Efficiency As Single = If( dRpm=0, rpmPre.Efficiency, ((mapKey.rpm - intRpmPre) * rpmEfficiencySlope) + ampsPre.Efficiency)
+ Dim CD_Efficiency As Single = ((mapKey.rpm - intRpmPre) * rpmEfficiencySlope) + ampsPre.Efficiency
'(C-D) - (A-B) Efficiency
'Deltas
- Dim dAmps As Single = intAmpsPost - intAmpsPre
- Dim dAmpEfficiency As Single = CD_Efficiency - AB_Efficiency
+ dAmps = intAmpsPost - intAmpsPre
+ dAmpEfficiency = CD_Efficiency - AB_Efficiency
'slopes
- Dim ampsEfficiencySlope As Single = dAmpEfficiency / dAmps
+ ampsEfficiencySlope = dAmpEfficiency / dAmps
'calculate final Values
- Dim ABCDEfficiency As Single = If( dAmps=0, CD_Efficiency, ((mapKey.amps - intAmpsPre) * ampsEfficiencySlope) + AB_Efficiency)
+ ' Dim ABCDEfficiency As Single = If( dAmps=0, CD_Efficiency, ((mapKey.amps - intAmpsPre) * ampsEfficiencySlope) + AB_Efficiency)
+ Dim ABCDEfficiency As Single = ((mapKey.amps - intAmpsPre) * ampsEfficiencySlope) + AB_Efficiency
Return New AlternatorMapValues(ABCDEfficiency)
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/M2_AverageElectricalLoadDemand.vb b/VECTOAux/VectoAuxiliaries/Electrics/M2_AverageElectricalLoadDemand.vb
index 26d0f5d85a9177e6bbc0f54467136d7c1f5eed1a..2907be683d1dfb5a5d6d2583ffde9059ede8aef8 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/M2_AverageElectricalLoadDemand.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/M2_AverageElectricalLoadDemand.vb
@@ -40,7 +40,7 @@
Public Function GetAveragePowerAtCrank() As Single Implements IM2_AverageElectricalLoadDemand.GetAveragePowerAtCrank
- Dim ElectricalPowerDemandsWatts As Single = GetAveragePowerDemandAtAlternator() * _powerNetVoltage
+ Dim ElectricalPowerDemandsWatts As Single = GetAveragePowerDemandAtAlternator()
Dim alternatorsEfficiency As Single = _module0.AlternatorsEfficiency
Dim ElectricalPowerDemandsWattsDividedByAlternatorEfficiency as Single = ElectricalPowerDemandsWatts / alternatorsEfficiency
diff --git a/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb b/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb
index ef5a3ac688f97921669aa4dda88472771ab27968..d20b7cc5ff2bfb56556c0d207936a07a337c2a84 100644
--- a/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb
+++ b/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb
@@ -82,7 +82,7 @@ Namespace Pneumatics
'** ParkBrakesBreakplus2Doors ** Park break + 2 doors
numActuationsPerCycle = _pneumaticsActuationsMap.GetNumActuations(New ActuationsKey("Park brake + 2 doors", _cycleName))
'=SUM(IF(K14="electric",0,IF(COUNTBLANK(F36),G36,F36)),PRODUCT(K16*IF(COUNTBLANK(F37),G37,F37)))
- airConsumptionPerActuationNI = If(_pneumaticUserInputsConfig.Doors = "electric", 0, _pneumaticAuxillariesConfig.PerDoorOpeningNI)
+ airConsumptionPerActuationNI = If(_pneumaticUserInputsConfig.Doors = "Electric", 0, _pneumaticAuxillariesConfig.PerDoorOpeningNI)
airConsumptionPerActuationNI += (_pneumaticAuxillariesConfig.PerStopBrakeActuationNIperKG * _vehicleMassKG)
ParkBrakesplus2Doors = numActuationsPerCycle * airConsumptionPerActuationNI
@@ -94,13 +94,15 @@ Namespace Pneumatics
'** AdBlue **
'=IF(K13="electric",0,G39*F54)- Supplied Spreadsheet
- AdBlue = If(_pneumaticUserInputsConfig.AdBlueDosing = "electric", 0, _pneumaticAuxillariesConfig.AdBlueNIperMinute * _cycleDurationMinutes)
+ AdBlue = If(_pneumaticUserInputsConfig.AdBlueDosing = "Electric", 0, _pneumaticAuxillariesConfig.AdBlueNIperMinute * _cycleDurationMinutes)
'** Regeneration **
'=SUM(R6:R9)*IF(K9="yes",IF(COUNTBLANK(F41),G41,F41),IF(COUNTBLANK(F40),G40,F40)) - Supplied SpreadSheet
Regeneration = (Breaks + ParkBrakesplus2Doors + Kneeling + AdBlue)
- Regeneration *= If(_pneumaticUserInputsConfig.SmartRegeneration, _pneumaticAuxillariesConfig.SmartRegenFractionTotalAirDemand, _
+ Dim regenFraction As Single = If(_pneumaticUserInputsConfig.SmartRegeneration, _pneumaticAuxillariesConfig.SmartRegenFractionTotalAirDemand, _
_pneumaticAuxillariesConfig.NonSmartRegenFractionTotalAirDemand)
+ Regeneration = Regeneration * regenFraction
+
'** DeadVolBlowOuts **
'=IF(COUNTBLANK(F43),G43,F43)/(F54/60) - Supplied SpreadSheet
numActuationsPerCycle = _pneumaticAuxillariesConfig.DeadVolBlowOutsPerLitresperHour / (60 / _cycleDurationMinutes)
@@ -109,7 +111,7 @@ Namespace Pneumatics
'** AirSuspension **
'=IF(K12="electrically",0,G38*F54) - Suplied Spreadsheet
- AirSuspension = If(_pneumaticUserInputsConfig.AirSuspensionControl = "electrically", 0, _pneumaticAuxillariesConfig.AirControlledSuspensionNIperMinute * _cycleDurationMinutes)
+ AirSuspension = If(_pneumaticUserInputsConfig.AirSuspensionControl = "Electrically", 0, _pneumaticAuxillariesConfig.AirControlledSuspensionNIperMinute * _cycleDurationMinutes)
'** Total Air Demand **
TotalAirDemand = Breaks + ParkBrakesplus2Doors + Kneeling + AdBlue + Regeneration + DeadVolBlowOuts + AirSuspension
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMap - Copy.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMap - Copy.csv
new file mode 100644
index 0000000000000000000000000000000000000000..cbad21704e6b3ff68a64c68e8e669ac49cdd8d08
--- /dev/null
+++ b/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMap - Copy.csv
@@ -0,0 +1,8 @@
+rpm,flowRate [l/min],power [on] [kW],power [off] [kW]
+1500,200,2,1
+2000,400,4,2
+3000,600,6,3
+4000,800,8,4
+5000,1000,10,5
+6000,1200,12,6
+7000,1400,14,7
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMap.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMap.csv
index cbad21704e6b3ff68a64c68e8e669ac49cdd8d08..a44deaf06b638e90ad0a4469dd13eccf969dcd79 100644
--- a/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMap.csv
+++ b/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMap.csv
@@ -1,8 +1,8 @@
-rpm,flowRate [l/min],power [on] [kW],power [off] [kW]
-1500,200,2,1
-2000,400,4,2
-3000,600,6,3
-4000,800,8,4
-5000,1000,10,5
-6000,1200,12,6
-7000,1400,14,7
\ No newline at end of file
+rpm,flowRate [l/min],power [on] [W],power [off] [W]
+1500,200,2000,1000
+2000,400,4000,2000
+3000,600,6000,3000
+4000,800,8000,4000
+5000,1000,10000,5000
+6000,1200,12000,6000
+7000,1400,14000,7000
\ No newline at end of file
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
index 21f8751641637d3144cbcab17cc6e2ecc2e3569d..455e7d6396de519bf7fd031c213e74595a99c70a 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
@@ -13,181 +13,55 @@ Namespace UnitTests
Private Const _IVALIDEFFICIENCYMAP As String = "TestFiles\testAlternatorMapWithInvalidEfficiency.csv"
Private Const _INVALIDPOWERMAP As String = "TestFiles\testAlternatorMapWithInvalidPower.csv"
- <Test()>
- Public Sub CreateNewAlternatorMapInstanceTest()
- Dim path As String = "test"
- Dim target As AlternatorMap = New AlternatorMap(path)
-
- Assert.IsNotNull(target)
- End Sub
-
- <Test()>
- Public Sub InitialiseTest()
- Dim target As AlternatorMap = GetMap()
- Dim actual As Boolean = target.Initialise()
- Assert.IsTrue(actual)
- End Sub
-
- <Test(), ExpectedException("System.ArgumentException")>
- Public Sub InitialiseNoFileSuppliedThrowsExceptionTest()
- Dim path As String = ""
- Dim target As AlternatorMap = New AlternatorMap(path)
- target.Initialise()
- End Sub
-
- <Test(), ExpectedException("System.ArgumentException")>
- Public Sub InitialiseWrongNumberOfColumnsThrowsExceptionTest()
- Dim path As String = "C:\DEV\VECTO\VectoAuxiliaries\VectoAuxiliariesTests\TestFiles\testAlternatorMapWrongNoOfColumns.csv"
- Dim target As AlternatorMap = New AlternatorMap(path)
- target.Initialise()
- End Sub
-
- <Test(), ExpectedException("System.ArgumentException")>
- Public Sub InitialiseInsufficientRowsThrowsExceptionTest()
- Dim path As String = "C:\DEV\VECTO\VectoAuxiliaries\VectoAuxiliariesTests\TestFiles\testAlternatorMapNotEnoughRows.csv"
- Dim target As AlternatorMap = New AlternatorMap(path)
- target.Initialise()
- End Sub
-
-
- <Test(), ExpectedException("System.InvalidCastException")>
- Public Sub InitialiseInvalidRpmThrowsExceptionTest()
- Dim path As String = _INVALIDRPMMAP
- Dim target As AlternatorMap = New AlternatorMap(path)
- target.Initialise()
- End Sub
-
- <Test(), ExpectedException("System.InvalidCastException")>
- Public Sub InitialiseInvalidAmpsThrowsExceptionTest()
- Dim path As String = _INVALIDAMPSMAP
- Dim target As AlternatorMap = New AlternatorMap(path)
- target.Initialise()
- End Sub
-
- <Test(), ExpectedException("System.InvalidCastException")>
- Public Sub InitialiseInvalidEfficiencyThrowsExceptionTest()
- Dim path As String = _IVALIDEFFICIENCYMAP
- Dim target As AlternatorMap = New AlternatorMap(path)
- target.Initialise()
- End Sub
-
- <TestCase(2300, 15)> _
- Public Sub GetEfficiencyInterpolationTest(ByVal rpm As Integer, ByVal amps As Integer)
-
- Dim target As AlternatorMap = GetInitialisedMap()
- Dim expected As Single = 0.6444162
- Dim value As Single = target.GetEfficiency(rpm, amps).Efficiency
- Assert.AreEqual(expected, value)
- Assert.AreEqual(expected, value)
-
- End Sub
-
-
- <TestCase(0, 0)> _
- <TestCase(0, 1500)> _
- <TestCase(10, 0)> _
- <TestCase(136, 8000)> _
- <TestCase(200, 7000)> _
- <ExpectedException("System.ArgumentOutOfRangeException")> _
- Public Sub GetEfficiencyRpmOutOfRangeThrowsExceptionTest(ByVal amps As Integer, ByVal rpm As Integer)
-
- Dim target As AlternatorMap = GetInitialisedMap()
- Dim value As AlternatorMapValues = target.GetEfficiency(rpm, amps)
-
- End Sub
-
-
- <TestCase(10, 3000)> _
- Public Sub GetEfficiencySingleBoundary10_3000(ByVal amps As Integer, ByVal rpm As Integer)
-
- Dim target As AlternatorMap = GetInitialisedMap()
- Dim actual As Single = target.GetEfficiency(rpm, amps).Efficiency
- Dim expected As Single = 0.63
- Assert.AreEqual(expected, actual)
-
- End Sub
-
- <TestCase(10, 7000)> _
- Public Sub GetEfficiencySingleBoundary10_7000(ByVal amps As Integer, ByVal rpm As Integer)
-
- Dim target As AlternatorMap = GetInitialisedMap()
- Dim actual As Single = target.GetEfficiency(rpm, amps).Efficiency
- Dim expected As Single = 0.475
- Assert.AreEqual(expected, actual)
-
- End Sub
-
-
- <TestCase(136, 1500)> _
- Public Sub GetEfficiencySingleBoundary136_1500(ByVal amps As Integer, ByVal rpm As Integer)
-
- Dim target As AlternatorMap = GetInitialisedMap()
- Dim actual As Single = target.GetEfficiency(rpm, amps).Efficiency
- Dim expected As Single = 0
- Assert.AreEqual(expected, actual)
-
- End Sub
-
- <TestCase(136, 3000)> _
- Public Sub GetEfficiencySingleBoundary136_3000(ByVal amps As Integer, ByVal rpm As Integer)
-
- Dim target As AlternatorMap = GetInitialisedMap()
- Dim actual As Single = target.GetEfficiency(rpm, amps).Efficiency
- Dim expected As Single = 0.3347
- Assert.AreEqual(expected, actual)
-
- End Sub
-
- <TestCase(136, 7000)> _
- Public Sub GetEfficiencySingleBoundary136_7000(ByVal amps As Integer, ByVal rpm As Integer)
-
- Dim target As AlternatorMap = GetInitialisedMap()
- Dim actual As Single = target.GetEfficiency(rpm, amps).Efficiency
- Dim expected As Single = 0.5953
- Assert.AreEqual(expected, actual)
-
- End Sub
+<Test()>
+<TestCase(10,1500,0.6150f)> _
+<TestCase(10,4000,0.6400f)> _
+<TestCase(10,7000,0.4750f)> _
+<TestCase(63,1500,0.0000f)> _
+<TestCase(63,4000,0.7400f)> _
+<TestCase(63,7000,0.6580f)> _
+<TestCase(136,1500,0.0000f)> _
+<TestCase(136,4000,0.6694f)> _
+<TestCase(136,7000,0.5953f)> _
+Public Sub BoundryTests(ByVal amps as integer, ByVal rpm as integer, ByVal expected as single)
- <TestCase(10, 1500)> _
- Public Sub GetEfficiencyOnLowerBoundary(ByVal amps As Integer, ByVal rpm As Integer)
+ Dim map As IAlternatorMap = GetInitialisedMap()
+ Dim target As IAlternatorMap = GetInitialisedMap( )
+ Dim actual As Single = map.GetEfficiency( rpm,amps).Efficiency
+ Assert.AreEqual(expected, actual)
- Dim target As AlternatorMap = GetInitialisedMap()
- Dim actual As Single = target.GetEfficiency(rpm, amps).Efficiency
- Dim expected As Single = 0.615
- Assert.AreEqual(expected, actual)
+End Sub
- End Sub
- <TestCase(27, 2000)> _
- Public Sub GetEfficiencyOnInterimBoundary(ByVal amps As Integer, ByVal rpm As Integer)
- Dim target As AlternatorMap = GetInitialisedMap()
- Dim actual As Single = target.GetEfficiency(rpm, amps).Efficiency
- Dim expected As Single = 0.7
+<TestCase(55,1500,0.15576f)> _
+<TestCase(55,7000,0.6304f)> _
+<TestCase(10,3000,0.63f)> _
+<TestCase(136,3000,0.3347f)> _
+Public sub FourCornerWithInterpolatedOtherTest(ByVal amps as integer, ByVal rpm as integer, ByVal expected as single)
- Assert.AreEqual(expected, actual)
+ Dim map As IAlternatorMap = GetInitialisedMap()
+ Dim target As IAlternatorMap = GetInitialisedMap( )
- End Sub
- <TestCase(136, 7000)> _
- Public Sub GetEfficiencyTopBoundry136_7000(ByVal amps As Integer, ByVal rpm As Integer)
+ Dim actual As Single = map.GetEfficiency( rpm,amps).Efficiency
- Dim target As AlternatorMap = GetInitialisedMap()
- Dim actual As Single = target.GetEfficiency(rpm, amps).Efficiency
- Dim expected As Single = 0.5953
+ Assert.AreEqual(expected, actual)
+End Sub
- Assert.AreEqual(expected, actual)
+<TestCase(18,1750,0.656323552f)> _
+<TestCase(18,6500,0.5280294f)> _
+<TestCase(130,1750,0.0f)> _
+<TestCase(130,6500,0.6150136f)> _
+Public sub InterpolatedCornersBothMidPreviousTest(ByVal amps as integer, ByVal rpm as integer, ByVal expected as single)
- End Sub
+ Dim map As IAlternatorMap = GetInitialisedMap()
+ Dim target As IAlternatorMap = GetInitialisedMap( )
+ Dim actual As Single = map.GetEfficiency( rpm,amps).Efficiency
- <TestCase(15, 1500)> _
- Public Sub GetEfficiency15_1500(ByVal amps As Integer, ByVal rpm As Integer)
+ Assert.AreEqual(expected, actual)
- Dim target As AlternatorMap = GetInitialisedMap()
- Dim actual As Single = target.GetEfficiency(rpm, amps).Efficiency
- Dim expected As Single = 0.615
+End Sub
- Assert.AreEqual(expected, actual)
- End Sub
#Region "Helpers"
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
index 051db971f728f1b00562beff84ec59dd6278c5b2..fabd004ac20e1ada68ff3aa007f51b98332dfd0b 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
@@ -27,12 +27,6 @@ Namespace UnitTests
Private _defaultInputConfig As IPneumaticUserInputsConfig
-
-
-
-
-
-
'Constructors
Public Sub New()
@@ -48,9 +42,9 @@ Namespace UnitTests
_defaultInputConfig.SmartRegeneration = True
_defaultInputConfig.RetarderBrake = True
_defaultInputConfig.KneelingHeightMillimeters = 80
- _defaultInputConfig.AirSuspensionControl = "electrically"
- _defaultInputConfig.AdBlueDosing = "pneumatic"
- _defaultInputConfig.Doors = "pneumatic"
+ _defaultInputConfig.AirSuspensionControl = "Electrically"
+ _defaultInputConfig.AdBlueDosing = "Pneumatic"
+ _defaultInputConfig.Doors = "Pneumatic"
_defaultInputConfig.SmartAirCompression = True
@@ -61,9 +55,9 @@ Namespace UnitTests
Public Sub CreateNewtest()
Dim psUserInputsConfig = CType(New PneumaticUserInputsConfig(), IPneumaticUserInputsConfig)
- psUserInputsConfig.AirSuspensionControl = "mechanically"
- psUserInputsConfig.Doors = "pneumatic"
- psUserInputsConfig.AdBlueDosing = "pneumatic"
+ psUserInputsConfig.AirSuspensionControl = "Mechanically"
+ psUserInputsConfig.Doors = "Pneumatic"
+ psUserInputsConfig.AdBlueDosing = "Pneumatic"
Dim psAuxConfig = CType(New PneumaticsAuxilliariesConfig(True), IPneumaticsAuxilliariesConfig)
@@ -113,7 +107,7 @@ Namespace UnitTests
Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _cycleDurationMinutes)
- Dim expected As Single = 0.0319030322
+ Dim expected As Single = 31.9030322
Dim actual As Single = target.GetAveragePowerDemandAtCrankFromPneumatics()
Assert.AreEqual(expected, actual)
@@ -136,7 +130,7 @@ Namespace UnitTests
Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _cycleDurationMinutes)
- Dim expected As Single = 0.025780227
+ Dim expected As Single = 25.78023
Dim actual As Single = target.GetAveragePowerDemandAtCrankFromPneumatics()
Assert.AreEqual(expected, actual)
@@ -270,11 +264,11 @@ Namespace UnitTests
psCompressorMap.Initialise()
- _defaultInputConfig.AdBlueDosing = "electric"
+ _defaultInputConfig.AdBlueDosing = "Electric"
Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _cycleDurationMinutes)
- Dim expected As Single = 6712.46
+ Dim expected As Single = 7490.96
Dim actual As Single = Math.Round(target.TotalAirConsumedPerCycle(), 2)
@@ -282,7 +276,7 @@ Namespace UnitTests
End Sub
- 'Doors = "electric"
+ 'Doors = "Electric"
<Test()>
Public Sub AverageLoadValueUsingDefaultAuxValues_TotalRequiredAirDeliveryRate_Doors_electric_Test()
@@ -294,7 +288,7 @@ Namespace UnitTests
psCompressorMap.Initialise()
- _defaultInputConfig.Doors = "electric"
+ _defaultInputConfig.Doors = "Electric"
Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _cycleDurationMinutes)
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
index 6f55124ff15e6301890683cb656ee568be985ae8..5ab0069d5325034dd7df22025b343afa787fe1a4 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
@@ -122,7 +122,7 @@ Namespace UnitTests
<Test()>
Public Sub GetPowerCompressorOnKeyPassedTest()
Dim target As CompressorMap = GetInitialiseMap()
- Dim expected As Single = 4
+ Dim expected As Single = 4000
Dim value As Single = target.GetPowerCompressorOn(2000)
Assert.AreEqual(expected, value)
End Sub
@@ -130,7 +130,7 @@ Namespace UnitTests
<Test()>
Public Sub GetPowerCompressorOnInterpolaitionTest()
Dim target As CompressorMap = GetInitialiseMap()
- Dim expected As Single = 5
+ Dim expected As Single = 5000
Dim value As Single = target.GetPowerCompressorOn(2500)
Assert.AreEqual(expected, value)
End Sub
@@ -147,7 +147,7 @@ Namespace UnitTests
<Test()>
Public Sub GetPowerCompressorOffKeyPassedTest()
Dim target As CompressorMap = GetInitialiseMap()
- Dim expected As Single = 2
+ Dim expected As Single = 2000
Dim value As Single = target.GetPowerCompressorOff(2000)
Assert.AreEqual(expected, value)
End Sub
@@ -155,7 +155,7 @@ Namespace UnitTests
<Test()>
Public Sub GetPowerCompressorOffInterpolaitionTest()
Dim target As CompressorMap = GetInitialiseMap()
- Dim expected As Single = 2.5
+ Dim expected As Single = 2500
Dim value As Single = target.GetPowerCompressorOff(2500)
Assert.AreEqual(expected, value)
End Sub
@@ -177,7 +177,7 @@ Namespace UnitTests
Dim expected As Single
Dim actual As Single
- expected = 0.01
+ expected = 10
actual = target.AveragePowerDemandPerCompressorUnitFlowRate
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
index 389dcdba4a202812c422453d463fc2eb6b4f12c3..d09d9b6991c732e3e7891df0301e779470c2a003 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
@@ -76,7 +76,7 @@ End Sub
Public Sub AlternatorsEfficiencyIdle2000rpmTest()
Initialise()
- Dim expected As Single = 0.7
+ Dim expected As Single = 0.5769231
Dim actual As Single = target.AlternatorsEfficiencyIdleResultCard()
Assert.AreEqual(expected, actual)
@@ -89,7 +89,7 @@ End Sub
Public Sub AlternatorsEfficiencyTraction2000rpmTest()
Initialise()
- Dim expected As Single = 0.7
+ Dim expected As Single = 0.5769231
Dim actual As Single = target.AlternatorsEfficiencyTractionOnResultCard()
Assert.AreEqual(expected, actual)
@@ -101,7 +101,7 @@ End Sub
Public Sub AlternatorsEfficiencyOverrun2000rpmTest()
Initialise()
- Dim expected As Single = 0.7
+ Dim expected As Single = 0.5769231
Dim actual As Single = target.AlternatorsEfficiencyOverrunResultCard()
Assert.AreEqual(expected, actual)
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
index 27d7ad0dda2575c5df882927dccbfba58bf8421e..7b7bd682ed78d2db1f47332e0535bfc9616a61d1 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
@@ -89,7 +89,7 @@ Public Sub EfficiencyValueTest()
Dim actual As Single = target.AlternatorsEfficiency
- Dim expected As Single = 0.62
+ Dim expected As Single = 0.6388235
Assert.AreEqual(expected, actual)
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
index 7ba984963f68267ba550482d630e52212eedfd76..cb2da531c58ed5b63494cba1f2c279e25eb8bdff 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
@@ -74,7 +74,7 @@ Public Sub AveragePowerDemandAtCrankFromHVACElectricsWattsTest()
Dim target As IM1_AverageHVACLoadDemand = GETM1Instance()
- Dim expected As Single = 142.857147
+ Dim expected As Single = 194.029846
dim actual as Single = target.AveragePowerDemandAtCrankFromHVACElectricsWatts
Assert.AreEqual( expected , actual)
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
index 8ab935aeb0de0f775396356f853206124b02d956..5feb1fd4972d4a01da1a05551c5ee8bed8ab51fb 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
@@ -54,7 +54,7 @@ Namespace UnitTests
Public Sub GetAveragePowerAtAlternatorTest()
- Dim expected As Single =35.634
+ Dim expected As Single =937.1157
Dim target As M2_AverageElectricalLoadDemand = GetAverageElectricalDemandInstance()
Dim actual As Single = target.GetAveragePowerDemandAtAlternator()
Assert.AreEqual(expected,actual)
@@ -64,7 +64,7 @@ Namespace UnitTests
<Test()>
Public Sub GetAveragePowerAtCrankTest()
Dim target As M2_AverageElectricalLoadDemand = GetAverageElectricalDemandInstance()
- Dim expected As Single = 1673.52527
+ Dim expected As Single = 2272.85522
Dim actual As Single = target.GetAveragePowerAtCrank()
Assert.AreEqual(expected, actual)
End Sub
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
index 61096f5764cea997c3c46be8c2b399e2dc3d0d56..3bdf78ffe9f4bd639ca81ac92c1d927f0e4f34d2 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
@@ -65,7 +65,7 @@ Public Sub PowerAtCrankIdleWatts()
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05,_powerNetVoltage,_altGearPullyEfficiency)
- Dim expected As Single =1642.96362
+ Dim expected As Single =1993.34644
Dim actual As Single = _target.AlternatorsGenerationPowerAtCrankIdleWatts()
Assert.AreEqual( expected, actual)
@@ -77,7 +77,7 @@ Public Sub PowerAtCrankTractionWatts()
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05,_powerNetVoltage,_altGearPullyEfficiency)
- Dim expected As Single =1642.96362
+ Dim expected As Single =1993.34644
Dim actual As Single = _target.AlternatorsGenerationPowerAtCrankTractionOnWatts()
Assert.AreEqual( expected, actual)
@@ -89,7 +89,7 @@ Public Sub PowerAtCrankOverrunWatts()
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05,_powerNetVoltage,_altGearPullyEfficiency)
- Dim expected As Single =1642.96362
+ Dim expected As Single =1993.34644
Dim actual As Single = _target.AlternatorsGenerationPowerAtCrankOverrunWatts()
diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
index 742dabec8dba3e9e0364bb0f265e6e362b09fd15..f2f55be120e8aee8ce52ccb205b8040d466cdf1f 100644
--- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
+++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
@@ -220,6 +220,9 @@
<Content Include="TestFiles\testPneumaticActuationsMap_GOODMAP - Copy.csv">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="TestFiles\testCompressorMap - Copy.csv">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\VectoAuxiliaries\VectoAuxiliaries.vbproj">