diff --git a/AuxillaryTestHarness/Dashboard.Designer.vb b/AuxillaryTestHarness/Dashboard.Designer.vb
index 54bd4a016cd867e9b978b5bf8bcae71eea9a1a40..2c9add1bda6f45c3fe3cbc37c8ccff4961731acc 100644
--- a/AuxillaryTestHarness/Dashboard.Designer.vb
+++ b/AuxillaryTestHarness/Dashboard.Designer.vb
@@ -127,6 +127,18 @@ Partial Class Dashboard
Me.txtHVACElectricalLoadPowerWatts = New System.Windows.Forms.TextBox()
Me.lblHVACElectricalLoadPowerWatts = New System.Windows.Forms.Label()
Me.tabPlayground = New System.Windows.Forms.TabPage()
+ Me.mblM11_Title = New System.Windows.Forms.Label()
+ Me.pnlM11 = New System.Windows.Forms.Panel()
+ Me.lblM11_TotalCycleFuelConsumptionZeroElectricalLoad = New System.Windows.Forms.Label()
+ Me.txtM11_out_TotalCycleFuelConsumptionZeroElectricalLoad = New System.Windows.Forms.TextBox()
+ Me.lblM11_TotalCycleFuelConsumptionSmartElectricalLoad = New System.Windows.Forms.Label()
+ Me.txtM11_out_TotalCycleFuelConsumptionSmartElectricalLoad = New System.Windows.Forms.TextBox()
+ Me.lblM11_TotalCycleElectricalDemand = New System.Windows.Forms.Label()
+ Me.txtM11_out_TotalCycleElectricalDemand = New System.Windows.Forms.TextBox()
+ Me.lblM11_SmartElectricalTotalCycleElectricalEnergyGenerated = New System.Windows.Forms.Label()
+ Me.lblM11_TotalCycleElectricalEnergyGenOverrunOnly = New System.Windows.Forms.Label()
+ Me.txtM11_out_SmartElectricalTotalCycleElectricalEnergyGenerated = New System.Windows.Forms.TextBox()
+ Me.txtM11_out_TotalCycleElectricalEnergyGenOverrunOnly = New System.Windows.Forms.TextBox()
Me.chkSignalsSmartAirCompression = New System.Windows.Forms.CheckBox()
Me.chkSignalsSmartElectrics = New System.Windows.Forms.CheckBox()
Me.pnlM10 = New System.Windows.Forms.Panel()
@@ -265,18 +277,6 @@ 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.mblM11_Title = New System.Windows.Forms.Label()
- Me.pnlM11 = New System.Windows.Forms.Panel()
- Me.lblM11_TotalCycleElectricalDemand = New System.Windows.Forms.Label()
- Me.txtM11_out_TotalCycleElectricalDemand = New System.Windows.Forms.TextBox()
- Me.lblM11_SmartElectricalTotalCycleElectricalEnergyGenerated = New System.Windows.Forms.Label()
- Me.lblM11_TotalCycleElectricalEnergyGenOverrunOnly = New System.Windows.Forms.Label()
- Me.txtM11_out_SmartElectricalTotalCycleElectricalEnergyGenerated = New System.Windows.Forms.TextBox()
- Me.txtM11_out_TotalCycleElectricalEnergyGenOverrunOnly = New System.Windows.Forms.TextBox()
- Me.lblM11_TotalCycleFuelConsumptionZeroElectricalLoad = New System.Windows.Forms.Label()
- Me.txtM11_out_TotalCycleFuelConsumptionZeroElectricalLoad = New System.Windows.Forms.TextBox()
- Me.lblM11_TotalCycleFuelConsumptionSmartElectricalLoad = New System.Windows.Forms.Label()
- Me.txtM11_out_TotalCycleFuelConsumptionSmartElectricalLoad = New System.Windows.Forms.TextBox()
Me.pnlMain.SuspendLayout
Me.tabMain.SuspendLayout
Me.tabGeneralConfig.SuspendLayout
@@ -290,6 +290,7 @@ Partial Class Dashboard
Me.pnlPneumaticAuxillaries.SuspendLayout
Me.tabHVACConfig.SuspendLayout
Me.tabPlayground.SuspendLayout
+ Me.pnlM11.SuspendLayout
Me.pnlM10.SuspendLayout
Me.pnlM9.SuspendLayout
Me.pnlM8.SuspendLayout
@@ -305,7 +306,6 @@ Partial Class Dashboard
Me.pnl_M0_Displays.SuspendLayout
Me.resultCardContextMenu.SuspendLayout
CType(Me.ErrorProvider,System.ComponentModel.ISupportInitialize).BeginInit
- Me.pnlM11.SuspendLayout
Me.SuspendLayout
'
'pnlMain
@@ -355,7 +355,7 @@ Partial Class Dashboard
Me.tabGeneralConfig.Location = New System.Drawing.Point(4, 22)
Me.tabGeneralConfig.Name = "tabGeneralConfig"
Me.tabGeneralConfig.Padding = New System.Windows.Forms.Padding(3)
- Me.tabGeneralConfig.Size = New System.Drawing.Size(1158, 704)
+ Me.tabGeneralConfig.Size = New System.Drawing.Size(1470, 704)
Me.tabGeneralConfig.TabIndex = 0
Me.tabGeneralConfig.Text = "GeneralConfig"
Me.tabGeneralConfig.UseVisualStyleBackColor = true
@@ -442,7 +442,7 @@ Partial Class Dashboard
Me.tabElectricalConfig.Location = New System.Drawing.Point(4, 22)
Me.tabElectricalConfig.Name = "tabElectricalConfig"
Me.tabElectricalConfig.Padding = New System.Windows.Forms.Padding(3)
- Me.tabElectricalConfig.Size = New System.Drawing.Size(1158, 704)
+ Me.tabElectricalConfig.Size = New System.Drawing.Size(1470, 704)
Me.tabElectricalConfig.TabIndex = 1
Me.tabElectricalConfig.Text = "ElectricalConfig"
Me.tabElectricalConfig.UseVisualStyleBackColor = true
@@ -700,7 +700,7 @@ Partial Class Dashboard
Me.tabPneumaticConfig.Controls.Add(Me.pnlPneumaticAuxillaries)
Me.tabPneumaticConfig.Location = New System.Drawing.Point(4, 22)
Me.tabPneumaticConfig.Name = "tabPneumaticConfig"
- Me.tabPneumaticConfig.Size = New System.Drawing.Size(1158, 704)
+ Me.tabPneumaticConfig.Size = New System.Drawing.Size(1470, 704)
Me.tabPneumaticConfig.TabIndex = 2
Me.tabPneumaticConfig.Text = "PneumaticConfig"
Me.tabPneumaticConfig.UseVisualStyleBackColor = true
@@ -1219,7 +1219,7 @@ Partial Class Dashboard
Me.tabHVACConfig.Controls.Add(Me.lblHVACElectricalLoadPowerWatts)
Me.tabHVACConfig.Location = New System.Drawing.Point(4, 22)
Me.tabHVACConfig.Name = "tabHVACConfig"
- Me.tabHVACConfig.Size = New System.Drawing.Size(1158, 704)
+ Me.tabHVACConfig.Size = New System.Drawing.Size(1470, 704)
Me.tabHVACConfig.TabIndex = 3
Me.tabHVACConfig.Text = "HVACConfig"
Me.tabHVACConfig.UseVisualStyleBackColor = true
@@ -1339,6 +1339,121 @@ Partial Class Dashboard
Me.tabPlayground.Text = "Playground"
Me.tabPlayground.UseVisualStyleBackColor = true
'
+ 'mblM11_Title
+ '
+ Me.mblM11_Title.AutoSize = true
+ Me.mblM11_Title.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ Me.mblM11_Title.ForeColor = System.Drawing.SystemColors.Highlight
+ Me.mblM11_Title.Location = New System.Drawing.Point(1152, 6)
+ Me.mblM11_Title.MaximumSize = New System.Drawing.Size(270, 0)
+ Me.mblM11_Title.Name = "mblM11_Title"
+ Me.mblM11_Title.Size = New System.Drawing.Size(259, 26)
+ Me.mblM11_Title.TabIndex = 55
+ Me.mblM11_Title.Text = "M11 Electrical Energy FC Call for Smart and Non Smart Pneumatics over the cycle"
+ '
+ 'pnlM11
+ '
+ Me.pnlM11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.pnlM11.Controls.Add(Me.lblM11_TotalCycleFuelConsumptionZeroElectricalLoad)
+ Me.pnlM11.Controls.Add(Me.txtM11_out_TotalCycleFuelConsumptionZeroElectricalLoad)
+ Me.pnlM11.Controls.Add(Me.lblM11_TotalCycleFuelConsumptionSmartElectricalLoad)
+ Me.pnlM11.Controls.Add(Me.txtM11_out_TotalCycleFuelConsumptionSmartElectricalLoad)
+ Me.pnlM11.Controls.Add(Me.lblM11_TotalCycleElectricalDemand)
+ Me.pnlM11.Controls.Add(Me.txtM11_out_TotalCycleElectricalDemand)
+ Me.pnlM11.Controls.Add(Me.lblM11_SmartElectricalTotalCycleElectricalEnergyGenerated)
+ Me.pnlM11.Controls.Add(Me.lblM11_TotalCycleElectricalEnergyGenOverrunOnly)
+ Me.pnlM11.Controls.Add(Me.txtM11_out_SmartElectricalTotalCycleElectricalEnergyGenerated)
+ Me.pnlM11.Controls.Add(Me.txtM11_out_TotalCycleElectricalEnergyGenOverrunOnly)
+ Me.pnlM11.Location = New System.Drawing.Point(1153, 36)
+ Me.pnlM11.Name = "pnlM11"
+ Me.pnlM11.Size = New System.Drawing.Size(308, 244)
+ Me.pnlM11.TabIndex = 54
+ '
+ 'lblM11_TotalCycleFuelConsumptionZeroElectricalLoad
+ '
+ Me.lblM11_TotalCycleFuelConsumptionZeroElectricalLoad.AutoSize = true
+ Me.lblM11_TotalCycleFuelConsumptionZeroElectricalLoad.Location = New System.Drawing.Point(9, 192)
+ Me.lblM11_TotalCycleFuelConsumptionZeroElectricalLoad.Name = "lblM11_TotalCycleFuelConsumptionZeroElectricalLoad"
+ Me.lblM11_TotalCycleFuelConsumptionZeroElectricalLoad.Size = New System.Drawing.Size(251, 13)
+ Me.lblM11_TotalCycleFuelConsumptionZeroElectricalLoad.TabIndex = 10
+ Me.lblM11_TotalCycleFuelConsumptionZeroElectricalLoad.Text = "Total Cycle : Fuel Consumption Zero Electrical Load"
+ '
+ 'txtM11_out_TotalCycleFuelConsumptionZeroElectricalLoad
+ '
+ Me.txtM11_out_TotalCycleFuelConsumptionZeroElectricalLoad.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
+ Me.txtM11_out_TotalCycleFuelConsumptionZeroElectricalLoad.Location = New System.Drawing.Point(9, 208)
+ Me.txtM11_out_TotalCycleFuelConsumptionZeroElectricalLoad.Name = "txtM11_out_TotalCycleFuelConsumptionZeroElectricalLoad"
+ Me.txtM11_out_TotalCycleFuelConsumptionZeroElectricalLoad.Size = New System.Drawing.Size(100, 20)
+ Me.txtM11_out_TotalCycleFuelConsumptionZeroElectricalLoad.TabIndex = 9
+ '
+ 'lblM11_TotalCycleFuelConsumptionSmartElectricalLoad
+ '
+ Me.lblM11_TotalCycleFuelConsumptionSmartElectricalLoad.AutoSize = true
+ Me.lblM11_TotalCycleFuelConsumptionSmartElectricalLoad.Location = New System.Drawing.Point(9, 149)
+ Me.lblM11_TotalCycleFuelConsumptionSmartElectricalLoad.Name = "lblM11_TotalCycleFuelConsumptionSmartElectricalLoad"
+ Me.lblM11_TotalCycleFuelConsumptionSmartElectricalLoad.Size = New System.Drawing.Size(256, 13)
+ Me.lblM11_TotalCycleFuelConsumptionSmartElectricalLoad.TabIndex = 8
+ Me.lblM11_TotalCycleFuelConsumptionSmartElectricalLoad.Text = "Total Cycle : Fuel Consumption Smart Electrical Load"
+ '
+ 'txtM11_out_TotalCycleFuelConsumptionSmartElectricalLoad
+ '
+ Me.txtM11_out_TotalCycleFuelConsumptionSmartElectricalLoad.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
+ Me.txtM11_out_TotalCycleFuelConsumptionSmartElectricalLoad.Location = New System.Drawing.Point(9, 165)
+ Me.txtM11_out_TotalCycleFuelConsumptionSmartElectricalLoad.Name = "txtM11_out_TotalCycleFuelConsumptionSmartElectricalLoad"
+ Me.txtM11_out_TotalCycleFuelConsumptionSmartElectricalLoad.Size = New System.Drawing.Size(100, 20)
+ Me.txtM11_out_TotalCycleFuelConsumptionSmartElectricalLoad.TabIndex = 7
+ '
+ 'lblM11_TotalCycleElectricalDemand
+ '
+ Me.lblM11_TotalCycleElectricalDemand.AutoSize = true
+ Me.lblM11_TotalCycleElectricalDemand.Location = New System.Drawing.Point(6, 102)
+ Me.lblM11_TotalCycleElectricalDemand.Name = "lblM11_TotalCycleElectricalDemand"
+ Me.lblM11_TotalCycleElectricalDemand.Size = New System.Drawing.Size(149, 13)
+ Me.lblM11_TotalCycleElectricalDemand.TabIndex = 6
+ Me.lblM11_TotalCycleElectricalDemand.Text = "Total Cycle Electrical Demand"
+ '
+ 'txtM11_out_TotalCycleElectricalDemand
+ '
+ Me.txtM11_out_TotalCycleElectricalDemand.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
+ Me.txtM11_out_TotalCycleElectricalDemand.Location = New System.Drawing.Point(6, 118)
+ Me.txtM11_out_TotalCycleElectricalDemand.Name = "txtM11_out_TotalCycleElectricalDemand"
+ Me.txtM11_out_TotalCycleElectricalDemand.Size = New System.Drawing.Size(100, 20)
+ Me.txtM11_out_TotalCycleElectricalDemand.TabIndex = 4
+ '
+ 'lblM11_SmartElectricalTotalCycleElectricalEnergyGenerated
+ '
+ Me.lblM11_SmartElectricalTotalCycleElectricalEnergyGenerated.AutoSize = true
+ Me.lblM11_SmartElectricalTotalCycleElectricalEnergyGenerated.Location = New System.Drawing.Point(6, 59)
+ Me.lblM11_SmartElectricalTotalCycleElectricalEnergyGenerated.Name = "lblM11_SmartElectricalTotalCycleElectricalEnergyGenerated"
+ Me.lblM11_SmartElectricalTotalCycleElectricalEnergyGenerated.Size = New System.Drawing.Size(274, 13)
+ Me.lblM11_SmartElectricalTotalCycleElectricalEnergyGenerated.TabIndex = 3
+ Me.lblM11_SmartElectricalTotalCycleElectricalEnergyGenerated.Text = "Smart Electrical : TotalCycle Electrical Energy Generated"
+ '
+ 'lblM11_TotalCycleElectricalEnergyGenOverrunOnly
+ '
+ Me.lblM11_TotalCycleElectricalEnergyGenOverrunOnly.AutoSize = true
+ Me.lblM11_TotalCycleElectricalEnergyGenOverrunOnly.Location = New System.Drawing.Point(6, 12)
+ Me.lblM11_TotalCycleElectricalEnergyGenOverrunOnly.Name = "lblM11_TotalCycleElectricalEnergyGenOverrunOnly"
+ Me.lblM11_TotalCycleElectricalEnergyGenOverrunOnly.Size = New System.Drawing.Size(269, 13)
+ Me.lblM11_TotalCycleElectricalEnergyGenOverrunOnly.TabIndex = 2
+ Me.lblM11_TotalCycleElectricalEnergyGenOverrunOnly.Text = "Total Cycle : Electrical Energy Generated Overrun Only"
+ '
+ 'txtM11_out_SmartElectricalTotalCycleElectricalEnergyGenerated
+ '
+ Me.txtM11_out_SmartElectricalTotalCycleElectricalEnergyGenerated.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
+ Me.txtM11_out_SmartElectricalTotalCycleElectricalEnergyGenerated.Location = New System.Drawing.Point(6, 75)
+ Me.txtM11_out_SmartElectricalTotalCycleElectricalEnergyGenerated.Name = "txtM11_out_SmartElectricalTotalCycleElectricalEnergyGenerated"
+ Me.txtM11_out_SmartElectricalTotalCycleElectricalEnergyGenerated.Size = New System.Drawing.Size(100, 20)
+ Me.txtM11_out_SmartElectricalTotalCycleElectricalEnergyGenerated.TabIndex = 1
+ '
+ 'txtM11_out_TotalCycleElectricalEnergyGenOverrunOnly
+ '
+ Me.txtM11_out_TotalCycleElectricalEnergyGenOverrunOnly.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
+ Me.txtM11_out_TotalCycleElectricalEnergyGenOverrunOnly.Location = New System.Drawing.Point(6, 36)
+ Me.txtM11_out_TotalCycleElectricalEnergyGenOverrunOnly.Name = "txtM11_out_TotalCycleElectricalEnergyGenOverrunOnly"
+ Me.txtM11_out_TotalCycleElectricalEnergyGenOverrunOnly.Size = New System.Drawing.Size(100, 20)
+ Me.txtM11_out_TotalCycleElectricalEnergyGenOverrunOnly.TabIndex = 0
+ '
'chkSignalsSmartAirCompression
'
Me.chkSignalsSmartAirCompression.AutoSize = true
@@ -2623,121 +2738,6 @@ Partial Class Dashboard
'
Me.Timer1.Interval = 1000
'
- 'mblM11_Title
- '
- Me.mblM11_Title.AutoSize = true
- Me.mblM11_Title.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.mblM11_Title.ForeColor = System.Drawing.SystemColors.Highlight
- Me.mblM11_Title.Location = New System.Drawing.Point(1152, 8)
- Me.mblM11_Title.MaximumSize = New System.Drawing.Size(240, 0)
- Me.mblM11_Title.Name = "mblM11_Title"
- Me.mblM11_Title.Size = New System.Drawing.Size(234, 39)
- Me.mblM11_Title.TabIndex = 55
- Me.mblM11_Title.Text = "M11 Electrical Energy FC Call for Smart and Non Smart Pneumatics over the cycle"
- '
- 'pnlM11
- '
- Me.pnlM11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
- Me.pnlM11.Controls.Add(Me.lblM11_TotalCycleFuelConsumptionZeroElectricalLoad)
- Me.pnlM11.Controls.Add(Me.txtM11_out_TotalCycleFuelConsumptionZeroElectricalLoad)
- Me.pnlM11.Controls.Add(Me.lblM11_TotalCycleFuelConsumptionSmartElectricalLoad)
- Me.pnlM11.Controls.Add(Me.txtM11_out_TotalCycleFuelConsumptionSmartElectricalLoad)
- Me.pnlM11.Controls.Add(Me.lblM11_TotalCycleElectricalDemand)
- Me.pnlM11.Controls.Add(Me.txtM11_out_TotalCycleElectricalDemand)
- Me.pnlM11.Controls.Add(Me.lblM11_SmartElectricalTotalCycleElectricalEnergyGenerated)
- Me.pnlM11.Controls.Add(Me.lblM11_TotalCycleElectricalEnergyGenOverrunOnly)
- Me.pnlM11.Controls.Add(Me.txtM11_out_SmartElectricalTotalCycleElectricalEnergyGenerated)
- Me.pnlM11.Controls.Add(Me.txtM11_out_TotalCycleElectricalEnergyGenOverrunOnly)
- Me.pnlM11.Location = New System.Drawing.Point(1153, 51)
- Me.pnlM11.Name = "pnlM11"
- Me.pnlM11.Size = New System.Drawing.Size(308, 244)
- Me.pnlM11.TabIndex = 54
- '
- 'lblM11_TotalCycleElectricalDemand
- '
- Me.lblM11_TotalCycleElectricalDemand.AutoSize = true
- Me.lblM11_TotalCycleElectricalDemand.Location = New System.Drawing.Point(6, 102)
- Me.lblM11_TotalCycleElectricalDemand.Name = "lblM11_TotalCycleElectricalDemand"
- Me.lblM11_TotalCycleElectricalDemand.Size = New System.Drawing.Size(149, 13)
- Me.lblM11_TotalCycleElectricalDemand.TabIndex = 6
- Me.lblM11_TotalCycleElectricalDemand.Text = "Total Cycle Electrical Demand"
- '
- 'txtM11_out_TotalCycleElectricalDemand
- '
- Me.txtM11_out_TotalCycleElectricalDemand.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
- Me.txtM11_out_TotalCycleElectricalDemand.Location = New System.Drawing.Point(6, 118)
- Me.txtM11_out_TotalCycleElectricalDemand.Name = "txtM11_out_TotalCycleElectricalDemand"
- Me.txtM11_out_TotalCycleElectricalDemand.Size = New System.Drawing.Size(100, 20)
- Me.txtM11_out_TotalCycleElectricalDemand.TabIndex = 4
- '
- 'lblM11_SmartElectricalTotalCycleElectricalEnergyGenerated
- '
- Me.lblM11_SmartElectricalTotalCycleElectricalEnergyGenerated.AutoSize = true
- Me.lblM11_SmartElectricalTotalCycleElectricalEnergyGenerated.Location = New System.Drawing.Point(6, 59)
- Me.lblM11_SmartElectricalTotalCycleElectricalEnergyGenerated.Name = "lblM11_SmartElectricalTotalCycleElectricalEnergyGenerated"
- Me.lblM11_SmartElectricalTotalCycleElectricalEnergyGenerated.Size = New System.Drawing.Size(274, 13)
- Me.lblM11_SmartElectricalTotalCycleElectricalEnergyGenerated.TabIndex = 3
- Me.lblM11_SmartElectricalTotalCycleElectricalEnergyGenerated.Text = "Smart Electrical : TotalCycle Electrical Energy Generated"
- '
- 'lblM11_TotalCycleElectricalEnergyGenOverrunOnly
- '
- Me.lblM11_TotalCycleElectricalEnergyGenOverrunOnly.AutoSize = true
- Me.lblM11_TotalCycleElectricalEnergyGenOverrunOnly.Location = New System.Drawing.Point(6, 12)
- Me.lblM11_TotalCycleElectricalEnergyGenOverrunOnly.Name = "lblM11_TotalCycleElectricalEnergyGenOverrunOnly"
- Me.lblM11_TotalCycleElectricalEnergyGenOverrunOnly.Size = New System.Drawing.Size(269, 13)
- Me.lblM11_TotalCycleElectricalEnergyGenOverrunOnly.TabIndex = 2
- Me.lblM11_TotalCycleElectricalEnergyGenOverrunOnly.Text = "Total Cycle : Electrical Energy Generated Overrun Only"
- '
- 'txtM11_out_SmartElectricalTotalCycleElectricalEnergyGenerated
- '
- Me.txtM11_out_SmartElectricalTotalCycleElectricalEnergyGenerated.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
- Me.txtM11_out_SmartElectricalTotalCycleElectricalEnergyGenerated.Location = New System.Drawing.Point(6, 75)
- Me.txtM11_out_SmartElectricalTotalCycleElectricalEnergyGenerated.Name = "txtM11_out_SmartElectricalTotalCycleElectricalEnergyGenerated"
- Me.txtM11_out_SmartElectricalTotalCycleElectricalEnergyGenerated.Size = New System.Drawing.Size(100, 20)
- Me.txtM11_out_SmartElectricalTotalCycleElectricalEnergyGenerated.TabIndex = 1
- '
- 'txtM11_out_TotalCycleElectricalEnergyGenOverrunOnly
- '
- Me.txtM11_out_TotalCycleElectricalEnergyGenOverrunOnly.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
- Me.txtM11_out_TotalCycleElectricalEnergyGenOverrunOnly.Location = New System.Drawing.Point(6, 36)
- Me.txtM11_out_TotalCycleElectricalEnergyGenOverrunOnly.Name = "txtM11_out_TotalCycleElectricalEnergyGenOverrunOnly"
- Me.txtM11_out_TotalCycleElectricalEnergyGenOverrunOnly.Size = New System.Drawing.Size(100, 20)
- Me.txtM11_out_TotalCycleElectricalEnergyGenOverrunOnly.TabIndex = 0
- '
- 'lblM11_TotalCycleFuelConsumptionZeroElectricalLoad
- '
- Me.lblM11_TotalCycleFuelConsumptionZeroElectricalLoad.AutoSize = true
- Me.lblM11_TotalCycleFuelConsumptionZeroElectricalLoad.Location = New System.Drawing.Point(9, 192)
- Me.lblM11_TotalCycleFuelConsumptionZeroElectricalLoad.Name = "lblM11_TotalCycleFuelConsumptionZeroElectricalLoad"
- Me.lblM11_TotalCycleFuelConsumptionZeroElectricalLoad.Size = New System.Drawing.Size(251, 13)
- Me.lblM11_TotalCycleFuelConsumptionZeroElectricalLoad.TabIndex = 10
- Me.lblM11_TotalCycleFuelConsumptionZeroElectricalLoad.Text = "Total Cycle : Fuel Consumption Zero Electrical Load"
- '
- 'txtM11_out_TotalCycleFuelConsumptionZeroElectricalLoad
- '
- Me.txtM11_out_TotalCycleFuelConsumptionZeroElectricalLoad.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
- Me.txtM11_out_TotalCycleFuelConsumptionZeroElectricalLoad.Location = New System.Drawing.Point(9, 208)
- Me.txtM11_out_TotalCycleFuelConsumptionZeroElectricalLoad.Name = "txtM11_out_TotalCycleFuelConsumptionZeroElectricalLoad"
- Me.txtM11_out_TotalCycleFuelConsumptionZeroElectricalLoad.Size = New System.Drawing.Size(100, 20)
- Me.txtM11_out_TotalCycleFuelConsumptionZeroElectricalLoad.TabIndex = 9
- '
- 'lblM11_TotalCycleFuelConsumptionSmartElectricalLoad
- '
- Me.lblM11_TotalCycleFuelConsumptionSmartElectricalLoad.AutoSize = true
- Me.lblM11_TotalCycleFuelConsumptionSmartElectricalLoad.Location = New System.Drawing.Point(9, 149)
- Me.lblM11_TotalCycleFuelConsumptionSmartElectricalLoad.Name = "lblM11_TotalCycleFuelConsumptionSmartElectricalLoad"
- Me.lblM11_TotalCycleFuelConsumptionSmartElectricalLoad.Size = New System.Drawing.Size(256, 13)
- Me.lblM11_TotalCycleFuelConsumptionSmartElectricalLoad.TabIndex = 8
- Me.lblM11_TotalCycleFuelConsumptionSmartElectricalLoad.Text = "Total Cycle : Fuel Consumption Smart Electrical Load"
- '
- 'txtM11_out_TotalCycleFuelConsumptionSmartElectricalLoad
- '
- Me.txtM11_out_TotalCycleFuelConsumptionSmartElectricalLoad.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0,Byte),Integer), CType(CType(192,Byte),Integer), CType(CType(0,Byte),Integer))
- Me.txtM11_out_TotalCycleFuelConsumptionSmartElectricalLoad.Location = New System.Drawing.Point(9, 165)
- Me.txtM11_out_TotalCycleFuelConsumptionSmartElectricalLoad.Name = "txtM11_out_TotalCycleFuelConsumptionSmartElectricalLoad"
- Me.txtM11_out_TotalCycleFuelConsumptionSmartElectricalLoad.Size = New System.Drawing.Size(100, 20)
- Me.txtM11_out_TotalCycleFuelConsumptionSmartElectricalLoad.TabIndex = 7
- '
'Dashboard
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
@@ -2766,6 +2766,8 @@ Partial Class Dashboard
Me.tabHVACConfig.PerformLayout
Me.tabPlayground.ResumeLayout(false)
Me.tabPlayground.PerformLayout
+ Me.pnlM11.ResumeLayout(false)
+ Me.pnlM11.PerformLayout
Me.pnlM10.ResumeLayout(false)
Me.pnlM10.PerformLayout
Me.pnlM9.ResumeLayout(false)
@@ -2793,8 +2795,6 @@ Partial Class Dashboard
Me.pnl_M0_Displays.PerformLayout
Me.resultCardContextMenu.ResumeLayout(false)
CType(Me.ErrorProvider,System.ComponentModel.ISupportInitialize).EndInit
- Me.pnlM11.ResumeLayout(false)
- Me.pnlM11.PerformLayout
Me.ResumeLayout(false)
End Sub
diff --git a/AuxillaryTestHarness/Dashboard.resx b/AuxillaryTestHarness/Dashboard.resx
index 23a257283c155ed1308413cdbffcaa5c531c7219..9591f90d7ff849922e406cb319a2f4ebe1d22d69 100644
--- a/AuxillaryTestHarness/Dashboard.resx
+++ b/AuxillaryTestHarness/Dashboard.resx
@@ -124,7 +124,7 @@
<value>168, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>50</value>
+ <value>25</value>
</metadata>
<metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>543, 19</value>
diff --git a/VECTOAux/VectoAuxiliaries/AuxillaryEnvironment.vb b/VECTOAux/VectoAuxiliaries/AuxillaryEnvironment.vb
index 61b08971e19ad1502c82b02ac640874746d7adf3..38433f5129678d716d882207ce39cee8ad956b50 100644
--- a/VECTOAux/VectoAuxiliaries/AuxillaryEnvironment.vb
+++ b/VECTOAux/VectoAuxiliaries/AuxillaryEnvironment.vb
@@ -45,6 +45,8 @@ public Property PneumaticAuxillariesConfig As IPneumaticsAuxilliariesConfig
Public M8 As IM8
Public M9 As IM9
Public M10 As IM10
+ Public M11 As IM11
+
@@ -136,6 +138,8 @@ M9 = New M9(M1,M4,M6,M8,fuelMap,PneumaticAuxillariesConfig,Signals)
M10 = New M10(M3,M9,Signals)
+M11 = New M11(M1,M3,M6,M8,fuelMap,Signals)
+
End Sub
@@ -154,6 +158,12 @@ Private Sub setDefaults()
'Here's where the magic happens.
+
+ 'Assign Smarts to signals
+ 'Signals.SmartElectrics= ElectricalUserInputsConfig.SmartElectrical
+ 'Signals.SmartPneumatics= PneumaticUserInputsConfig.SmartAirCompression
+
+
VectoInputs = New VectoInputs With {.Cycle="Urban", .VehicleWeightKG=16500, .PowerNetVoltage=26.3, .CycleDurationMinutes=51.9,.FuelMap="testFuelGoodMap.vmap"}
'Pneumatics
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM11.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM11.vb
index adb46ec016897d976eb3b928fe5339fa1ece033f..d0c32fa7398aa1d96876038e53d9d5450beac33c 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/IM11.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/IM11.vb
@@ -1,7 +1,6 @@
Imports VectoAuxiliaries.Electrics
Imports VectoAuxiliaries.Pneumatics
Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
Namespace DownstreamModules
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M11.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M11.vb
index daad5e3a5f27b9263e08a9f507fd239a2b641994..2c93c6c97babdf380172301f9e76426d73f14b98 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M11.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M11.vb
@@ -1,67 +1,72 @@
Imports VectoAuxiliaries.Electrics
Imports VectoAuxiliaries.Pneumatics
Imports VectoAuxiliaries.Hvac
-Imports VectoAuxiliaries.DownstreamModules
Namespace DownstreamModules
Public Class M11
Implements IM11
- 'Private Fields Assigned by Constructor.
- Private m1 As M1_AverageHVACLoadDemand
- Private m3 As IM3_AveragePneumaticLoadDemand
- Private m6 As IM6
- Private m8 As IM8
- Private fmap As IFUELMAP
- Private signals As ISignals
+ #Region "Private Aggregates"
'Private Aggregations
Private AG1 As Single
Private AG2 As Single
Private AG3 As Single
Private AG4 As single
Private AG5 As single
+ #End Region
+
+ #Region "Private Fields Assigned by Constructor."
+
+ Private M1 As IM1_AverageHVACLoadDemand
+ Private M3 As IM3_AveragePneumaticLoadDemand
+ Private M6 As IM6
+ Private M8 As IM8
+ Private fmap As IFUELMAP
+ Private signals As ISignals
+
+ #End Region
'Staging Calculations
Private ReadOnly Property Sum1 As single
Get
-
+ Return m6.OverrunFlag * m8.SmartElectricalAlternatorPowerGenAtCrank
End Get
End Property
Private ReadOnly Property Sum2 As Single
Get
-
+ Return m3.GetAveragePowerDemandAtCrankFromPneumatics + m1.AveragePowerDemandAtCrankFromHVACMechanicalsWatts
End Get
End Property
Private ReadOnly Property Sum3 As Single
Get
-
+ Return m8.SmartElectricalAlternatorPowerGenAtCrank / signals.EngineSpeed
End Get
End Property
Private ReadOnly Property Sum4 As Single
Get
-
+ Return Sum2 / signals.EngineSpeed
End Get
End Property
Private ReadOnly Property Sum5 As Single
Get
-
+ Return Sum4 + signals.EngineDrivelineTorque
End Get
End Property
Private ReadOnly Property Sum6 As Single
Get
-
+ Return Sum3 + Sum5
End Get
End Property
Private readonly Property Sum7 As Single
Get
-
+ Return fmap.fFCdelaunay_Intp(signals.EngineSpeed, sum6)
End Get
End Property
Private ReadOnly Property Sum8 As Single
Get
-
+ Return fmap.fFCdelaunay_Intp( signals.EngineSpeed, Sum5)
End Get
End Property
@@ -111,23 +116,23 @@ End Property
'Add to Aggregates dependent on cycle step time.
Sub CycleStep(Optional stepTimeInSeconds As Single = 0.0) Implements IM11.CycleStep
- 'TODO : Finish this calculations and subtitute the 1's for the staging sums or direct outputs from modules within this module.
-
AG1 = AG1 + ( stepTimeInSeconds * sum1 )
- AG2 = AG2 + ( stepTimeInSeconds * m8.SmartElectricalAlternatorPowerGenAtCrank )
+ AG2 = AG2 + ( stepTimeInSeconds * M8.SmartElectricalAlternatorPowerGenAtCrank )
AG3 = AG3 + ( stepTimeInSeconds * m6.AvgPowerDemandAtCrankFromElectricsIncHVAC )
- AG4 = AG4 + ( stepTimeInSeconds * sum7 )
- AG5 = AG5 + ( stepTimeInSeconds * sum8 )
+
+ 'These need to be divided by 3600 as the Fuel Map output is in Grams/Second.
+ AG4 = AG4 + ( stepTimeInSeconds * sum7 / 3600 )
+ AG5 = AG5 + ( stepTimeInSeconds * Sum8 / 3600 )
End Sub
'Constructor
Public Sub new ( m1 As IM1_AverageHVACLoadDemand, m3 As IM3_AveragePneumaticLoadDemand, m6 As IM6, m8 As IM8, fmap As IFUELMAP, signals As ISignals)
- me.m1 = m1
- me.m3 = m3
- me.m6 = m6
- me.m8 = m8
+ me.M1 = m1
+ me.M3 = m3
+ me.M6 = m6
+ me.M8 = m8
Me.fmap = fmap
Me.signals = signals
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb
index 39f4310514dd9579f8aa81f139a50d477e658415..74daff9134abcbcabb7b0713f7b44f1a191aff53 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb
@@ -8,59 +8,70 @@ Namespace DownstreamModules
Public Class M6
Implements IM6
-
- private _m1 As IM1_AverageHVACLoadDemand
- private _m2 As IM2_AverageElectricalLoadDemand
- private _m3 As IM3_AveragePneumaticLoadDemand
- Private _m4 As IM4_AirCompressor
- Private _m5 As IM5_SmartAlternatorSetGeneration
- Private _signals As ISignals
-
-
- Public ReadOnly Property AveragePowerDemandAtCrankFromPneumatics As Single Implements IM6.AveragePowerDemandAtCrankFromPneumatics
- Get
- Return _m3.GetAveragePowerDemandAtCrankFromPneumatics
- End Get
- End Property
- Public ReadOnly Property AvgPowerDemandAtCrankFromElectricsIncHVAC As Single Implements IM6.AvgPowerDemandAtCrankFromElectricsIncHVAC
- Get
+ #Region "Private Field - Constructor requirements"
+ private _m1 As IM1_AverageHVACLoadDemand
+ private _m2 As IM2_AverageElectricalLoadDemand
+ private _m3 As IM3_AveragePneumaticLoadDemand
+ Private _m4 As IM4_AirCompressor
+ Private _m5 As IM5_SmartAlternatorSetGeneration
+ Private _signals As ISignals
+ #End Region
- Return Sum1
-
- End Get
-
- End Property
+ 'OUT1
Public ReadOnly Property OverrunFlag As Integer Implements IM6.OverrunFlag
Get
Return VC0
End Get
End Property
+ 'OUT2
+ Public ReadOnly Property SmartElecAndPneumaticsCompressorFlag As integer Implements IM6.SmartElecAndPneumaticsCompressorFlag
+ Get
+ Return VC2
+ End Get
+ End Property
+ 'OUT3
Public ReadOnly Property SmartElecAndPneumaticAltPowerGenAtCrank As Single Implements IM6.SmartElecAndPneumaticAltPowerGenAtCrank
Get
+ 'Multiply * 1 @ Engineering Request
Return Max1 * -1
End Get
End Property
+ 'OUT4
Public ReadOnly Property SmartElecAndPneumaticAirCompPowerGenAtCrank As Single Implements IM6.SmartElecAndPneumaticAirCompPowerGenAtCrank
Get
Return Sum16
End Get
- End Property
- Public ReadOnly Property SmartElecAndPneumaticsCompressorFlag As integer Implements IM6.SmartElecAndPneumaticsCompressorFlag
+End Property
+ 'OUT5
+ Public ReadOnly Property SmartElecOnlyAltPowerGenAtCrank As Single Implements IM6.SmartElecOnlyAltPowerGenAtCrank
Get
- Return VC2
+ 'Multiply * -1 @ Engineering request.
+ Return Max2 * -1
End Get
End Property
- Public ReadOnly Property SmartElecOnlyAltPowerGenAtCrank As Single Implements IM6.SmartElecOnlyAltPowerGenAtCrank
+ 'OUT6
+ Public ReadOnly Property AveragePowerDemandAtCrankFromPneumatics As Single Implements IM6.AveragePowerDemandAtCrankFromPneumatics
Get
- Return Max2 * -1
+ Return _m3.GetAveragePowerDemandAtCrankFromPneumatics
End Get
End Property
+ 'OUT7
Public ReadOnly Property SmartPneumaticOnlyAirCompPowerGenAtCrank As Single Implements IM6.SmartPneumaticOnlyAirCompPowerGenAtCrank
Get
Return Sum19
End Get
End Property
+ 'OUT8
+ Public ReadOnly Property AvgPowerDemandAtCrankFromElectricsIncHVAC As Single Implements IM6.AvgPowerDemandAtCrankFromElectricsIncHVAC
+ Get
+
+ Return Sum1
+
+ End Get
+
+ End Property
+ 'OUT9
Public ReadOnly Property SmartPneumaticsOnlyCompressorFlag As Integer Implements IM6.SmartPneumaticsOnlyCompressorFlag
Get
Return VC4
@@ -95,7 +106,7 @@ End Property
'Value Choices
Public ReadOnly Property VC0 As Single
Get
- Return If( Sum3<0,1,0)
+ Return If( Sum3<=0,1,0)
End Get
End Property
Public ReadOnly Property VC1 As Single
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb
index 2748ab35ff16d1b77c5a236739f19e2794cf395d..c1733d5637155ec9493a53dfe86ddf67030b247d 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb
@@ -107,7 +107,7 @@ End Property
End Property
Private readonly Property S9 As single
Get
- Return M4.GetAveragePowerDemandPerCompressorUnitFlowRate * M6.OverrunFlag * M8.CompressorFlag
+ Return M4.GetFlowRate * M6.OverrunFlag * M8.CompressorFlag
End Get
End Property
Private ReadOnly Property S10 As Single
@@ -141,7 +141,7 @@ End Property
'Clear down at the beginning of a cycle.
Public Sub CycleStep(Optional stepTimeInSeconds As Single = 0.0) Implements IM9.CycleStep
- _LitresOfAirCompressorOnContinuallyAggregate +=stepTimeInSeconds* M4.GetAveragePowerDemandPerCompressorUnitFlowRate
+ _LitresOfAirCompressorOnContinuallyAggregate +=stepTimeInSeconds* M4.GetFlowRate
_LitresOfAirCompressorOnOnlyInOverrunAggregate +=stepTimeInSeconds * s10
_TotalCycleFuelConsumptionCompressorOnContinuouslyAggregate+= stepTimeInSeconds * s11
_TotalCycleFuelConsumptionCompressorOffContinuouslyAggregate +=stepTimeInSeconds * s12
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/cMAP.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/cMAP.vb
new file mode 100644
index 0000000000000000000000000000000000000000..eac1a6968acba6ac9cd24802b60b7dc109258ddb
--- /dev/null
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/cMAP.vb
@@ -0,0 +1,198 @@
+' Copyright 2014 European Union.
+' Licensed under the EUPL (the 'Licence');
+'
+' * You may not use this work except in compliance with the Licence.
+' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+' * Unless required by applicable law or agreed to in writing,
+' software distributed under the Licence is distributed on an "AS IS" basis,
+' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+'
+' See the LICENSE.txt for the specific language governing permissions and limitations.
+Imports System.Collections.Generic
+
+Public Class cMAP
+Implements IFUELMAP
+
+ Private LnU As List(Of Single)
+ Private LTq As List(Of Single)
+ Private lFC As List(Of Single)
+
+ Private sFilePath As String
+ Private iMapDim As Integer
+
+ Private FuelMap As cDelaunayMap
+
+ Private Sub ResetMe()
+ lFC = Nothing
+ LTq = Nothing
+ LnU = Nothing
+ iMapDim = -1
+ FuelMap = New cDelaunayMap
+ End Sub
+
+ Public Function ReadFile(Optional ByVal ShowMsg As Boolean = True) As Boolean Implements IFUELMAP.ReadFile
+ Dim file As cFile_V3
+ Dim line As String()
+ Dim nU As Double
+ Dim MsgSrc As String
+
+
+ MsgSrc = "Main/ReadInp/MAP"
+
+ 'Reset
+ ResetMe()
+
+ 'Stop if there's no file
+ If sFilePath = "" OrElse Not IO.File.Exists(sFilePath) Then
+ 'If ShowMsg Then WorkerMsg(tMsgID.Err, "Map file not found! (" & sFilePath & ")", MsgSrc)
+ Return False
+ End If
+
+ 'Open file
+ file = New cFile_V3
+ If Not file.OpenRead(sFilePath) Then
+ file = Nothing
+ 'TODO:WORKERMESSAGE If ShowMsg Then WorkerMsg(tMsgID.Err, "Failed to open file (" & sFilePath & ") !", MsgSrc)
+ Return False
+ End If
+
+ 'Skip Header
+ file.ReadLine()
+
+ 'Initi Lists (before version check so ReadOldFormat works)
+ lFC = New System.Collections.Generic.List(Of Single)
+ LTq = New System.Collections.Generic.List(Of Single)
+ LnU = New System.Collections.Generic.List(Of Single)
+
+ Try
+ Do While Not file.EndOfFile
+
+ 'Line read
+ line = file.ReadLine
+
+ 'Line counter up (was reset in ResetMe)
+ iMapDim += 1
+
+ 'Revolutions
+ nU = CDbl(line(0))
+
+ LnU.Add(nU)
+
+ 'Power
+ LTq.Add(line(1))
+
+ 'FC
+ 'Check sign
+ If CSng(line(2)) < 0 Then
+ file.Close()
+ 'TODO:WORKERMESSAGEIf ShowMsg Then WorkerMsg(tMsgID.Err, "FC < 0 in map at " & nU & " [1/min], " & line(1) & " [Nm]", MsgSrc)
+ Return False
+ End If
+
+ lFC.Add(CSng(line(2)))
+
+
+ Loop
+ Catch ex As Exception
+
+ 'TODO:WORKERMESSAGE If ShowMsg Then WorkerMsg(tMsgID.Err, "Error during file read! Line number " & iMapDim + 1 & " (" & sFilePath & ")", MsgSrc, sFilePath)
+ GoTo lbEr
+
+ End Try
+
+ 'Close file
+ file.Close()
+
+ file = Nothing
+
+ Return True
+
+
+ 'ERROR-label for clean Abort
+lbEr:
+ file.Close()
+ file = Nothing
+
+ Return False
+
+ End Function
+
+ Public Function Triangulate() As Boolean Implements IFUELMAP.Triangulate
+ Dim i As Integer
+
+ Dim MsgSrc As String
+
+ MsgSrc = "MAP/Norm"
+
+ 'FC Delauney
+ For i = 0 To iMapDim
+ FuelMap.AddPoints(LnU(i), LTq(i), lFC(i))
+ Next
+
+ Return FuelMap.Triangulate()
+
+ End Function
+
+
+ Public Function fFCdelaunay_Intp(ByVal nU As Single, ByVal Tq As Single) As Single Implements IFUELMAP.fFCdelaunay_Intp
+ Dim val As Single
+
+ val = FuelMap.Intpol(nU, Tq)
+
+ If FuelMap.ExtrapolError Then
+ 'TODO:WORKERMESSAGE WorkerMsg(tMsgID.Err, "Cannot extrapolate FC map! n= " & nU.ToString("0.0") & " [1/min], Me= " & Tq.ToString("0.0") & " [Nm]", "MAP/FC_Intp")
+ Return -10000
+ Else
+ Return val
+ End If
+
+ End Function
+
+#Region "Properties"
+
+ Public Property FilePath() As String Implements IFUELMAP.FilePath
+ Get
+ Return sFilePath
+ End Get
+ Set(ByVal value As String)
+ sFilePath = value
+ End Set
+ End Property
+
+ Public ReadOnly Property MapDim As Integer Implements IFUELMAP.MapDim
+ Get
+ Return iMapDim
+ End Get
+ End Property
+
+ Public ReadOnly Property Tq As List(Of Single) Implements IFUELMAP.Tq
+ Get
+ Return LTq
+ End Get
+ End Property
+
+ Public ReadOnly Property FC As List(Of Single) Implements IFUELMAP.FC
+ Get
+ Return lFC
+ End Get
+ End Property
+
+ Public ReadOnly Property nU As List(Of Single) Implements IFUELMAP.nU
+ Get
+ Return LnU
+ End Get
+ End Property
+
+#End Region
+
+
+
+End Class
+
+
+
+
+
+
+
+
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/IM1_AverageHVACLoadDemand.vb b/VECTOAux/VectoAuxiliaries/Hvac/IM1_AverageHVACLoadDemand.vb
index 387b54fe9d5d09269f769e9c951af665be053f2a..e8b3e3e0241b107fe6b6b0e13b9af6f49dc1ecb8 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/IM1_AverageHVACLoadDemand.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/IM1_AverageHVACLoadDemand.vb
@@ -1,5 +1,5 @@

-Namespace Pneumatics
+Namespace Hvac
Public Interface IM1_AverageHVACLoadDemand
@@ -12,11 +12,6 @@ Function AveragePowerDemandAtCrankFromHVACElectricsWatts() As Single
Function HVACFuelingLitresPerHour() As Single
-
-
-
-
-
End Interface
End Namespace
diff --git a/VECTOAux/VectoAuxiliaries/Pneumatics/AirFlowRateMechanicalDemandMap.vb b/VECTOAux/VectoAuxiliaries/Pneumatics/AirFlowRateMechanicalDemandMap.vb
deleted file mode 100644
index 913243455f7ef9f6a056dcb4cf5e0ec46eaa5883..0000000000000000000000000000000000000000
--- a/VECTOAux/VectoAuxiliaries/Pneumatics/AirFlowRateMechanicalDemandMap.vb
+++ /dev/null
@@ -1,80 +0,0 @@
-Imports System.IO
-
-Namespace Pneumatics
-
- Public Class AirFlowRateMechanicalDemandMap
- Implements IAirFlowRateMechanicalDemandMap
-
- Private _filePath As String
-
- Private _map As New Dictionary(Of Integer, Single)
-
-
- Public Sub New(iFilePath As String)
-
- _filePath = iFilePath
-
- End Sub
-
-
- Public Function Initialise() As Boolean Implements IAirFlowRateMechanicalDemandMap.Initialise
-
- If File.Exists(_filePath) Then
- Using sr As StreamReader = New StreamReader(_filePath)
- 'get array of lines from csv
- Dim lines() As String = sr.ReadToEnd().Split(CType(Environment.NewLine, Char()), StringSplitOptions.RemoveEmptyEntries)
-
- 'Must have at least 2 entries in map to make it usable [dont forget the header row]
- If lines.Length < 3 Then Throw New ArgumentException("Insufficient rows in csv to build a usable map")
-
- _map = New Dictionary(Of Integer, Single)
- Dim firstline As Boolean = True
-
- For Each line As String In lines
- If Not firstline Then
- 'split the line
- Dim elements() As String = line.Split(New Char() {","}, StringSplitOptions.RemoveEmptyEntries)
- '2 entries per line required
- If (elements.Length <> 2) Then Throw New ArgumentException("Incorrect number of values in csv file")
- 'add values to map
- _map.Add(elements(0), elements(1))
-
-
- 'Test For Non Numeric Data,
- If (Not firstline AndAlso (Not IsNumeric(elements(0)) OrElse Not IsNumeric(elements(1)))) Then
- Throw (New ArgumentException("SomeValues were not numeric"))
- End If
-
- Else
- firstline = False
- End If
- Next
- End Using
- Else
- Throw New ArgumentException("supplied input file does not exist")
- End If
-
- Return True
- End Function
-
- Public Function GetPower(flowRate As Integer) As Integer Implements IAirFlowRateMechanicalDemandMap.GetPower
-
- If _map.ContainsKey(flowRate) = False Then
-
- Throw New ArgumentException("Flow rate was not a key in the FlowRate Mechanical power map")
-
-
- End If
-
- Return _map(flowRate)
-
- End Function
-
-
-
- End Class
-
-End Namespace
-
-
-
diff --git a/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb b/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb
index 7b1d737e45d852a02b8f89a5d92e96477d8b2d1b..0839f8c3c15e0d978fb64766c6d120852c35126b 100644
--- a/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb
+++ b/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb
@@ -126,7 +126,7 @@ Namespace Pneumatics
'Get Average Power Demand @ Crank From Pneumatics
Public Function GetAveragePowerDemandAtCrankFromPneumatics() As Single Implements IM3_AveragePneumaticLoadDemand.GetAveragePowerDemandAtCrankFromPneumatics
- Dim averagePowerDemandAtCrankFromPneumatics As Single = (_pneumaticsCompressorFlowRateMap.GetAveragePowerDemandPerCompressorUnitFlowRate /60) _
+ Dim averagePowerDemandAtCrankFromPneumatics As Single = (_pneumaticsCompressorFlowRateMap.GetAveragePowerDemandPerCompressorUnitFlowRate * 60) _
* (TotalAirDemand / (_cycleDurationMinutes * 60))
averagePowerDemandAtCrankFromPneumatics = averagePowerDemandAtCrankFromPneumatics / _pneumaticUserInputsConfig.CompressorGearEfficiency
diff --git a/VECTOAux/VectoAuxiliaries/Pneumatics/M4_AirCompressor.vb b/VECTOAux/VectoAuxiliaries/Pneumatics/M4_AirCompressor.vb
index 48946be34ad3f9e6bbdd6c24ee0706db57f05e6e..20d06794c60c2773f17921241f00374324886f96 100644
--- a/VECTOAux/VectoAuxiliaries/Pneumatics/M4_AirCompressor.vb
+++ b/VECTOAux/VectoAuxiliaries/Pneumatics/M4_AirCompressor.vb
@@ -106,7 +106,7 @@ Namespace Pneumatics
Public Function GetFlowRate() As Single Implements IM4_AirCompressor.GetFlowRate
Dim compressorRpm As Single = _signals.EngineSpeed * PulleyGearRatio
- ''Flow Rate in the map is Litres/Hour so divide by 60 to get Units per second.
+ ''Flow Rate in the map is Litres/min so divide by 60 to get Units per second.
Return _map.GetFlowRate(compressorRpm) / 60
End Function
diff --git a/VECTOAux/VectoAuxiliaries/Signals.vb b/VECTOAux/VectoAuxiliaries/Signals.vb
index a095f1899ff14073f3f8c7446abd08857271cdd3..18311fd804ca3f915a46808712407bcccb732ace 100644
--- a/VECTOAux/VectoAuxiliaries/Signals.vb
+++ b/VECTOAux/VectoAuxiliaries/Signals.vb
@@ -4,6 +4,9 @@ Implements ISignals
+
+ Private _smartElectrics As Boolean
+
Public Property ClutchEngaged As Boolean Implements ISignals.ClutchEngaged
Public Property EngineDrivelinePower As Single Implements ISignals.EngineDrivelinePower
@@ -15,6 +18,19 @@ Implements ISignals
Public Property EngineSpeed As Integer Implements ISignals.EngineSpeed
Public Property SmartElectrics As Boolean Implements ISignals.SmartElectrics
+ Get
+ Return _smartElectrics
+ End Get
+ Set(value As Boolean)
+
+ _smartElectrics=value
+
+ Debug.WriteLine(String.Format("SmartElectrics {0}", _smartElectrics))
+
+ End Set
+
+ end property
+
Public Property SmartPneumatics As Boolean Implements ISignals.SmartPneumatics
diff --git a/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb b/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb
new file mode 100644
index 0000000000000000000000000000000000000000..de99ca603df9a1e712de4ce407dc54083a824a2d
--- /dev/null
+++ b/VECTOAux/VectoAuxiliariesTests/Mocks/MockFuel50PC.vb
@@ -0,0 +1,52 @@
+Imports VectoAuxiliaries.Electrics
+Imports VectoAuxiliaries.Pneumatics
+Imports VectoAuxiliaries.Hvac
+Imports VectoAuxiliaries.DownstreamModules
+Imports NUnit.Framework
+Imports VectoAuxiliaries
+
+public class MockFuel50PC
+Implements IFUELMAP
+
+
+ Public Function fFCdelaunay_Intp(nU As Single, Tq As Single) As Single Implements IFUELMAP.fFCdelaunay_Intp
+
+ Return (nU + Tq ) * 0.5
+
+ End Function
+
+ Public Property FilePath As String Implements IFUELMAP.FilePath
+
+ Public Function ReadFile(Optional ShowMsg As Boolean = True) As Boolean Implements IFUELMAP.ReadFile
+ Return true
+ End Function
+
+ Public ReadOnly Property FC As List(Of Single) Implements IFUELMAP.FC
+ Get
+
+ End Get
+ End Property
+
+ Public ReadOnly Property MapDim As Integer Implements IFUELMAP.MapDim
+ Get
+
+ End Get
+ End Property
+
+ Public ReadOnly Property nU As List(Of Single) Implements IFUELMAP.nU
+ Get
+
+ End Get
+ End Property
+
+ Public ReadOnly Property Tq As List(Of Single) Implements IFUELMAP.Tq
+ Get
+
+ End Get
+ End Property
+
+ Public Function Triangulate() As Boolean Implements IFUELMAP.Triangulate
+
+ End Function
+End Class
+
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
index a9f6be7273699fdc63fb0d6a8e32c5aefddf4448..7576a22ae96021048b8c5b75561726a85b4a97c7 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
@@ -112,7 +112,7 @@ Namespace UnitTests
Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
- Dim expected As Single = 0.512801051
+ Dim expected As Single = 1846.08362
Dim actual As Single = target.GetAveragePowerDemandAtCrankFromPneumatics()
Assert.AreEqual(expected, actual)
@@ -135,7 +135,7 @@ Namespace UnitTests
Dim target As New M3_AveragePneumaticLoadDemand(_defaultInputConfig, psAuxConfig, psActuationsMap, psCompressorMap, _vehicleMassKG, "Urban", _signals)
- Dim expected As Single = 0.512801051
+ Dim expected As Single = 1846.08362
Dim actual As Single = target.GetAveragePowerDemandAtCrankFromPneumatics()
Assert.AreEqual(expected, actual)
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Test.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
similarity index 100%
rename from VECTOAux/VectoAuxiliariesTests/UnitTests/M10Test.vb
rename to VECTOAux/VectoAuxiliariesTests/UnitTests/M10Tests.vb
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
new file mode 100644
index 0000000000000000000000000000000000000000..853b27cf3455e47bdad4e1eecbe828e6ab510374
--- /dev/null
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
@@ -0,0 +1,79 @@
+Imports VectoAuxiliaries.Electrics
+Imports VectoAuxiliaries.Pneumatics
+Imports VectoAuxiliaries.Hvac
+Imports VectoAuxiliaries.DownstreamModules
+Imports NUnit.Framework
+Imports VectoAuxiliaries
+Imports Moq
+
+Namespace UnitTests
+<TestFixture()> _
+Public Class M11Tests
+
+<Test()> _
+<TestCase(0,50,60,70,80,90,1500, 0,50,60,0.2180759f,0.2180713f)> _
+<TestCase(1,50,60,70,80,90,1500, 50,50,60,0.2180759f,0.2180713f)> _
+Public Sub InputOutputValues( IP1 As single,
+ IP2 As single,
+ IP3 As single,
+ IP4 As single,
+ IP5 As single,
+ IP6 As single,
+ IP7 As single,
+ OUT1 As single,
+ OUT2 As single,
+ OUT3 As single,
+ OUT4 As single,
+ OUT5 As single)
+
+'Arrange
+
+ Dim m1Mock As New Mock(Of IM1_AverageHVACLoadDemand)
+ Dim m3Mock As New Mock(Of IM3_AveragePneumaticLoadDemand)
+
+
+ Dim m6Mock As New Mock(Of IM6)
+ Dim m8Mock As New Mock(Of IM8)
+ Dim sgnlsMock As New Mock(Of ISignals)
+ Dim fmap As New MockFuel50pc
+
+
+
+
+ m6Mock .Setup( Function(x) x.OverrunFlag) .Returns( IP1 )
+ m8Mock .Setup( Function(x) x.SmartElectricalAlternatorPowerGenAtCrank) .Returns( IP2 )
+ m6Mock .Setup( Function(x) x.AvgPowerDemandAtCrankFromElectricsIncHVAC) .Returns( IP3 )
+ sgnlsMock.Setup( Function(x) x.EngineDrivelineTorque) .Returns( IP4 )
+ m3Mock .Setup( Function(x) x.GetAveragePowerDemandAtCrankFromPneumatics) .Returns( IP5 )
+ m1Mock .Setup( Function(x) x.AveragePowerDemandAtCrankFromHVACMechanicalsWatts) .Returns( IP6 )
+ sgnlsMock.Setup( Function(x) x.EngineSpeed) .Returns( IP7 )
+
+
+ 'Act
+ Dim target = New M11( m1Mock.Object,m3Mock.Object, m6Mock.Object,m8Mock.Object,fmap ,sgnlsMock.Object)',m3Mock.Object,m6Mock.Object,m8Mock.Object,fmap,sgnlsMock.Object)
+
+ 'Add Current Calculation to Internal Aggregates ( Accesseed by public output properties which are external interface )
+ target.CycleStep(1)
+
+
+ 'Assert
+ Assert.AreEqual( target.SmartElectricalTotalCycleElectricalEnergyGeneratedDuringOverrunOnly,OUT1)
+ Assert.AreEqual( target.SmartElectricalTotalCycleEletricalEnergyGenerated,OUT2)
+ Assert.AreEqual( target.TotalCycleElectricalDemand,OUT3)
+ Assert.AreEqual( Math.Round(CType(target.TotalCycleFuelConsumptionSmartElectricalLoad,Decimal),7),OUT4)
+ Assert.AreEqual( Math.Round(CType(target.TotalCycleFuelConsumptionZeroElectricalLoad,Decimal),7),OUT5)
+
+
+
+
+End Sub
+
+
+End Class
+
+
+
+End Namespace
+
+
+
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
index b42f75e965bed02584c4cdfc1321b142d7613e70..f53317b1bbcac8972b4bd82f723a2aceb8ebfbe0 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M6Tests.vb
@@ -48,70 +48,8 @@ Assert.IsNotNull( target)
End Sub
-<Test()>
-Public Sub SmartElectricalOnTest()
-
- Signals.SmartElectrics=True
-
- Dim target As Im6 = GetStandardInstanceM6()
-
- Dim OverRunFlag As Integer = target.OverrunFlag
- Dim SmartElecAndPneumaticsCompressorFlag As Integer = target.SmartElecAndPneumaticsCompressorFlag
- Dim SmartElectricalAndPneumaticAlternatorPowerGenAtCrank As Single = target.SmartElecAndPneumaticAltPowerGenAtCrank
- Dim SmartElectricalAndPneumaticAirCompPowerGenAtCrank As Single = target.SmartElecAndPneumaticAirCompPowerGenAtCrank
- Dim SmartElectricalOnlyAlternatorPowerGenAtCrank As Single = target.SmartElecOnlyAltPowerGenAtCrank
- Dim AveragePowerDemandAtCrankFromPneumatics As Single = target.AveragePowerDemandAtCrankFromPneumatics
- Dim SmartPneumaticsOnlyAirCompPowerGenAtCrank As Single = target.SmartPneumaticOnlyAirCompPowerGenAtCrank
- Dim AveragePowerDemandatCrankFromElectricsInHVAC As Single = target.AvgPowerDemandAtCrankFromElectricsIncHVAC
- Dim SmartPneumaticsOnlySmartCompressorFlag As Integer = target.SmartPneumaticsOnlyCompressorFlag
-
- Assert.AreEqual(0,OverRunFlag )
- Assert.AreEqual(0,SmartElecAndPneumaticsCompressorFlag )
- Assert.AreEqual(0,SmartElectricalAndPneumaticAlternatorPowerGenAtCrank)
- Assert.AreEqual(200,SmartElectricalAndPneumaticAirCompPowerGenAtCrank )
- Assert.AreEqual(0,SmartElectricalOnlyAlternatorPowerGenAtCrank )
- Assert.AreEqual(200,AveragePowerDemandAtCrankFromPneumatics )
- Assert.AreEqual(200,SmartPneumaticsOnlyAirCompPowerGenAtCrank )
- Assert.AreEqual(320,AveragePowerDemandatCrankFromElectricsInHVAC )
- Assert.AreEqual(0,SmartPneumaticsOnlySmartCompressorFlag )
-
-End Sub
-
-
-<Test()>
-Public Sub SmartElectricalOffTest()
-
- Signals.SmartElectrics=true
- Signals.EngineDrivelinePower=0
- Signals.EngineMotoringPower=0
-
- Dim target As Im6 = GetStandardInstanceM6()
-
- Dim OverRunFlag As Integer = target.OverrunFlag
- Dim SmartElecAndPneumaticsCompressorFlag As Integer = target.SmartElecAndPneumaticsCompressorFlag
- Dim SmartElectricalAndPneumaticAlternatorPowerGenAtCrank As Single = target.SmartElecAndPneumaticAltPowerGenAtCrank
- Dim SmartElectricalAndPneumaticAirCompPowerGenAtCrank As Single = target.SmartElecAndPneumaticAirCompPowerGenAtCrank
- Dim SmartElectricalOnlyAlternatorPowerGenAtCrank As Single = target.SmartElecOnlyAltPowerGenAtCrank
- Dim AveragePowerDemandAtCrankFromPneumatics As Single = target.AveragePowerDemandAtCrankFromPneumatics
- Dim SmartPneumaticsOnlyAirCompPowerGenAtCrank As Single = target.SmartPneumaticOnlyAirCompPowerGenAtCrank
- Dim AveragePowerDemandatCrankFromElectricsInHVAC As Single = target.AvgPowerDemandAtCrankFromElectricsIncHVAC
- Dim SmartPneumaticsOnlySmartCompressorFlag As Integer = target.SmartPneumaticsOnlyCompressorFlag
-
- Assert.AreEqual(0,OverRunFlag )
- Assert.AreEqual(0,SmartElecAndPneumaticsCompressorFlag )
- Assert.AreEqual(0,SmartElectricalAndPneumaticAlternatorPowerGenAtCrank )
- Assert.AreEqual(200,SmartElectricalAndPneumaticAirCompPowerGenAtCrank )
- Assert.AreEqual(0,SmartElectricalOnlyAlternatorPowerGenAtCrank )
- Assert.AreEqual(200,AveragePowerDemandAtCrankFromPneumatics )
- Assert.AreEqual(200,SmartPneumaticsOnlyAirCompPowerGenAtCrank )
- Assert.AreEqual(320,AveragePowerDemandatCrankFromElectricsInHVAC )
- Assert.AreEqual(0,SmartPneumaticsOnlySmartCompressorFlag )
-
-
-End Sub
-
-'Mikes Test Results
+'Mikes Test Cases and Results
<Test()> _
<TestCase(100,100,100,100,20,20,40,100,100,100,100,-550,false, 0,0, 0, 20, 0,100,20,200,0)> _
<TestCase(100,100,100,100,20,20,40,100,100,100,100,-550,true , 1,1, 100,40, 100,100,40,200,1)> _
@@ -183,6 +121,78 @@ Public Sub MikesConditionsTest( M1_1 As Single, _
End Sub
+''TB. Supplimental test cases to those supplied by engineering
+'' AUX EMP EDP SM
+'<TestCase(100,100,100,100,20,20,40,100,100 ,100,100, 100,false, 0,0, 0, 20, 0,100,20,200,0 ,TestName:="OverrunFlag-Off")> _
+'<TestCase( 0, 0, 0, 0,20,20,40,100,100 , 0, 0, 0,false, 0,0, 0, 20, 0,100,20,200,0 ,TestName:="OverrunFlag-On")> _
+'<Test()> _
+'Public Sub SupplimentalDeveloperTests( M1_1 As Single, _
+' M1_2 As Single, _
+' M2_1 As Single, _
+' M3_1 As Single, _
+' M4_1 As Single, _
+' M4_2 As Single, _
+' M4_3 As Single, _
+' M5_1 As Single, _
+' M5_2 As Single, _
+' AUX As Single, _
+' EMP As Single, _
+' EDP As Single, _
+' SM As Boolean, _
+' OUT1 As Single, _
+' OUT2 As single, _
+' OUT3 As Single, _
+' OUT4 As Single, _
+' OUT5 As Single, _
+' OUT6 As Single, _
+' OUT7 As Single, _
+' OUT8 As Single, _
+' OUT9 As Single)
+
+
+' dim M1 = New M1_Mock()
+' dim M2 = New M2_Mock()
+' dim M3 = New M3_Mock()
+' dim M4 = New M4_Mock()
+' dim M5 = New M5_Mock()
+
+' Dim signals As New Signals()
+
+
+' M1._AveragePowerDemandAtCrankFromHVACMechanicalsWatts= M1_1
+' M1._AveragePowerDemandAtCrankFromHVACElectricsWatts=M1_2
+' M2._GetAveragePowerAtCrankFromElectrics=M2_1
+' M3._GetAveragePowerDemandAtCrankFromPneumatics= M3_1
+' M4._PowerCompressorOff=M4_1
+' M4._PowerDifference=M4_2
+' M4._PowerCompressorOn=M4_3
+' M5._AlternatorsGenerationPowerAtCrankTractionOnWatts=M5_1
+' M5._AlternatorsGenerationPowerAtCrankOverrunWatts=M5_2
+
+
+
+' signals.EngineMotoringPower= EMP
+' signals.PreExistingAuxPower=AUX
+' signals.EngineDrivelinePower=EDP
+' signals.SmartElectrics=SM
+
+
+' Dim target As New M6(M1,M2,M3,M4,M5,Signals)
+
+' Assert.AreEqual(OUT1,target.OverrunFlag)
+' Assert.AreEqual(OUT2,target.SmartElecAndPneumaticsCompressorFlag)
+' Assert.AreEqual(OUT3,target.SmartElecAndPneumaticAltPowerGenAtCrank)
+' Assert.AreEqual(OUT4,target.SmartElecAndPneumaticAirCompPowerGenAtCrank)
+' Assert.AreEqual(OUT5,target.SmartElecOnlyAltPowerGenAtCrank)
+' Assert.AreEqual(OUT6,target.AveragePowerDemandAtCrankFromPneumatics)
+' Assert.AreEqual(OUT7,target.SmartElecAndPneumaticAirCompPowerGenAtCrank)
+' Assert.AreEqual(OUT8,target.AvgPowerDemandAtCrankFromElectricsIncHVAC)
+' Assert.AreEqual(OUT9,target.SmartPneumaticsOnlyCompressorFlag)
+
+' End Sub
+
+
+
End Class
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
index bf56db4d70d38217742eb95655f9c1624ac64bb7..4e026efb947015f510ad8945772703deb6c4a8e2 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
@@ -10,59 +10,6 @@ Namespace UnitTests
<TestFixture()>
Public Class M9Tests
-
-public class MockFuel50PC
-Implements IFUELMAP
-
-
- Public Function fFCdelaunay_Intp(nU As Single, Tq As Single) As Single Implements IFUELMAP.fFCdelaunay_Intp
-
- Return (nU + Tq ) * 0.5
-
- End Function
-
- Public Property FilePath As String Implements IFUELMAP.FilePath
-
- Public Function ReadFile(Optional ShowMsg As Boolean = True) As Boolean Implements IFUELMAP.ReadFile
- Return true
- End Function
-
- Public ReadOnly Property FC As List(Of Single) Implements IFUELMAP.FC
- Get
-
- End Get
- End Property
-
- Public ReadOnly Property MapDim As Integer Implements IFUELMAP.MapDim
- Get
-
- End Get
- End Property
-
- Public ReadOnly Property nU As List(Of Single) Implements IFUELMAP.nU
- Get
-
- End Get
- End Property
-
- Public ReadOnly Property Tq As List(Of Single) Implements IFUELMAP.Tq
- Get
-
- End Get
- End Property
-
- Public Function Triangulate() As Boolean Implements IFUELMAP.Triangulate
-
- End Function
-End Class
-
-
-Private M1 As IM1_AverageHVACLoadDemand
-Private M4 As IM4_AirCompressor
-Private M6 As IM6
-Private M8 As IM8
-
-
<Test()> _
<TestCase(50,50,400,200,100,1200,50,0,0,0.5f,50f,0, 0.180613413f,0.180590272f)> _
<TestCase(50,50,400,200,100,1200,50,1,0,0.5f,50f,0, 0.180613413f,0.180590272f)> _
@@ -97,7 +44,7 @@ Public Sub ValuesInOutTests(IP1 As Single,
m4Mock.Setup ( Function(x) x.GetPowerCompressorOff) .Returns(IP4)
sgnlsMock.Setup( Function(x) x.EngineDrivelineTorque) .Returns(IP5)
sgnlsMock.Setup( Function(x) x.EngineSpeed) .Returns(IP6)
- m4Mock.Setup ( Function(x) x.GetAveragePowerDemandPerCompressorUnitFlowRate) .Returns(IP7)
+ m4Mock.Setup ( Function(x) x.GetFlowRate) .Returns(IP7)
m6Mock.Setup ( Function(x) x.OverrunFlag) .Returns(IP8)
m8Mock.Setup ( Function(x) x.CompressorFlag) .Returns(IP9)
psac.Setup ( Function(x) x.OverrunUtilisationForCompressionFraction) .Returns(IP10)
diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
index 672a8a29703cd6fae2843fb3f72aea1ae5e77caf..016d4ab1e597c665ca3dd096808675583f5bf383 100644
--- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
+++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
@@ -98,13 +98,15 @@
<Compile Include="Mocks\M5_Mock.vb" />
<Compile Include="Mocks\M6_Mock.vb" />
<Compile Include="Mocks\M7_Mock.vb" />
+ <Compile Include="Mocks\MockFuel50PC.vb" />
<Compile Include="UnitTests\FuelMapTests.vb" />
<Compile Include="UnitTests\M0_5_SmartAlternatorSetEfficiencyTests.vb" />
<Compile Include="UnitTests\M0_NonSmart_AlternatorsSetEfficiencyTests.vb" />
<Compile Include="UnitTests\AveragePneumaticLoadDemandTests.vb" />
<Compile Include="UnitTests\ElectricalConsumerListTests.vb" />
<Compile Include="UnitTests\HVACMapTests.vb" />
- <Compile Include="UnitTests\M10Test.vb" />
+ <Compile Include="UnitTests\M10Tests.vb" />
+ <Compile Include="UnitTests\M11Tests.vb" />
<Compile Include="UnitTests\M1_AverageHVACLoadDemandTests.vb" />
<Compile Include="UnitTests\M1_HVACAverageLoadDemandTests.vb" />
<Compile Include="UnitTests\M5_SmartAlternatorSetGenerationTests.vb" />