ADDING DIAGNOSTIC OUTPUTS TO PUBLIC ADVANCEDAUXILIARIES & cMOD IN VECTO

git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C1703

AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj

@@ -67,8 +67,10 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Diagnostics.vb" />
     <Compile Include="Enumerations.vb" />
     <Compile Include="IAdvancedAuxiliaries.vb" />
+    <Compile Include="IDiagnostics.vb" />
     <Compile Include="ISignals.vb" />
     <Compile Include="IAuxiliaryEvent.vb" />
     <Compile Include="IVectoInputs.vb" />

AdvancedAuxiliaryInterfaces/Diagnostics.vb

+
+
+Public Class Diagnostics
+Implements IDiagnostics
+
+
+    Public Property AA_CompressorFlag As Integer Implements IDiagnostics.AA_CompressorFlag
+
+    Public Property AA_CompressorFlowRate_LitrePerSec As Single Implements IDiagnostics.AA_CompressorFlowRate_LitrePerSec
+
+    Public Property AA_EngineIdleFlag As Integer Implements IDiagnostics.AA_EngineIdleFlag
+
+    Public Property AA_NonSmartAlternatorsEfficiency As Single Implements IDiagnostics.AA_NonSmartAlternatorsEfficiency
+
+    Public Property AA_OverrunFlag As Integer Implements IDiagnostics.AA_OverrunFlag
+
+    Public Property AA_SmartIdleAlternatorsEfficiency As Single Implements IDiagnostics.AA_SmartIdleAlternatorsEfficiency
+
+    Public Property AA_SmartIdleCurrent_Amps As Single Implements IDiagnostics.AA_SmartIdleCurrent_Amps
+
+    Public Property AA_SmartOverrunAlternatorEfficiency As Single Implements IDiagnostics.AA_SmartOverrunAlternatorEfficiency
+
+    Public Property AA_SmartOverrunCurrent_Amps As Single Implements IDiagnostics.AA_SmartOverrunCurrent_Amps
+
+    Public Property AA_SmartTractionAlternatorEfficiency As Single Implements IDiagnostics.AA_SmartTractionAlternatorEfficiency
+
+    Public Property AA_SmartTractionCurrent_Amps As Single Implements IDiagnostics.AA_SmartTractionCurrent_Amps
+
+    Public Property AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams As Single Implements IDiagnostics.AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams
+
+    Public Property AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres As Single Implements IDiagnostics.AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres
+
+
+End Class
+

AdvancedAuxiliaryInterfaces/IAdvancedAuxiliaries.vb

@@ -6,11 +6,27 @@ Public Interface IAdvancedAuxiliaries
 
 'Information
 ReadOnly Property Running          As boolean
-Readonly Property TotalFuelGRAMS   As Single
-Readonly Property TotalFuelLITRES  As single
+
 ReadOnly Property AuxiliaryName    As String
 ReadOnly Property AuxiliaryVersion As String
 
+ReadOnly Property AA_NonSmartAlternatorsEfficiency As single?
+Readonly Property AA_SmartIdleCurrent_Amps As single?
+Readonly Property AA_SmartIdleAlternatorsEfficiency As single?
+ReadOnly Property AA_SmartTractionCurrent_Amps As single?
+ReadOnly Property AA_SmartTractionAlternatorEfficiency As single?
+ReadOnly Property AA_SmartOverrunCurrent_Amps As Single?
+Readonly Property AA_SmartOverrunAlternatorEfficiency As Single?
+Readonly Property AA_CompressorFlowRate_LitrePerSec As Single?
+ReadOnly Property AA_OverrunFlag As integer?
+ReadOnly Property AA_EngineIdleFlag As integer?
+ReadOnly Property AA_CompressorFlag As integer?
+Readonly Property AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams As single?
+ReadOnly Property AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres As single?
+
+Readonly Property TotalFuelGRAMS   As Single
+Readonly Property TotalFuelLITRES  As single
+
 
 'Static Values
 property VectoInputs As IVectoInputs

AdvancedAuxiliaryInterfaces/IDiagnostics.vb

+Public Interface IDiagnostics
+
+
+
+Property AA_NonSmartAlternatorsEfficiency As single
+Property AA_SmartIdleCurrent_Amps As single
+Property AA_SmartIdleAlternatorsEfficiency As single
+Property AA_SmartTractionCurrent_Amps As single
+Property AA_SmartTractionAlternatorEfficiency As single
+Property AA_SmartOverrunCurrent_Amps As Single
+Property AA_SmartOverrunAlternatorEfficiency As Single
+Property AA_CompressorFlowRate_LitrePerSec As Single
+Property AA_OverrunFlag As integer
+Property AA_EngineIdleFlag As integer
+Property AA_CompressorFlag As integer
+Property AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams As single
+Property AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres As single
+
+
+
+End Interface

AdvancedAuxiliaryInterfaces/ISignals.vb

@@ -8,6 +8,7 @@ Property ClutchEngaged As Boolean
 Property EngineSpeed as integer
 Property SmartPneumatics As Boolean
 Property TotalCycleTimeSeconds As Integer
+Property CurrentCycleTimeInSeconds As Integer
 property EngineDrivelineTorque as single
 Property Idle As Boolean
 Property InNeutral As Boolean

AdvancedAuxiliaryInterfaces/Signals.vb

@@ -36,6 +36,8 @@ Implements ISignals
 
     Public Property TotalCycleTimeSeconds As Integer Implements ISignals.TotalCycleTimeSeconds
 
+    public Property CurrentCycleTimeInSeconds As Integer Implements ISignals.CurrentCycleTimeInSeconds
+
     Public Property PreExistingAuxPower As Single Implements ISignals.PreExistingAuxPower
 
     Public Property Idle As Boolean Implements ISignals.Idle

VECTO/GUI/F_VECTO.vb

@@ -1382,8 +1382,6 @@ Private Sub btnBrowseAAUXFile_Click( sender As Object,  e As EventArgs) Handles
                   
                   configResult=AAUX_Gobal.ConfigureAdvancedAuxiliaries(assembly.AssemblyName,assembly.AuxiliaryVersion,txtAdvancedAuxiliaryFile.Text,VECTOfile)
 
-                  dim a=2
-
                else
 
                 'txtAdvancedAuxiliaryFile.Text="INVALIDFILENAME"        

VECTO/MODcalc/cMOD.vb

@@ -40,6 +40,23 @@ Public Class cMOD
     Public Pclutch As List(Of Single)
     Public Grad As List(Of Single)
 
+    'AA-TB
+    public AA_NonSmartAlternatorsEfficiency                       as List(Of single? )
+    public AA_SmartIdleCurrent_Amps                               as List(Of single? )
+    public AA_SmartIdleAlternatorsEfficiency                      as List(Of single? )
+    public AA_SmartTractionCurrent_Amps                           as List(Of single? )
+    public AA_SmartTractionAlternatorEfficiency                   as List(Of single? )
+    public AA_SmartOverrunCurrent_Amps                            as List(Of single? )
+    public AA_SmartOverrunAlternatorEfficiency                    as List(Of single? )
+    public AA_CompressorFlowRate_LitrePerSec                      as List(Of single? )
+    public AA_OverrunFlag                                         as List(Of integer?)
+    public AA_EngineIdleFlag                                      as List(Of integer?)
+    public AA_CompressorFlag                                      as List(Of integer?)
+    public AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams        as List(Of single? )
+    public AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres       as List(Of single? )
+
+
+
     Public EngState As List(Of tEngState)
 
     'Vehicle
@@ -76,6 +93,23 @@ Public Class cMOD
         Vh = New cVh
         CylceKin = New cCycleKin
 
+
+        'AA-TB
+        AA_NonSmartAlternatorsEfficiency                    = new  List(Of single? )
+        AA_SmartIdleCurrent_Amps                            = new  List(Of single? )
+        AA_SmartIdleAlternatorsEfficiency                   = new  List(Of single? )
+        AA_SmartTractionCurrent_Amps                        = new  List(Of single? )
+        AA_SmartTractionAlternatorEfficiency                = new  List(Of single? )
+        AA_SmartOverrunCurrent_Amps                         = new  List(Of single? )
+        AA_SmartOverrunAlternatorEfficiency                 = new  List(Of single? )
+        AA_CompressorFlowRate_LitrePerSec                   = new  List(Of single? )
+        AA_OverrunFlag                                      = new  List(Of integer?)
+        AA_EngineIdleFlag                                   = new  List(Of integer?)
+        AA_CompressorFlag                                   = new  List(Of integer?)
+        AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams     = new  List(Of single? )
+        AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres    = new  List(Of single? )
+
+
         Proll = New List(Of Single)
         Psum = New List(Of Single)
         Pstg = New List(Of Single)

VECTO/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by entering "*" in them:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.0.4.0")> 
-<Assembly: AssemblyFileVersion("2.0.4.0")> 
+<Assembly: AssemblyVersion("2.1.4.0")> 
+<Assembly: AssemblyFileVersion("2.1.4.0")> 

VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb

@@ -9,8 +9,11 @@ Public Class AdvancedAuxiliaries
  Implements IAdvancedAuxiliaries
 
 
+
+
     Private  auxConfig As AuxiliaryConfig
 
+
     'Supporting classes which may generate event messages
     Private WithEvents compressorMap As ICompressorMap
     Private Withevents alternatorMap  As IAlternatorMap 
@@ -60,6 +63,7 @@ Public Class AdvancedAuxiliaries
     'Initialise Model
     Public Sub Initialise( auxPath  As String )
 
+      Signals.CurrentCycleTimeInSeconds=0
       auxConfig = New AuxiliaryConfig(auxPath)
       
       'Pass some signals from config to Signals. ( These are stored in the configuration but shared in the signal distribution around modules )
@@ -183,6 +187,10 @@ End Sub
        M9.CycleStep( seconds )      
        M11.CycleStep( seconds )
 
+       'Used in the fuel aggregated output on M13 ( Sum 5 )
+       Signals.CurrentCycleTimeInSeconds+=1
+     
+       Return true
      
     End Function
 
@@ -196,7 +204,9 @@ End Sub
           
 
        Initialise(auxFilePath)   
-       'CycleStep( Signals.TotalCycleTimeSeconds, message)
+       
+       'TODO:Modify Initialise to return a Bool.
+       Return true     
 
     End Function
 
@@ -277,6 +287,88 @@ End Sub
 
     End Function
 
+    'Diagnostic Signals
+
+    Public ReadOnly Property AA_NonSmartAlternatorsEfficiency As Single? Implements IAdvancedAuxiliaries.AA_NonSmartAlternatorsEfficiency
+        Get
+          Return M0.AlternatorsEfficiency
+        End Get
+    End Property
+
+    Public ReadOnly Property AA_SmartIdleCurrent_Amps As Single? Implements IAdvancedAuxiliaries.AA_SmartIdleCurrent_Amps
+        Get
+         Return M05.SmartIdleCurrent
+        End Get
+    End Property
+
+    Public ReadOnly Property AA_SmartIdleAlternatorsEfficiency As Single? Implements IAdvancedAuxiliaries.AA_SmartIdleAlternatorsEfficiency
+        Get
+         Return M05.AlternatorsEfficiencyIdleResultCard
+        End Get
+    End Property
+
+    Public ReadOnly Property AA_SmartTractionCurrent_Amps As Single? Implements IAdvancedAuxiliaries.AA_SmartTractionCurrent_Amps
+        Get
+         Return M05.SmartTractionCurrent
+        End Get
+    End Property
+
+    Public ReadOnly Property AA_SmartTractionAlternatorEfficiency As Single? Implements IAdvancedAuxiliaries.AA_SmartTractionAlternatorEfficiency
+        Get
+         Return AA_SmartTractionAlternatorEfficiency
+        End Get
+    End Property
+
+    Public ReadOnly Property AA_SmartOverrunCurrent_Amps As Single? Implements IAdvancedAuxiliaries.AA_SmartOverrunCurrent_Amps
+        Get
+         Return M05.SmartOverrunCurrent
+        End Get
+    End Property
+
+    Public ReadOnly Property AA_SmartOverrunAlternatorEfficiency As Single? Implements IAdvancedAuxiliaries.AA_SmartOverrunAlternatorEfficiency
+        Get
+         Return M05.AlternatorsEfficiencyOverrunResultCard
+        End Get
+    End Property
+
+    Public ReadOnly Property AA_CompressorFlowRate_LitrePerSec As Single? Implements IAdvancedAuxiliaries.AA_CompressorFlowRate_LitrePerSec
+        Get
+         Return  M4.GetAveragePowerDemandPerCompressorUnitFlowRate
+        End Get
+    End Property
+
+    Public ReadOnly Property AA_OverrunFlag As Integer? Implements IAdvancedAuxiliaries.AA_OverrunFlag
+        Get
+         Return M6.OverrunFlag
+        End Get
+    End Property
+
+    Public ReadOnly Property AA_EngineIdleFlag As Integer? Implements IAdvancedAuxiliaries.AA_EngineIdleFlag
+        Get
+         Return  Signals.Idle
+        End Get
+    End Property
+
+    Public ReadOnly Property AA_CompressorFlag As Integer? Implements IAdvancedAuxiliaries.AA_CompressorFlag
+        Get
+         Return M8.CompressorFlag
+        End Get
+    End Property
+
+    Public ReadOnly Property AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams As Single? Implements IAdvancedAuxiliaries.AA_TotalCycleFC_BeforeSSandWHTCcorrection_Grams
+        Get
+         Return M13.TotalCycleFuelConsumptionGrams
+        End Get
+    End Property
+
+    Public ReadOnly Property AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres As Single? Implements IAdvancedAuxiliaries.AA_TotalCycleFC_BeforeSSandWHTCcorrection_Litres
+        Get
+         Return M13.TotalCycleFuelConsumptionLitres
+        End Get
+    End Property
+
+
+
 
 
 End Class

VECTOAux/VectoAuxiliaries/DownstreamModules/IM13.vb

 
-Imports AdvancedAuxiliaryInterfaces.Electrics
-Imports AdvancedAuxiliaryInterfaces.Pneumatics
-Imports AdvancedAuxiliaryInterfaces.Hvac
+Imports VectoAuxiliaries.Electrics
+Imports VectoAuxiliaries.Pneumatics
+Imports VectoAuxiliaries.Hvac
 
 Namespace DownstreamModules
 

VECTOAux/VectoAuxiliaries/DownstreamModules/IM7.vb

 
-Imports AdvancedAuxiliaryInterfaces.Electrics
-Imports AdvancedAuxiliaryInterfaces.Pneumatics
-Imports AdvancedAuxiliaryInterfaces.Hvac
+Imports VectoAuxiliaries.Electrics
+Imports VectoAuxiliaries.Pneumatics
+Imports VectoAuxiliaries.Hvac
 
 Namespace DownstreamModules
 

VECTOAux/VectoAuxiliaries/DownstreamModules/IM8.vb

 
-Imports AdvancedAuxiliaryInterfaces.Electrics
-Imports AdvancedAuxiliaryInterfaces.Pneumatics
-Imports AdvancedAuxiliaryInterfaces.Hvac
+Imports VectoAuxiliaries.Electrics
+Imports VectoAuxiliaries.Pneumatics
+Imports VectoAuxiliaries.Hvac
 
 Namespace DownstreamModules
 

VECTOAux/VectoAuxiliaries/DownstreamModules/M13.vb

@@ -37,7 +37,7 @@ Private readonly Property Sum4 As Single
 End Property
 Private readonly Property Sum5 As Single
     Get
-     Return  ( m1.HVACFuelingLitresPerHour * ( signals.TotalCycleTimeSeconds/3600)) * FUEL_DENSITY_L3
+     Return  ( m1.HVACFuelingLitresPerHour * ( signals.CurrentCycleTimeInSeconds/3600)) * FUEL_DENSITY_L3
     End Get
 End Property
 Private ReadOnly Property Sum6 As Single

VECTOAux/VectoAuxiliaries/Electrics/AlternatorMap.vb

@@ -182,7 +182,7 @@ Implements IAlternatorMap
     End Function
     Public Function ReturnDefaultMapValueTests() As String
 
-        Dim sb = New StringBuilder()
+        Dim sb  As StringBuilder = New StringBuilder()
         Dim x, y As Single
 
         'All Sector Values

VECTOAux/VectoAuxiliaries/Electrics/ElectricsUserInputsConfig.vb

-Imports AdvancedAuxiliaryInterfaces.Electrics
+Imports VectoAuxiliaries.Electrics
 Namespace Electrics
 
 Public Class ElectricsUserInputsConfig

VECTOAux/VectoAuxiliaries/Electrics/IElectricsUserInputsConfig.vb

-Imports AdvancedAuxiliaryInterfaces.Electrics
+Imports VectoAuxiliaries.Electrics
 
 Namespace Electrics
 

VECTOAux/VectoAuxiliaries/Electrics/ResultCard.vb

-Imports AdvancedAuxiliaryInterfaces.Electrics
+Imports VectoAuxiliaries.Electrics
 
 Namespace Electrics
 

VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb

-Imports AdvancedAuxiliaryInterfaces.Pneumatics
+Imports VectoAuxiliaries.Pneumatics
 
 Namespace Pneumatics
 

VECTOAux/VectoAuxiliaries/Pneumatics/M4_AirCompressor.vb

@@ -55,15 +55,6 @@ Namespace Pneumatics
             End Set
         End Property
 
-        ''' <summary>
-        ''' Creates a new instance of the AirCompressor Class
-        ''' </summary>
-        ''' <param name="map">map of compressor values against compressor rpm</param>
-        ''' <remarks></remarks>
-        'Public Sub New(ByVal map As ICompressorMap, signals As ISignals)
-        '    _map = map
-        '    _signals = signals
-        'End Sub
 
         '''<summary>
         ''' Creates a new instance of the AirCompressor Class