From 47df72e83284a43011dd8d6d71ea3bcb7e3b359a Mon Sep 17 00:00:00 2001
From: "Burns, Terry" <Terry.Burns@ricardo.com>
Date: Mon, 12 Jan 2015 16:41:46 +0000
Subject: [PATCH] START STOP MODS 1
git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C1712
---
AuxillaryTestHarness/Dashboard.Designer.vb | 39 ++++---
AuxillaryTestHarness/Dashboard.vb | 2 +-
VECTO/GUI/F_VECTO.vb | 14 +--
VECTO/Input Files/cGBX.vb | 16 +--
VECTO/MODcalc/cPower.vb | 94 ++++++++---------
VECTO/M_MAIN.vb | 2 +-
VECTO/My Project/Application.Designer.vb | 16 +--
VECTO/My Project/Resources.Designer.vb | 96 +++++++++---------
VECTO/My Project/Settings.Designer.vb | 12 +--
VECTO/My Project/app.manifest | 13 ++-
VECTO/VECTO.vbproj | 40 ++++++--
VECTO/VECTO_TemporaryKey.pfx | Bin 0 -> 1644 bytes
VECTO/cVSUM.vb | 9 ++
VECTO/{AAUX_Gobal.vb => mAAUX_Global.vb} | 2 +-
.../VectoAuxiliaries/DownstreamModules/M10.vb | 4 +-
.../VectoAuxiliaries/DownstreamModules/M11.vb | 27 +++--
.../VectoAuxiliaries/DownstreamModules/M12.vb | 4 +-
.../VectoAuxiliaries/DownstreamModules/M9.vb | 8 +-
.../M0_NonSmart_AlternatorsSetEfficiency.vb | 3 +-
.../UnitTests/AlternatorMapTests.vb | 2 +
.../UnitTests/M11Tests.vb | 60 +++++++++++
.../UnitTests/M12Tests.vb | 4 +
22 files changed, 292 insertions(+), 175 deletions(-)
create mode 100644 VECTO/VECTO_TemporaryKey.pfx
rename VECTO/{AAUX_Gobal.vb => mAAUX_Global.vb} (99%)
diff --git a/AuxillaryTestHarness/Dashboard.Designer.vb b/AuxillaryTestHarness/Dashboard.Designer.vb
index 181e11e03b..5a31f19c1f 100644
--- a/AuxillaryTestHarness/Dashboard.Designer.vb
+++ b/AuxillaryTestHarness/Dashboard.Designer.vb
@@ -289,6 +289,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.chkEngineStopped = New System.Windows.Forms.CheckBox()
Me.pnlMain.SuspendLayout
Me.tabMain.SuspendLayout
Me.tabGeneralConfig.SuspendLayout
@@ -1323,6 +1324,7 @@ Partial Class Dashboard
'tabPlayground
'
Me.tabPlayground.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.tabPlayground.Controls.Add(Me.chkEngineStopped)
Me.tabPlayground.Controls.Add(Me.pnlM13)
Me.tabPlayground.Controls.Add(Me.lblM13_Title)
Me.tabPlayground.Controls.Add(Me.pnlM12)
@@ -2138,7 +2140,7 @@ Partial Class Dashboard
'lblPreExistingAuxPower
'
Me.lblPreExistingAuxPower.AutoSize = true
- Me.lblPreExistingAuxPower.Location = New System.Drawing.Point(9, 147)
+ Me.lblPreExistingAuxPower.Location = New System.Drawing.Point(9, 164)
Me.lblPreExistingAuxPower.Name = "lblPreExistingAuxPower"
Me.lblPreExistingAuxPower.Size = New System.Drawing.Size(116, 13)
Me.lblPreExistingAuxPower.TabIndex = 42
@@ -2146,7 +2148,7 @@ Partial Class Dashboard
'
'txtPreExistingAuxPower
'
- Me.txtPreExistingAuxPower.Location = New System.Drawing.Point(10, 166)
+ Me.txtPreExistingAuxPower.Location = New System.Drawing.Point(10, 183)
Me.txtPreExistingAuxPower.Name = "txtPreExistingAuxPower"
Me.txtPreExistingAuxPower.Size = New System.Drawing.Size(100, 20)
Me.txtPreExistingAuxPower.TabIndex = 41
@@ -2249,7 +2251,7 @@ Partial Class Dashboard
'
'PictureBox1
'
- Me.PictureBox1.Location = New System.Drawing.Point(13, 412)
+ Me.PictureBox1.Location = New System.Drawing.Point(13, 429)
Me.PictureBox1.Name = "PictureBox1"
Me.PictureBox1.Size = New System.Drawing.Size(100, 94)
Me.PictureBox1.TabIndex = 34
@@ -2783,7 +2785,7 @@ Partial Class Dashboard
'lblTotalCycleTimeSeconds
'
Me.lblTotalCycleTimeSeconds.AutoSize = true
- Me.lblTotalCycleTimeSeconds.Location = New System.Drawing.Point(10, 369)
+ Me.lblTotalCycleTimeSeconds.Location = New System.Drawing.Point(10, 386)
Me.lblTotalCycleTimeSeconds.Name = "lblTotalCycleTimeSeconds"
Me.lblTotalCycleTimeSeconds.Size = New System.Drawing.Size(134, 13)
Me.lblTotalCycleTimeSeconds.TabIndex = 14
@@ -2792,7 +2794,7 @@ Partial Class Dashboard
'lblEngineSpeed
'
Me.lblEngineSpeed.AutoSize = true
- Me.lblEngineSpeed.Location = New System.Drawing.Point(8, 324)
+ Me.lblEngineSpeed.Location = New System.Drawing.Point(8, 341)
Me.lblEngineSpeed.Name = "lblEngineSpeed"
Me.lblEngineSpeed.Size = New System.Drawing.Size(107, 13)
Me.lblEngineSpeed.TabIndex = 13
@@ -2801,7 +2803,7 @@ Partial Class Dashboard
'lblEngineMotoringPower
'
Me.lblEngineMotoringPower.AutoSize = true
- Me.lblEngineMotoringPower.Location = New System.Drawing.Point(9, 280)
+ Me.lblEngineMotoringPower.Location = New System.Drawing.Point(9, 297)
Me.lblEngineMotoringPower.Name = "lblEngineMotoringPower"
Me.lblEngineMotoringPower.Size = New System.Drawing.Size(117, 13)
Me.lblEngineMotoringPower.TabIndex = 12
@@ -2810,7 +2812,7 @@ Partial Class Dashboard
'lblEngineDrivelineTorque
'
Me.lblEngineDrivelineTorque.AutoSize = true
- Me.lblEngineDrivelineTorque.Location = New System.Drawing.Point(9, 235)
+ Me.lblEngineDrivelineTorque.Location = New System.Drawing.Point(9, 252)
Me.lblEngineDrivelineTorque.Name = "lblEngineDrivelineTorque"
Me.lblEngineDrivelineTorque.Size = New System.Drawing.Size(121, 13)
Me.lblEngineDrivelineTorque.TabIndex = 11
@@ -2819,7 +2821,7 @@ Partial Class Dashboard
'lblEngineDrivelinePower
'
Me.lblEngineDrivelinePower.AutoSize = true
- Me.lblEngineDrivelinePower.Location = New System.Drawing.Point(7, 193)
+ Me.lblEngineDrivelinePower.Location = New System.Drawing.Point(7, 210)
Me.lblEngineDrivelinePower.Name = "lblEngineDrivelinePower"
Me.lblEngineDrivelinePower.Size = New System.Drawing.Size(120, 13)
Me.lblEngineDrivelinePower.TabIndex = 10
@@ -2827,35 +2829,35 @@ Partial Class Dashboard
'
'txtTotalCycleTimeSeconds
'
- Me.txtTotalCycleTimeSeconds.Location = New System.Drawing.Point(10, 386)
+ Me.txtTotalCycleTimeSeconds.Location = New System.Drawing.Point(10, 403)
Me.txtTotalCycleTimeSeconds.Name = "txtTotalCycleTimeSeconds"
Me.txtTotalCycleTimeSeconds.Size = New System.Drawing.Size(100, 20)
Me.txtTotalCycleTimeSeconds.TabIndex = 5
'
'txtEngineSpeed
'
- Me.txtEngineSpeed.Location = New System.Drawing.Point(10, 337)
+ Me.txtEngineSpeed.Location = New System.Drawing.Point(10, 354)
Me.txtEngineSpeed.Name = "txtEngineSpeed"
Me.txtEngineSpeed.Size = New System.Drawing.Size(100, 20)
Me.txtEngineSpeed.TabIndex = 4
'
'txtEngineMotoringPower
'
- Me.txtEngineMotoringPower.Location = New System.Drawing.Point(10, 297)
+ Me.txtEngineMotoringPower.Location = New System.Drawing.Point(10, 314)
Me.txtEngineMotoringPower.Name = "txtEngineMotoringPower"
Me.txtEngineMotoringPower.Size = New System.Drawing.Size(100, 20)
Me.txtEngineMotoringPower.TabIndex = 3
'
'txtEngineDrivelineTorque
'
- Me.txtEngineDrivelineTorque.Location = New System.Drawing.Point(10, 252)
+ Me.txtEngineDrivelineTorque.Location = New System.Drawing.Point(10, 269)
Me.txtEngineDrivelineTorque.Name = "txtEngineDrivelineTorque"
Me.txtEngineDrivelineTorque.Size = New System.Drawing.Size(100, 20)
Me.txtEngineDrivelineTorque.TabIndex = 2
'
'txtEngineDrivelinePower
'
- Me.txtEngineDrivelinePower.Location = New System.Drawing.Point(10, 208)
+ Me.txtEngineDrivelinePower.Location = New System.Drawing.Point(10, 225)
Me.txtEngineDrivelinePower.Name = "txtEngineDrivelinePower"
Me.txtEngineDrivelinePower.Size = New System.Drawing.Size(100, 20)
Me.txtEngineDrivelinePower.TabIndex = 1
@@ -2880,6 +2882,16 @@ Partial Class Dashboard
'
Me.Timer1.Interval = 1000
'
+ 'chkEngineStopped
+ '
+ Me.chkEngineStopped.AutoSize = true
+ Me.chkEngineStopped.Location = New System.Drawing.Point(10, 144)
+ Me.chkEngineStopped.Name = "chkEngineStopped"
+ Me.chkEngineStopped.Size = New System.Drawing.Size(102, 17)
+ Me.chkEngineStopped.TabIndex = 60
+ Me.chkEngineStopped.Text = "Engine Stopped"
+ Me.chkEngineStopped.UseVisualStyleBackColor = true
+ '
'Dashboard
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
@@ -3198,5 +3210,6 @@ End Sub
Friend WithEvents btnSSMBSource As System.Windows.Forms.Button
Friend WithEvents lblSSMFilePath As System.Windows.Forms.Label
Friend WithEvents txtSSMFilePath As System.Windows.Forms.TextBox
+ Friend WithEvents chkEngineStopped As System.Windows.Forms.CheckBox
End Class
diff --git a/AuxillaryTestHarness/Dashboard.vb b/AuxillaryTestHarness/Dashboard.vb
index 7e9f04fe18..b9e3593e50 100644
--- a/AuxillaryTestHarness/Dashboard.vb
+++ b/AuxillaryTestHarness/Dashboard.vb
@@ -182,7 +182,7 @@ Private Sub CreateBindings()
'TODO:NOT NEEDED IN NORMAL OPS ONLY FOR TEST HARNESS
chkSignalsSmartAirCompression.DataBindings.Add("Checked",auxEnvironment.Signals,"SmartPneumatics",False,DataSourceUpdateMode.OnPropertyChanged)
-
+ Me.chkEngineStopped.DataBindings.Add("Checked",auxEnvironment.Signals,"EngineStopped",False,DataSourceUpdateMode.OnPropertyChanged)
chkSmartRegeneration.DataBindings.Add("Checked",auxEnvironment.PneumaticUserInputsConfig,"SmartRegeneration",False,DataSourceUpdateMode.OnPropertyChanged)
chkRetarderBrake.DataBindings.Add("Checked",auxEnvironment.PneumaticUserInputsConfig,"RetarderBrake")
diff --git a/VECTO/GUI/F_VECTO.vb b/VECTO/GUI/F_VECTO.vb
index ede7895d25..ab1fe5ad6e 100644
--- a/VECTO/GUI/F_VECTO.vb
+++ b/VECTO/GUI/F_VECTO.vb
@@ -36,7 +36,7 @@ Public Class F_VECTO
'Scan the program directory for DLL's which are AdvancedAuxiliaries and display
- Dim AList As List(Of cAdvancedAuxiliary ) = AAUX_Gobal.DiscoverAdvancedAuxiliaries()
+ Dim AList As List(Of cAdvancedAuxiliary ) = mAAUX_Global.DiscoverAdvancedAuxiliaries()
cboAdvancedAuxiliaries.DataSource=AList
cboAdvancedAuxiliaries.DisplayMember= "AuxiliaryName"
@@ -515,13 +515,13 @@ Public Class F_VECTO
If cboAdvancedAuxiliaries.SelectedIndex>0 then
'resolve absolute path for auxiliary file.
- absoluteAAUxFile = AAUX_Gobal.ResolveAAUXFilePath( fPATH(VECTOfile),txtAdvancedAuxiliaryFile.Text)
+ absoluteAAUxFile = mAAUX_Global.ResolveAAUXFilePath( fPATH(VECTOfile),txtAdvancedAuxiliaryFile.Text)
aaAssemblyName = DirectCast(cboAdvancedAuxiliaries.SelectedItem, cAdvancedAuxiliary).AssemblyName
aaAssemblyVersion = DirectCast(cboAdvancedAuxiliaries.SelectedItem, cAdvancedAuxiliary).AuxiliaryVersion
- If NOT AAUX_Gobal.ValidateAAUXFile( absoluteAAUxFile,aaAssemblyName,aaAssemblyVersion, message ) then
+ If NOT mAAUX_Global.ValidateAAUXFile( absoluteAAUxFile,aaAssemblyName,aaAssemblyVersion, message ) then
MessageBox.Show (String.Format("You have selected an advanced auxiliary *Auxiliary Type*, but the file specified is invalid :{0}", message))
Return false
End If
@@ -1370,7 +1370,7 @@ Private Sub btnBrowseAAUXFile_Click( sender As Object, e As EventArgs) Handles
If cboAdvancedAuxiliaries.SelectedIndex=0 then return
'Get Absolute Path for AAUX FILE.
- absoluteAuxPath = AAUX_Gobal.ResolveAAUXFilePath(fPATH(VECTOfile),txtAdvancedAuxiliaryFile.Text )
+ absoluteAuxPath = mAAUX_Global.ResolveAAUXFilePath(fPATH(VECTOfile),txtAdvancedAuxiliaryFile.Text )
try
@@ -1378,9 +1378,9 @@ Private Sub btnBrowseAAUXFile_Click( sender As Object, e As EventArgs) Handles
assembly = DirectCast( cboAdvancedAuxiliaries.SelectedItem, cAdvancedAuxiliary)
'If supplied file valid, straight to config
- If AAUX_Gobal.ValidateAAUXFile( absoluteAuxPath,assembly.AssemblyName, assembly.AuxiliaryVersion, message )
+ If mAAUX_Global.ValidateAAUXFile( absoluteAuxPath,assembly.AssemblyName, assembly.AuxiliaryVersion, message )
- configResult=AAUX_Gobal.ConfigureAdvancedAuxiliaries(assembly.AssemblyName,assembly.AuxiliaryVersion,txtAdvancedAuxiliaryFile.Text,VECTOfile)
+ configResult=mAAUX_Global.ConfigureAdvancedAuxiliaries(assembly.AssemblyName,assembly.AuxiliaryVersion,txtAdvancedAuxiliaryFile.Text,VECTOfile)
else
@@ -1393,7 +1393,7 @@ Private Sub btnBrowseAAUXFile_Click( sender As Object, e As EventArgs) Handles
If fbAux.CustomDialog(absoluteAuxPath,False,False, tFbExtMode.ForceExt,False,"") Then
txtAdvancedAuxiliaryFile.Text = fFileWoDir(fbAux.Files(0), fPATH(vectoFile))
assembly= DirectCast( cboAdvancedAuxiliaries.SelectedItem, cAdvancedAuxiliary)
- AAUX_Gobal.ConfigureAdvancedAuxiliaries(assembly.AssemblyName,assembly.AuxiliaryVersion,txtAdvancedAuxiliaryFile.Text,VECTOfile)
+ mAAUX_Global.ConfigureAdvancedAuxiliaries(assembly.AssemblyName,assembly.AuxiliaryVersion,txtAdvancedAuxiliaryFile.Text,VECTOfile)
End If
End If
diff --git a/VECTO/Input Files/cGBX.vb b/VECTO/Input Files/cGBX.vb
index 984ad34660..e8748bd085 100644
--- a/VECTO/Input Files/cGBX.vb
+++ b/VECTO/Input Files/cGBX.vb
@@ -493,31 +493,31 @@ Public Class cGBX
'AA-TB
'Recalculate for Advanced Auxiliaries.
- AAUX_Gobal.ClutchEngaged = (Gear > 0)
+ mAAUX_Global.ClutchEngaged = (Gear > 0)
- AAUX_Gobal.Idle = False'(Gear = 0 And Not Pplus And Not Pminus)
+ mAAUX_Global.Idle = False'(Gear = 0 And Not Pplus And Not Pminus)
- AAUX_Gobal.InNeutral = (Gear = 0)
+ mAAUX_Global.InNeutral = (Gear = 0)
'Driveline Power = required power at clutch = power at wheels plus powertrain losses
'[kW]
'**** RL 7-7-15 ****
- AAUX_Gobal.EngineDrivelinePower = PeOut
+ mAAUX_Global.EngineDrivelinePower = PeOut
'[1/min]
- AAUX_Gobal.EngineSpeed = nU
+ mAAUX_Global.EngineSpeed = nU
'[Nm] (using Power => Torque conversion)
- AAUX_Gobal.EngineDrivelineTorque = nPeToM(EngineSpeed, EngineDrivelinePower)
+ mAAUX_Global.EngineDrivelineTorque = nPeToM(EngineSpeed, EngineDrivelinePower)
'Motoring power (< 0 !!!)
'[kW]
'** MULTIPLIED BY - TO GET POSITIVE VALUE
- AAUX_Gobal.EngineMotoringPower = - FLD(Gear).Pdrag(EngineSpeed)
+ mAAUX_Global.EngineMotoringPower = - FLD(Gear).Pdrag(EngineSpeed)
'Additional aux power from driving cycle (optional user input)
'[kW]
- AAUX_Gobal.PreExistingAuxPower = MODdata.Vh.Padd(t)
+ mAAUX_Global.PreExistingAuxPower = MODdata.Vh.Padd(t)
diff --git a/VECTO/MODcalc/cPower.vb b/VECTO/MODcalc/cPower.vb
index f9404aa0e5..90b2b42639 100644
--- a/VECTO/MODcalc/cPower.vb
+++ b/VECTO/MODcalc/cPower.vb
@@ -82,9 +82,9 @@ Public Class cPower
'AA-TB
'*************************************************************************
'Informs Power Calculation to aggregate fuel or not if in Advanced mode.
- AAUX_Gobal.RunningCalc=False
+ mAAUX_Global.RunningCalc=False
'Cycle Time in Seconds, set this in AAUX_GLOBAL.
- AAUX_Gobal.CycleTimeInSeconds= MODdata.tDim
+ mAAUX_Global.CycleTimeInSeconds= MODdata.tDim
'*************************************************************************
Dim MsgSrc As String
@@ -95,7 +95,7 @@ Public Class cPower
'Try and Initialise the Advanced Aux Model if selected.
If VEC.AuxiliaryAssembly<>"CLASSIC" then
WorkerMsg(tMsgID.Normal,"Initialising Advanced Auxiliaries Model", MsgSrc)
- If AAUX_Gobal.InitialiseAdvancedAuxModel(VEC.AdvancedAuxiliaryFilePath) then
+ If mAAUX_Global.InitialiseAdvancedAuxModel(VEC.AdvancedAuxiliaryFilePath) then
WorkerMsg(tMsgID.Normal,"Successfully Initialised Advanced Auxiliaries", MsgSrc)
else
WorkerMsg(tMsgID.Err,"FAILED to Initialised Advanced Auxiliaries", MsgSrc)
@@ -263,30 +263,30 @@ Public Class cPower
End If
'Clutch closed/engaged = True
- AAUX_Gobal.ClutchEngaged = (Gear > 0)
+ mAAUX_Global.ClutchEngaged = (Gear > 0)
- AAUX_Gobal.Idle = (Gear = 0 And Not Pplus And Not Pminus)
+ mAAUX_Global.Idle = (Gear = 0 And Not Pplus And Not Pminus)
- AAUX_Gobal.InNeutral = (Gear = 0)
+ mAAUX_Global.InNeutral = (Gear = 0)
'Driveline Power = required power at clutch = power at wheels plus powertrain losses
'[kW]
- AAUX_Gobal.EngineDrivelinePower = Pkup
+ mAAUX_Global.EngineDrivelinePower = Pkup
'[1/min]
- AAUX_Gobal.EngineSpeed = nU
+ mAAUX_Global.EngineSpeed = nU
'[Nm] (using Power => Torque conversion)
- AAUX_Gobal.EngineDrivelineTorque = nPeToM(EngineSpeed, EngineDrivelinePower)
+ mAAUX_Global.EngineDrivelineTorque = nPeToM(EngineSpeed, EngineDrivelinePower)
'Motoring power (< 0 !!!)
'[kW]
'*** NOTE THIS IS MULTIPLIED BY - to get a positive value
- AAUX_Gobal.EngineMotoringPower = - FLD(Gear).Pdrag(EngineSpeed)
+ mAAUX_Global.EngineMotoringPower = - FLD(Gear).Pdrag(EngineSpeed)
'Additional aux power from driving cycle (optional user input)
'[kW]
- AAUX_Gobal.PreExistingAuxPower = MODdata.Vh.Padd(t)
+ mAAUX_Global.PreExistingAuxPower = MODdata.Vh.Padd(t)
'TODO: HOW TO ALTER HERE FOR CLASSIC or ADVANCED
@@ -582,7 +582,7 @@ Public Class cPower
'AA-TB
'Informs Power Calculation to aggregate fuel or not if in Advanced mode.
- AAUX_Gobal.RunningCalc=true
+ mAAUX_Global.RunningCalc=true
'Abort if no speed given
@@ -1026,31 +1026,31 @@ lb_nOK:
'************************ ADVANCED AUXILIARIES STARTS **********************************************
'Clutch closed/engaged = True
'Note: Slipping clutch is also considered enganged.
- AAUX_Gobal.ClutchEngaged = (Clutch <> tEngClutch.Opened)
+ mAAUX_Global.ClutchEngaged = (Clutch <> tEngClutch.Opened)
'Note: Vehicles with Start/Stop will stop engine at vehicle stop => EngState0 = tEngState.Stopped
- AAUX_Gobal.Idle = (EngState0 = tEngState.Idle)
+ mAAUX_Global.Idle = (EngState0 = tEngState.Idle)
- AAUX_Gobal.InNeutral = (Gear = 0)
+ mAAUX_Global.InNeutral = (Gear = 0)
'Driveline Power = required power at clutch = power at wheels plus powertrain losses
'[kW]
- AAUX_Gobal.EngineDrivelinePower = Pclutch
+ mAAUX_Global.EngineDrivelinePower = Pclutch
'[1/min]
- AAUX_Gobal.EngineSpeed = nU
+ mAAUX_Global.EngineSpeed = nU
'[Nm] (using Power => Torque conversion)
- AAUX_Gobal.EngineDrivelineTorque = nPeToM(EngineSpeed, EngineDrivelinePower)
+ mAAUX_Global.EngineDrivelineTorque = nPeToM(EngineSpeed, EngineDrivelinePower)
'Motoring power (< 0 !!!)
'[kW]
'** NOTE THIS IS MULTIPLIED BY - to get a positive value.
- AAUX_Gobal.EngineMotoringPower = - FLD(Gear).Pdrag(EngineSpeed)
+ mAAUX_Global.EngineMotoringPower = - FLD(Gear).Pdrag(EngineSpeed)
'Additional aux power from driving cycle (optional user input)
'[kW]
- AAUX_Gobal.PreExistingAuxPower = MODdata.Vh.Padd(jz)
+ mAAUX_Global.PreExistingAuxPower = MODdata.Vh.Padd(jz)
'TODO: HOW TO ALTER HERE FOR CLASSIC or ADVANCED
@@ -1441,7 +1441,7 @@ lb_nOK:
'AA-TB
'Aggregate Fuel On Last Known Signals.
- If Not AAUX_Gobal.advancedAuxModel is nothing
+ If Not mAAUX_Global.advancedAuxModel is nothing
'EngineState ( used for start stop fueling adjustment )
@@ -1493,8 +1493,8 @@ lb_nOK:
'AA-TB
'Say Fuel Consumption at end of current cycle.
Dim fcLitres As single
- If Not AAUX_Gobal.advancedAuxModel is nothing
- fcLitres = AAUX_Gobal.advancedAuxModel.TotalFuelLITRES
+ If Not mAAUX_Global.advancedAuxModel is nothing
+ fcLitres = mAAUX_Global.advancedAuxModel.TotalFuelLITRES
WorkerMsg(tMsgID.Warn,"Aux Fuel In Litres=" & fcLitres,"Calc")
End If
@@ -1786,31 +1786,31 @@ lb_nOK:
'AA-TB
'Recalculate for Advanced Auxiliaries.
- AAUX_Gobal.ClutchEngaged = (Gear > 0)
+ mAAUX_Global.ClutchEngaged = (Gear > 0)
- AAUX_Gobal.Idle = (Gear = 0 And Not Pplus And Not Pminus)
+ mAAUX_Global.Idle = (Gear = 0 And Not Pplus And Not Pminus)
- AAUX_Gobal.InNeutral = (Gear = 0)
+ mAAUX_Global.InNeutral = (Gear = 0)
'Driveline Power = required power at clutch = power at wheels plus powertrain losses
'[kW]
'**** THIS IS NOT CORRECT< BUT NO PKU Variable is available at this point ****
- AAUX_Gobal.EngineDrivelinePower = Pwheel + fPlossGB(Pwheel, v, Gear, True) + fPlossDiff(Pwheel, v, True) + fPaG(v, a) + fPlossRt(v, Gear)
+ mAAUX_Global.EngineDrivelinePower = Pwheel + fPlossGB(Pwheel, v, Gear, True) + fPlossDiff(Pwheel, v, True) + fPaG(v, a) + fPlossRt(v, Gear)
'[1/min]
- AAUX_Gobal.EngineSpeed = nU
+ mAAUX_Global.EngineSpeed = nU
'[Nm] (using Power => Torque conversion)
- AAUX_Gobal.EngineDrivelineTorque = nPeToM(EngineSpeed, EngineDrivelinePower)
+ mAAUX_Global.EngineDrivelineTorque = nPeToM(EngineSpeed, EngineDrivelinePower)
'Motoring power (< 0 !!!)
'[kW]
'** MULTIPLIED BY - TO GET POSITIVE VALUE
- AAUX_Gobal.EngineMotoringPower = - FLD(Gear).Pdrag(EngineSpeed)
+ mAAUX_Global.EngineMotoringPower = - FLD(Gear).Pdrag(EngineSpeed)
'Additional aux power from driving cycle (optional user input)
'[kW]
- AAUX_Gobal.PreExistingAuxPower = MODdata.Vh.Padd(t)
+ mAAUX_Global.PreExistingAuxPower = MODdata.Vh.Padd(t)
@@ -1852,31 +1852,31 @@ lb_nOK:
'AA-TB
'Recalculate for Advanced Auxiliaries.
- AAUX_Gobal.ClutchEngaged = (Gear > 0)
+ mAAUX_Global.ClutchEngaged = (Gear > 0)
- AAUX_Gobal.Idle = (Gear = 0 And Not Pplus And Not Pminus)
+ mAAUX_Global.Idle = (Gear = 0 And Not Pplus And Not Pminus)
- AAUX_Gobal.InNeutral = (Gear = 0)
+ mAAUX_Global.InNeutral = (Gear = 0)
'Driveline Power = required power at clutch = power at wheels plus powertrain losses
'[kW]
'**** RL-7/1/15 ****
- AAUX_Gobal.EngineDrivelinePower = Pwheel + fPlossGB(Pwheel, v, Gear, True) + fPlossDiff(Pwheel, v, True) + fPaG(v, a) + fPlossRt(v, Gear)
+ mAAUX_Global.EngineDrivelinePower = Pwheel + fPlossGB(Pwheel, v, Gear, True) + fPlossDiff(Pwheel, v, True) + fPaG(v, a) + fPlossRt(v, Gear)
'[1/min]
- AAUX_Gobal.EngineSpeed = nU
+ mAAUX_Global.EngineSpeed = nU
'[Nm] (using Power => Torque conversion)
- AAUX_Gobal.EngineDrivelineTorque = nPeToM(EngineSpeed, EngineDrivelinePower)
+ mAAUX_Global.EngineDrivelineTorque = nPeToM(EngineSpeed, EngineDrivelinePower)
'Motoring power (< 0 !!!)
'[kW]
'** MULTIPLIED BY - TO GET POSITIVE VALUE
- AAUX_Gobal.EngineMotoringPower = - FLD(Gear).Pdrag(EngineSpeed)
+ mAAUX_Global.EngineMotoringPower = - FLD(Gear).Pdrag(EngineSpeed)
'Additional aux power from driving cycle (optional user input)
'[kW]
- AAUX_Gobal.PreExistingAuxPower = MODdata.Vh.Padd(t)
+ mAAUX_Global.PreExistingAuxPower = MODdata.Vh.Padd(t)
Pe = Pwheel + fPlossGB(Pwheel, v, Gear, True) + fPlossDiff(Pwheel, v, True) + fPaG(v, a) + fPlossRt(v, Gear) + fPaux(t, nU) + fPaMotSimple(t, Gear, v, a)
@@ -2561,14 +2561,14 @@ lb10:
try
- AAUX_Gobal.advancedAuxModel.Signals.ClutchEngaged = AAUX_Gobal.ClutchEngaged
- AAUX_Gobal.advancedAuxModel.Signals.EngineDrivelinePower = AAUX_Gobal.EngineDrivelinePower
- AAUX_Gobal.advancedAuxModel.Signals.EngineDrivelineTorque =AAUX_Gobal.EngineDrivelineTorque
- AAUX_Gobal.advancedAuxModel.Signals.EngineMotoringPower = AAUX_Gobal.EngineMotoringPower
- AAUX_Gobal.advancedAuxModel.Signals.EngineSpeed = AAUX_Gobal.EngineSpeed
- AAUX_Gobal.advancedAuxModel.Signals.PreExistingAuxPower = AAUX_Gobal.PreExistingAuxPower
- AAUX_Gobal.advancedAuxModel.Signals.Idle = AAUX_Gobal.Idle
- AAUX_Gobal.advancedAuxModel.Signals.InNeutral = AAUX_Gobal.InNeutral
+ mAAUX_Global.advancedAuxModel.Signals.ClutchEngaged = mAAUX_Global.ClutchEngaged
+ mAAUX_Global.advancedAuxModel.Signals.EngineDrivelinePower = mAAUX_Global.EngineDrivelinePower
+ mAAUX_Global.advancedAuxModel.Signals.EngineDrivelineTorque =mAAUX_Global.EngineDrivelineTorque
+ mAAUX_Global.advancedAuxModel.Signals.EngineMotoringPower = mAAUX_Global.EngineMotoringPower
+ mAAUX_Global.advancedAuxModel.Signals.EngineSpeed = mAAUX_Global.EngineSpeed
+ mAAUX_Global.advancedAuxModel.Signals.PreExistingAuxPower = mAAUX_Global.PreExistingAuxPower
+ mAAUX_Global.advancedAuxModel.Signals.Idle = mAAUX_Global.Idle
+ mAAUX_Global.advancedAuxModel.Signals.InNeutral = mAAUX_Global.InNeutral
'Power coming out of Advanced Model is in Watts.
diff --git a/VECTO/M_MAIN.vb b/VECTO/M_MAIN.vb
index d42d41a2a1..ae71861e63 100644
--- a/VECTO/M_MAIN.vb
+++ b/VECTO/M_MAIN.vb
@@ -294,7 +294,7 @@ lbSkip0:
'AA-TB
'SET CURRENT CYCLE FILE BEING USED IN AAUX
- AAUX_Gobal.CurrentCycleFile= CurrentCycleFile
+ mAAUX_Global.CurrentCycleFile= CurrentCycleFile
jsubcycle += 1
diff --git a/VECTO/My Project/Application.Designer.vb b/VECTO/My Project/Application.Designer.vb
index 88102260fa..1a72d9d049 100644
--- a/VECTO/My Project/Application.Designer.vb
+++ b/VECTO/My Project/Application.Designer.vb
@@ -1,10 +1,10 @@
'------------------------------------------------------------------------------
' <auto-generated>
-' Dieser Code wurde von einem Tool generiert.
-' Laufzeitversion:4.0.30319.269
+' This code was generated by a tool.
+' Runtime Version:4.0.30319.18444
'
-' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-' der Code erneut generiert wird.
+' Changes to this file may cause incorrect behavior and will be lost if
+' the code is regenerated.
' </auto-generated>
'------------------------------------------------------------------------------
@@ -14,10 +14,10 @@ Option Explicit On
Namespace My
- 'HINWEIS: Diese Datei wird automatisch generiert. Ändern Sie sie nicht direkt. Zum Ändern
- ' oder bei in dieser Datei auftretenden Buildfehlern wechseln Sie zum Projekt-Designer.
- ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Mein Projekt" im
- ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor.
+ 'NOTE: This file is auto-generated; do not modify it directly. To make changes,
+ ' or if you encounter build errors in this file, go to the Project Designer
+ ' (go to Project Properties or double-click the My Project node in
+ ' Solution Explorer), and make changes on the Application tab.
'
Partial Friend Class MyApplication
diff --git a/VECTO/My Project/Resources.Designer.vb b/VECTO/My Project/Resources.Designer.vb
index bf5f09ecc5..fbce27dc11 100644
--- a/VECTO/My Project/Resources.Designer.vb
+++ b/VECTO/My Project/Resources.Designer.vb
@@ -1,10 +1,10 @@
'------------------------------------------------------------------------------
' <auto-generated>
-' Dieser Code wurde von einem Tool generiert.
-' Laufzeitversion:4.0.30319.18444
+' This code was generated by a tool.
+' Runtime Version:4.0.30319.18444
'
-' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-' der Code erneut generiert wird.
+' Changes to this file may cause incorrect behavior and will be lost if
+' the code is regenerated.
' </auto-generated>
'------------------------------------------------------------------------------
@@ -15,12 +15,12 @@ Imports System
Namespace My.Resources
- 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
- '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
- 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
- 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+ 'This class was auto-generated by the StronglyTypedResourceBuilder
+ 'class via a tool like ResGen or Visual Studio.
+ 'To add or remove a member, edit your .ResX file then rerun ResGen
+ 'with the /str option, or rebuild your VS project.
'''<summary>
- ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+ ''' A strongly-typed resource class, for looking up localized strings, etc.
'''</summary>
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
@@ -33,7 +33,7 @@ Namespace My.Resources
Private resourceCulture As Global.System.Globalization.CultureInfo
'''<summary>
- ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+ ''' Returns the cached ResourceManager instance used by this class.
'''</summary>
<Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
@@ -47,8 +47,8 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
- ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+ ''' Overrides the current thread's CurrentUICulture property for all
+ ''' resource lookups using this strongly typed resource class.
'''</summary>
<Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Friend Property Culture() As Global.System.Globalization.CultureInfo
@@ -61,7 +61,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Actions_arrow_down_icon() As System.Drawing.Bitmap
Get
@@ -71,7 +71,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Actions_arrow_up_icon() As System.Drawing.Bitmap
Get
@@ -81,7 +81,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Actions_document_save_as_icon() As System.Drawing.Bitmap
Get
@@ -91,7 +91,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Actions_document_save_icon() As System.Drawing.Bitmap
Get
@@ -101,7 +101,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property application_add_icon() As System.Drawing.Bitmap
Get
@@ -111,7 +111,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property application_export_icon_small() As System.Drawing.Bitmap
Get
@@ -121,7 +121,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property blue_document_icon() As System.Drawing.Bitmap
Get
@@ -131,7 +131,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property export_icon() As System.Drawing.Bitmap
Get
@@ -141,7 +141,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property F_ENG() As System.Drawing.Bitmap
Get
@@ -151,7 +151,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property F_GBX() As System.Drawing.Bitmap
Get
@@ -161,7 +161,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property F_Graph() As System.Drawing.Bitmap
Get
@@ -171,7 +171,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property F_VECTO() As System.Drawing.Bitmap
Get
@@ -181,7 +181,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property F_VEH() As System.Drawing.Bitmap
Get
@@ -191,7 +191,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Help_icon() As System.Drawing.Bitmap
Get
@@ -201,7 +201,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
+ ''' Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
'''</summary>
Friend ReadOnly Property Icon2() As System.Drawing.Icon
Get
@@ -211,7 +211,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Information_icon() As System.Drawing.Bitmap
Get
@@ -221,7 +221,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property IVT_91x44() As System.Drawing.Bitmap
Get
@@ -231,7 +231,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property IVT_About() As System.Drawing.Bitmap
Get
@@ -241,7 +241,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property JRC_About() As System.Drawing.Bitmap
Get
@@ -251,7 +251,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property minus_circle_icon() As System.Drawing.Bitmap
Get
@@ -261,7 +261,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Misc_Tools_icon() As System.Drawing.Bitmap
Get
@@ -271,7 +271,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Open_icon() As System.Drawing.Bitmap
Get
@@ -281,7 +281,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Play_icon() As System.Drawing.Bitmap
Get
@@ -291,7 +291,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Play_icon_gray() As System.Drawing.Bitmap
Get
@@ -301,7 +301,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property plus_circle_icon() As System.Drawing.Bitmap
Get
@@ -311,7 +311,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Refresh_icon() As System.Drawing.Bitmap
Get
@@ -321,7 +321,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Status_dialog_password_icon() As System.Drawing.Bitmap
Get
@@ -331,7 +331,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Stop_icon() As System.Drawing.Bitmap
Get
@@ -341,7 +341,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property TUG_91x34() As System.Drawing.Bitmap
Get
@@ -351,7 +351,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property TUG_About() As System.Drawing.Bitmap
Get
@@ -361,7 +361,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property VECTO_About() As System.Drawing.Bitmap
Get
@@ -371,7 +371,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property VECTO_ENG() As System.Drawing.Bitmap
Get
@@ -381,7 +381,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property VECTO_GBX() As System.Drawing.Bitmap
Get
@@ -391,7 +391,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property VECTO_Mainform() As System.Drawing.Bitmap
Get
@@ -401,7 +401,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property VECTO_VECTO() As System.Drawing.Bitmap
Get
@@ -411,7 +411,7 @@ Namespace My.Resources
End Property
'''<summary>
- ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property VECTO_VEH() As System.Drawing.Bitmap
Get
diff --git a/VECTO/My Project/Settings.Designer.vb b/VECTO/My Project/Settings.Designer.vb
index 86c711c938..8d7702cb91 100644
--- a/VECTO/My Project/Settings.Designer.vb
+++ b/VECTO/My Project/Settings.Designer.vb
@@ -1,10 +1,10 @@
'------------------------------------------------------------------------------
' <auto-generated>
-' Dieser Code wurde von einem Tool generiert.
-' Laufzeitversion:4.0.30319.269
+' This code was generated by a tool.
+' Runtime Version:4.0.30319.18444
'
-' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-' der Code erneut generiert wird.
+' Changes to this file may cause incorrect behavior and will be lost if
+' the code is regenerated.
' </auto-generated>
'------------------------------------------------------------------------------
@@ -15,14 +15,14 @@ Option Explicit On
Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
- Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0"), _
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
-#Region "Funktion zum automatischen Speichern von My.Settings"
+#Region "My.Settings Auto-Save Functionality"
#If _MyType = "WindowsForms" Then
Private Shared addedHandler As Boolean
diff --git a/VECTO/My Project/app.manifest b/VECTO/My Project/app.manifest
index af3961de03..ce3465ea6d 100644
--- a/VECTO/My Project/app.manifest
+++ b/VECTO/My Project/app.manifest
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+ <assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
@@ -18,19 +18,19 @@
-->
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
</requestedPrivileges>
+ <applicationRequestMinimum>
+ <defaultAssemblyRequest permissionSetReference="Custom" />
+ <PermissionSet Unrestricted="true" ID="Custom" SameSite="site" />
+ </applicationRequestMinimum>
</security>
</trustInfo>
-
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- Eine Liste aller Windows-Versionen, mit denen die Anwendung kompatibel ist. Windows wählt automatisch die am stärksten kompatible Umgebung aus.-->
-
<!-- Wenn die Anwendung mit Windows 7 kompatibel ist, heben Sie die Kommentierung des folgenden supportedOS-Knotens auf.-->
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>-->
-
</application>
</compatibility>
-
<!-- Designs für allgemeine Windows-Steuerelemente und -Dialogfelder (Windows XP und höher) aktivieren -->
<!-- <dependency>
<dependentAssembly>
@@ -44,5 +44,4 @@
/>
</dependentAssembly>
</dependency>-->
-
-</asmv1:assembly>
+</asmv1:assembly>
\ No newline at end of file
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index 15f0e27bd5..1860a8f755 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -19,7 +19,12 @@
<UpgradeBackupLocation />
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkProfile />
- <PublishUrl>publish\</PublishUrl>
+ <SccProjectName>SAK</SccProjectName>
+ <SccLocalPath>SAK</SccLocalPath>
+ <SccAuxPath>SAK</SccAuxPath>
+ <SccProvider>SAK</SccProvider>
+ <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+ <PublishUrl>C:\Users\tb28\Documents\VectoOut\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
@@ -32,6 +37,7 @@
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
+ <PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -42,6 +48,9 @@
<OutputPath>bin\Debug\</OutputPath>
<DocumentationFile>VECTO.xml</DocumentationFile>
<NoWarn>41999,42016,42017,42018,42019,42032,42036</NoWarn>
+ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+ <WarningLevel>1</WarningLevel>
+ <UseVSHostingProcess>true</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>None</DebugType>
@@ -53,6 +62,7 @@
<NoWarn>41999,42016,42017,42018,42019,42032,42036</NoWarn>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<PlatformTarget>AnyCPU</PlatformTarget>
+ <WarningLevel>1</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>My Project\app.manifest</ApplicationManifest>
@@ -69,6 +79,7 @@
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
+ <WarningLevel>1</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<DefineTrace>true</DefineTrace>
@@ -80,6 +91,25 @@
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
+ <WarningLevel>1</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup>
+ <ManifestCertificateThumbprint>B392FDC8053AEBCC6B0860DD32DEC702EB46BD4A</ManifestCertificateThumbprint>
+ </PropertyGroup>
+ <PropertyGroup>
+ <ManifestKeyFile>VECTO_TemporaryKey.pfx</ManifestKeyFile>
+ </PropertyGroup>
+ <PropertyGroup>
+ <GenerateManifests>false</GenerateManifests>
+ </PropertyGroup>
+ <PropertyGroup>
+ <SignManifests>false</SignManifests>
+ </PropertyGroup>
+ <PropertyGroup>
+ <TargetZone>LocalIntranet</TargetZone>
+ </PropertyGroup>
+ <PropertyGroup>
+ <SignAssembly>false</SignAssembly>
</PropertyGroup>
<ItemGroup>
<Reference Include="itextsharp">
@@ -186,7 +216,7 @@
<Compile Include="cDelaunayMap.vb" />
<Compile Include="cDEV.vb" />
<Compile Include="File Browser\cFileBrowser.vb" />
- <Compile Include="AAUX_Gobal.vb" />
+ <Compile Include="mAAUX_Global.vb" />
<Compile Include="MODcalc\cVh.vb" />
<Compile Include="File Browser\FB_Dialog.designer.vb">
<DependentUpon>FB_Dialog.vb</DependentUpon>
@@ -366,6 +396,7 @@
<CustomToolNamespace>My</CustomToolNamespace>
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
</None>
+ <None Include="VECTO_TemporaryKey.pfx" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
@@ -410,11 +441,6 @@
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="Resources\application-export-icon-small.png" />
diff --git a/VECTO/VECTO_TemporaryKey.pfx b/VECTO/VECTO_TemporaryKey.pfx
new file mode 100644
index 0000000000000000000000000000000000000000..f778dc3527a6d2b20d0ffb1290683a8de66cc447
GIT binary patch
literal 1644
zcmY*Yc{o&S7(a97IE?MmP*fP%L-)wOg)F&K!W1`Z#I+{NG~LM1O_Q+|$&wmFk!X^!
z#9Uk4BFaumc5_2oF3GMM_tbN5Jw4y^e(&%7y}$Q+zCYd{LWcuD3>Klo$}nzwtbOdV
z7)B6tgAPkWbXXFl#Sl7{`$G#`2+^@OQTjR>S+K}|Q=-Bc@CF^^B6P4E*$NB)Pos~E
zLqZb`QyQuv*Y<&+U^heuQ)rpJO@~$7m;P+#bjEI7en&8UiS@b6_Z!ekjkhp(W0}%0
zkSgQg-cAc)(WlK}3!Zv$l=j3Sqtj}JcUL9tRBn2hpPL`U`1q;SI<tlxP5SfmFY7T)
zC9Y|)cSf<rWaUqlytu{3X|#GdRX<8%cIUo*+7L`*FxFyZ1zf==7t$(v#XXe*4#oH@
z;>Fu<u5X-ne+LFQj5{{<)l90!Q8ES3uXkTQu*K-ZipykTmWA8xx#l?<+qrG!ajOOu
z-wn3dD;0^Zn9p>wQ<HUXEO`}1_vi$5YzmacA6XQB8LjNVp0S>y<cxFPitKt4bA~)s
zR#0(NK3GWM&1|~Npa*}T6LM_5S@r4M-0|^|A%|q~@@ivUl~hyey{BeTJ!-!23!7|W
z{O;GCwzf_5WY-6_Q08Z@ToFD8Xn9YvAC)dm$5ynE(<5HNZV61|Qjs$pGN}Y^T2aKk
zie|jh4A$N6?Up-VW<YCrOIhSfK0I9=p)rU%E=e_=Sbn(WD$$?`aeA*7{4nL-(Na+X
zoQe7wg$uLV1Bx7La@%<$Rh{Q{BkWnx34+Gip{hopaDkg|nbO&DOHbm#v|q>bauTuL
zt!4LtS<>aPyhJ5eQIqC;#fnhMUtT16-(4~6(gt4pV!t&ddMxJGn2bQfEMoGVw*61A
zj!h&mJ}^hE_0r^#(hP(~wRugGX*QjgCa5%rZ$=VEj<6GwEsc!L3YJJ7Vd)2vbq4e)
zY$du_8+_2xC*e<x?Ecu8Q?`MtcBl4Ikc(@$CpnUN>%(Z4$go$)3E{rMdyUQMQgUwZ
z9OT(tUhApK>Mg#{SaL0T-XPg;M*RxkJZ}y1z5agl(88ze+QRd5!s%sQ1}n}Nb<Xu5
z_-|{Dlh%PD2m=5Ba`-zbrL$jt9}o%H0aj?}0)}Yp1grsVv_jCl6GeJ}K6;E$Wc5{{
zhay{))ddVtl@XwW>UN{p5S=)KkYSuAjDaw8LrIK|ll*?b0XPPD15_XsIEjWI@H;>N
z4xslJCIs+DD{B--02Gu9MQbYHh2ns(Qv|^2t1b+!d;nj7iaOEp+wTQo)SQ+mWd>pZ
zH0giuV1BSG{Kc-rRr*hT(nWl~*fp9C3f1+RYMP`;)ovi#t{I1wb>#?IEwutXoi$cW
zd52m4j7hx$J)-C*<x4dcoDYdMFej{pTI2U|5LEvt`nWyiH5XY5JaS@oPsXHnZm%~q
z+?m?{)^TwaJmhT22_JIu;y<4qvUyp5Wk9^&c`??B`MG#p5#RN?z+>;~Hk<<s8z*8u
z8JD<>ll*x!|8Qo|fU?S-q}>T)HEGs_*pDH}Zg~+|d4uaDrS#d1P#&BeWr<`(JlpG7
zZ^u}`d*&GqPunfeR8LtM<}N*|d**x4eK1o<pV?ljS9Z2<A|m^5w*aTuot0IptxtFL
z)9zfd^<eP=>qh7GG#j=ne1gQAGXnS+nE}FcO=}l*<0Usrz!ollSuFZ$@(sFzgr{Pq
zF6_$B&^9e*D%o+Q@7K)fA4{!U!*CR@4*dfPR%S5+gEa88y(7QmQmnG5!EqsEd3v*o
zW8O6AGGg{eb#})r4_sbZ=P6&6I&INK^j~B6#0NsX{Z0w>+<6CX&0?Li>K#nu%ssEf
z8t?mk`X%AaxbhIs9mLgB8^Y5FA6~519=h(&uO$|3lcg3UmmTE25bU`tEThDw)ViCr
z7r&X;(h>l+1_-k<E&jmVeZ;CT-<TxOCXtxG(4M_v7`k;)Er*ok&Zu}VJH4#E9SmaR
z{kDlvEM~_#by8_cxuXErVrJAM$F(s>Oc4b{5EjrB$AX(7sp~rmcP-d+r>oR%pC)QV
i#pykKhl8XTfdjz}A@RkwU6B;mlB51fO2MQri}WwgB*Fdw
literal 0
HcmV?d00001
diff --git a/VECTO/cVSUM.vb b/VECTO/cVSUM.vb
index 68637968be..fca355d9cc 100644
--- a/VECTO/cVSUM.vb
+++ b/VECTO/cVSUM.vb
@@ -656,6 +656,15 @@ Class cVSUM
End If
+ If( Not VEC is Nothing AndAlso VEC.AuxiliaryAssembly<>"CLASSIC") then
+ 'Advanced Auxiliaries I.E. Bus Auxiliaries.
+ AddToVSUM("\\AA_FC_LHR","AA FC L/H","L/R",false)
+ AddToVSUM("\\AA_FC_GHR","AA FC G/H","G/R",false)
+
+
+
+ End if
+
'Sort
iDim = VSUMentryList.Count - 1
diff --git a/VECTO/AAUX_Gobal.vb b/VECTO/mAAUX_Global.vb
similarity index 99%
rename from VECTO/AAUX_Gobal.vb
rename to VECTO/mAAUX_Global.vb
index a5735a38ec..cd6434918c 100644
--- a/VECTO/AAUX_Gobal.vb
+++ b/VECTO/mAAUX_Global.vb
@@ -2,7 +2,7 @@
Imports VectoAuxiliaries
Imports System.IO
-Module AAUX_Gobal
+Module mAAUX_Global
public ClutchEngaged As Boolean
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M10.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M10.vb
index 4a42ba3be2..c6825b8908 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M10.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M10.vb
@@ -62,12 +62,12 @@ End Function
Public ReadOnly Property BaseFuelConsumptionWithAverageAuxiliaryLoads As Single Implements IM10.AverageLoadsFuelConsumptionInterpolatedForPneumatics
Get
- Return Interpolate(InterpolationType.NonSmartPneumtaics)
+ Return If( Single.IsNaN( Interpolate(InterpolationType.NonSmartPneumtaics)),0,Interpolate(InterpolationType.NonSmartPneumtaics))
End Get
End Property
Public ReadOnly Property FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand As Single Implements IM10.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand
Get
- Return Interpolate( InterpolationType.SmartPneumtaics)
+ Return If( Single.IsNaN(Interpolate( InterpolationType.SmartPneumtaics)),0,Interpolate(InterpolationType.SmartPneumtaics))
End Get
End Property
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M11.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M11.vb
index a4d8c39723..6ed973fe87 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M11.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M11.vb
@@ -36,11 +36,9 @@ Public Class M11
'Staging Calculations
- Private Function Sum0( rpm As Single ) As Single
+ Private Function Sum0( byval rpm As Single ) As Single
- If rpm= 0 then
- Return 0
- End If
+ If rpm<1 then rpm=1
Return rpm/RPM_to_RadiansPerSecond
@@ -146,15 +144,22 @@ End Property
'Add to Aggregates dependent on cycle step time.
Sub CycleStep(Optional stepTimeInSeconds As Single = 0.0) Implements IM11.CycleStep
- AG1 = AG1 + ( stepTimeInSeconds * sum1 * SW1 )
- AG2 = AG2 + ( stepTimeInSeconds * M8.SmartElectricalAlternatorPowerGenAtCrank * SW1 )
- AG3 = AG3 + ( stepTimeInSeconds * m6.AvgPowerDemandAtCrankFromElectricsIncHVAC )
- AG6 = AG6 + ( stepTimeInSeconds * m6.AvgPowerDemandAtCrankFromElectricsIncHVAC * SW1 )
+ 'S/S Insensitive
+ AG3+= ( stepTimeInSeconds * m6.AvgPowerDemandAtCrankFromElectricsIncHVAC )
- 'These need to be divided by 3600 as the Fuel Map output is in Grams/Second.
- AG4 = AG4 + ( stepTimeInSeconds * sum7 / 3600 * SW1 )
- AG5 = AG5 + ( stepTimeInSeconds * Sum8 / 3600 * SW1 )
+ If Signals.EngineStopped then return
+
+ 'S/S Sensitive
+ AG1+= ( stepTimeInSeconds * sum1 * SW1 )
+ AG2+= ( stepTimeInSeconds * M8.SmartElectricalAlternatorPowerGenAtCrank * SW1 )
+
+ AG6+= ( stepTimeInSeconds * m6.AvgPowerDemandAtCrankFromElectricsIncHVAC * SW1 )
+
+ 'These need to be divided by 3600 as the Fuel Map output is in Grams/Second.
+ AG4+= ( stepTimeInSeconds * sum7 / 3600 * SW1 )
+ AG5+= ( stepTimeInSeconds * Sum8 / 3600 * SW1 )
+
End Sub
'Constructor
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M12.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M12.vb
index 45dabb18fd..85e67a2161 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M12.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M12.vb
@@ -34,7 +34,7 @@ Dim TanTeta as Single = (P2.Y-P1.Y)/(P2.X-P1.X)
IP5y = P1.Y + ( TanTeta * IP5x )
-Return IP5Y
+Return If( Single.IsNaN(IP5Y),0, IP5y)
End Function
@@ -51,7 +51,7 @@ Dim TanTeta as Single = (P3.Y-P1.Y)/(P3.X-P1.X)
IP5y = P1.Y + ( TanTeta * IP5x )
-Return IP5Y
+Return If( Single.IsNaN(IP5Y),0, IP5y)
End Function
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb
index f57d61c95b..4ac176cf9c 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M9.vb
@@ -68,11 +68,9 @@ Private Signals As ISignals
'Staging Calculations
-Private Function S0( rpm As Single ) As Single
+Private Function S0( byval rpm As Single ) As Single
- If rpm=0 then
- Return 0.00001
- End If
+ If rpm<1 then rpm=1
Return rpm / RPM_TO_RADS_PER_SECOND
@@ -164,6 +162,8 @@ End Property
'Clear down at the beginning of a cycle.
Public Sub CycleStep(Optional stepTimeInSeconds As Single = 0.0) Implements IM9.CycleStep
+ If Signals.EngineStopped then return
+
_LitresOfAirCompressorOnContinuallyAggregate +=stepTimeInSeconds* M4.GetFlowRate * sw1
_LitresOfAirCompressorOnOnlyInOverrunAggregate +=stepTimeInSeconds * s10 * sw1
_TotalCycleFuelConsumptionCompressorOnContinuouslyAggregate+= stepTimeInSeconds * s11 * sw1
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/M0_NonSmart_AlternatorsSetEfficiency.vb b/VECTOAux/VectoAuxiliaries/Electrics/M0_NonSmart_AlternatorsSetEfficiency.vb
index b37f103f3c..4f43c93416 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/M0_NonSmart_AlternatorsSetEfficiency.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/M0_NonSmart_AlternatorsSetEfficiency.vb
@@ -41,8 +41,7 @@ Public Class M0_NonSmart_AlternatorsSetEfficiency
Public ReadOnly Property AlternatorsEfficiency As Single Implements IM0_NonSmart_AlternatorsSetEfficiency.AlternatorsEfficiency
Get
- 'Sanity Check.
- If _signals.EngineSpeed < 1 Then Return 0
+
Dim baseCurrentDemandAmps As Single = _electricalConsumersList.GetTotalAverageDemandAmps(True)
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
index 80118ac0c6..dba228db01 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
@@ -62,6 +62,8 @@ Public sub InterpolatedCornersBothMidPreviousTest(ByVal amps as single, ByVal r
End Sub
+
+
<Test()> _
<TestCase(18.5f, 1750, 0.6587500f)> _
<TestCase(40, 1750, 0.4736750f)> _
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
index 15f1fb1a75..1791559c24 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M11Tests.vb
@@ -70,6 +70,66 @@ Public Sub InputOutputValues( IP1 As single,
+End Sub
+
+
+<Test()> _
+<TestCase(1,50,60,70,80,90,1500,True , 0, 0,60,0 ,0 ,0)>
+Public Sub UnaggregatedInputOutputValues( IP1 As single,
+ IP2 As single,
+ IP3 As single,
+ IP4 As single,
+ IP5 As single,
+ IP6 As single,
+ IP7 As single,
+ IP8 As Boolean,
+ OUT1 As single,
+ OUT2 As single,
+ OUT3 As single,
+ OUT4 As single,
+ OUT5 As single,
+ OUT6 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 )
+ sgnlsMock.Setup( Function(x) x.EngineStopped) .Returns( IP8 )
+
+
+ '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)
+
+
+ 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)
+ Assert.AreEqual( Math.Round(CType(target.StopStartSensitiveTotalCycleElectricalDemand,Decimal),7),OUT6)
+
+
+
End Sub
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
index 05857a2bc5..74f2bc7936 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb
@@ -45,6 +45,10 @@ M10Mock.Setup( Function(x) x.AverageLoadsFuelConsumptionInterpolatedForPneumatic
End Sub
+
+
+
+
End Class
--
GitLab