WIP - Fixed two bugs, one to do with Powernet Voltage not being assimilated...

WIP - Fixed two bugs, one to do with Powernet Voltage not being assimilated when AssumingValues from other ( Load ). Also, assignment of Electrical and Pnuematic Smart flags to Signals inputs required and now done on Environment Initialise. 

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

AuxillaryTestHarness/AuxLauncher.Designer.vb

@@ -22,6 +22,7 @@ Partial Class AuxLauncher
     'Do not modify it using the code editor.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
         Me.txtAdvancedAuxiliaries = New System.Windows.Forms.TextBox()
         Me.btnLaunchAux = New System.Windows.Forms.Button()
         Me.btnRun = New System.Windows.Forms.Button()
@@ -31,11 +32,14 @@ Partial Class AuxLauncher
         Me.txtTotalFCLitres = New System.Windows.Forms.TextBox()
         Me.lblTotalFCGRAMS = New System.Windows.Forms.Label()
         Me.Label1 = New System.Windows.Forms.Label()
+        Me.lblAuxiliaryName = New System.Windows.Forms.Label()
+        Me.lblAuxiliaryVersion = New System.Windows.Forms.Label()
+        Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
         Me.SuspendLayout
         '
         'txtAdvancedAuxiliaries
         '
-        Me.txtAdvancedAuxiliaries.Location = New System.Drawing.Point(22, 30)
+        Me.txtAdvancedAuxiliaries.Location = New System.Drawing.Point(30, 87)
         Me.txtAdvancedAuxiliaries.Name = "txtAdvancedAuxiliaries"
         Me.txtAdvancedAuxiliaries.Size = New System.Drawing.Size(366, 20)
         Me.txtAdvancedAuxiliaries.TabIndex = 0
@@ -43,7 +47,7 @@ Partial Class AuxLauncher
         '
         'btnLaunchAux
         '
-        Me.btnLaunchAux.Location = New System.Drawing.Point(409, 30)
+        Me.btnLaunchAux.Location = New System.Drawing.Point(414, 87)
         Me.btnLaunchAux.Name = "btnLaunchAux"
         Me.btnLaunchAux.Size = New System.Drawing.Size(75, 23)
         Me.btnLaunchAux.TabIndex = 1
@@ -52,7 +56,7 @@ Partial Class AuxLauncher
         '
         'btnRun
         '
-        Me.btnRun.Location = New System.Drawing.Point(409, 81)
+        Me.btnRun.Location = New System.Drawing.Point(414, 138)
         Me.btnRun.Name = "btnRun"
         Me.btnRun.Size = New System.Drawing.Size(75, 23)
         Me.btnRun.TabIndex = 2
@@ -61,7 +65,7 @@ Partial Class AuxLauncher
         '
         'btnStop
         '
-        Me.btnStop.Location = New System.Drawing.Point(409, 141)
+        Me.btnStop.Location = New System.Drawing.Point(414, 198)
         Me.btnStop.Name = "btnStop"
         Me.btnStop.Size = New System.Drawing.Size(75, 23)
         Me.btnStop.TabIndex = 3
@@ -70,7 +74,7 @@ Partial Class AuxLauncher
         '
         'btnInformation
         '
-        Me.btnInformation.Location = New System.Drawing.Point(409, 198)
+        Me.btnInformation.Location = New System.Drawing.Point(414, 255)
         Me.btnInformation.Name = "btnInformation"
         Me.btnInformation.Size = New System.Drawing.Size(75, 23)
         Me.btnInformation.TabIndex = 4
@@ -79,14 +83,14 @@ Partial Class AuxLauncher
         '
         'txtTotalFCGrams
         '
-        Me.txtTotalFCGrams.Location = New System.Drawing.Point(22, 81)
+        Me.txtTotalFCGrams.Location = New System.Drawing.Point(30, 138)
         Me.txtTotalFCGrams.Name = "txtTotalFCGrams"
         Me.txtTotalFCGrams.Size = New System.Drawing.Size(100, 20)
         Me.txtTotalFCGrams.TabIndex = 5
         '
         'txtTotalFCLitres
         '
-        Me.txtTotalFCLitres.Location = New System.Drawing.Point(159, 80)
+        Me.txtTotalFCLitres.Location = New System.Drawing.Point(164, 137)
         Me.txtTotalFCLitres.Name = "txtTotalFCLitres"
         Me.txtTotalFCLitres.Size = New System.Drawing.Size(100, 20)
         Me.txtTotalFCLitres.TabIndex = 6
@@ -94,7 +98,7 @@ Partial Class AuxLauncher
         'lblTotalFCGRAMS
         '
         Me.lblTotalFCGRAMS.AutoSize = true
-        Me.lblTotalFCGRAMS.Location = New System.Drawing.Point(22, 62)
+        Me.lblTotalFCGRAMS.Location = New System.Drawing.Point(30, 119)
         Me.lblTotalFCGRAMS.Name = "lblTotalFCGRAMS"
         Me.lblTotalFCGRAMS.Size = New System.Drawing.Size(77, 13)
         Me.lblTotalFCGRAMS.TabIndex = 7
@@ -103,17 +107,41 @@ Partial Class AuxLauncher
         'Label1
         '
         Me.Label1.AutoSize = true
-        Me.Label1.Location = New System.Drawing.Point(156, 62)
+        Me.Label1.Location = New System.Drawing.Point(161, 119)
         Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(77, 13)
+        Me.Label1.Size = New System.Drawing.Size(72, 13)
         Me.Label1.TabIndex = 8
-        Me.Label1.Text = "TotalFC Grams"
+        Me.Label1.Text = "TotalFC Litres"
+        '
+        'lblAuxiliaryName
+        '
+        Me.lblAuxiliaryName.AutoSize = true
+        Me.lblAuxiliaryName.Location = New System.Drawing.Point(30, 9)
+        Me.lblAuxiliaryName.Name = "lblAuxiliaryName"
+        Me.lblAuxiliaryName.Size = New System.Drawing.Size(39, 13)
+        Me.lblAuxiliaryName.TabIndex = 9
+        Me.lblAuxiliaryName.Text = "Label2"
+        '
+        'lblAuxiliaryVersion
+        '
+        Me.lblAuxiliaryVersion.AutoSize = true
+        Me.lblAuxiliaryVersion.Location = New System.Drawing.Point(30, 37)
+        Me.lblAuxiliaryVersion.Name = "lblAuxiliaryVersion"
+        Me.lblAuxiliaryVersion.Size = New System.Drawing.Size(39, 13)
+        Me.lblAuxiliaryVersion.TabIndex = 10
+        Me.lblAuxiliaryVersion.Text = "Label3"
+        '
+        'Timer1
+        '
+        Me.Timer1.Interval = 1000
         '
         'AuxLauncher
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(527, 363)
+        Me.Controls.Add(Me.lblAuxiliaryVersion)
+        Me.Controls.Add(Me.lblAuxiliaryName)
         Me.Controls.Add(Me.Label1)
         Me.Controls.Add(Me.lblTotalFCGRAMS)
         Me.Controls.Add(Me.txtTotalFCLitres)
@@ -138,4 +166,7 @@ End Sub
     Friend WithEvents txtTotalFCLitres As System.Windows.Forms.TextBox
     Friend WithEvents lblTotalFCGRAMS As System.Windows.Forms.Label
     Friend WithEvents Label1 As System.Windows.Forms.Label
+    Friend WithEvents lblAuxiliaryName As System.Windows.Forms.Label
+    Friend WithEvents lblAuxiliaryVersion As System.Windows.Forms.Label
+    Friend WithEvents Timer1 As System.Windows.Forms.Timer
 End Class

AuxillaryTestHarness/AuxLauncher.resx

@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>
\ No newline at end of file

AuxillaryTestHarness/AuxLauncher.vb

@@ -73,6 +73,7 @@ advancedAuxiliaries.VectoInputs.Cycle="Urban"
 advancedAuxiliaries.VectoInputs.VehicleWeightKG=16500
 advancedAuxiliaries.VectoInputs.FuelMap= "testFuelGoodMap.vmap"
 advancedAuxiliaries.VectoInputs.PowerNetVoltage=26.3
+advancedAuxiliaries.VectoInputs.CycleDurationMinutes=51.9
 
 
 'set Signals
@@ -82,8 +83,18 @@ advancedAuxiliaries.Signals.TotalCycleTimeSeconds=3114
 advancedAuxiliaries.RunStart(txtAdvancedAuxiliaries.Text,message)
 
 'step whole cycle
+'advancedAuxiliaries.CycleStep(3114,message)
 
 
+'Add bindnings
+ 'txtTotalFCGrams.DataBindings.Add("Text", advancedAuxiliaries,"TotalFuelGRAMS")
+ 'txtTotalFCLitres.DataBindings.Add("Text", advancedAuxiliaries,"TotalFuelLITRES")
+
+
+ 'start timer
+
+ timer1.Start
+
 
 End Sub
 
@@ -104,11 +115,11 @@ Try
 
   advancedAuxiliaries = DirectCast(obj.Unwrap, IAdvancedAuxiliaries)
 
- ' If Not advancedAuxiliaries.Configure(txtAdvancedAuxiliaries.Text, "C:\Users\tb28\Source\Workspaces\VECTO\AuxillaryTestHarness\bin\Debug\vectopath.vecto") then
 
-    ' MessageBox.Show("Unable to configure Advanced Auxilliaries")
+  lblAuxiliaryName.Text= advancedAuxiliaries.AuxiliaryName
+  lblAuxiliaryVersion.Text = advancedAuxiliaries.AuxiliaryVersion
+
 
- ' End If
 
   Catch ex As Exception
 
@@ -128,4 +139,17 @@ End Sub
 
 
 
+Private Sub Timer1_Tick( sender As Object,  e As EventArgs) Handles Timer1.Tick
+
+If not advancedAuxiliaries is nothing
+  Dim message As string = ""
+
+   advancedAuxiliaries.CycleStep(  Timer1.Interval/1000 , Message)
+   txtTotalFCGrams.Text= advancedAuxiliaries.TotalFuelGRAMS
+   txtTotalFCLitres.Text= advancedAuxiliaries.TotalFuelLITRES
+
+End If
+
+
+End Sub
 End Class
\ No newline at end of file

VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb

@@ -11,7 +11,12 @@ Public Class AdvancedAuxiliaries
 
 
 
-     Private auxConfig As AuxiliaryConfig
+    Private auxConfig As AuxiliaryConfig
+     
+
+    Public Property Signals As ISignals Implements IAdvancedAuxiliaries.Signals
+    Public Property VectoInputs As IVectoInputs Implements IAdvancedAuxiliaries.VectoInputs
+
    
     Public Sub new( )
 
@@ -21,17 +26,7 @@ Public Class AdvancedAuxiliaries
     End Sub
 
 
-  
- 'Electrical
- 'Public property ElectricalUserInputsConfig As IElectricsUserInputsConfig
-
-
- ''Pneumatics
- 'public Property PneumaticUserInputsConfig As IPneumaticUserInputsConfig
- 'public Property PneumaticAuxillariesConfig As IPneumaticsAuxilliariesConfig
-
- ''Hvac
- 'Public Property  HvacUserInputsConfig As IHVACUserInputsConfig
+ 
 
 
  'Test instantiations
@@ -55,6 +50,10 @@ Public Sub Initialise( auxPath  As String )
 
 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 )
+Signals.SmartElectrics  = auxConfig.ElectricalUserInputsConfig.SmartElectrical
+Signals.SmartPneumatics = auxConfig.PneumaticUserInputsConfig.SmartAirCompression
+
 Dim alternatoMap As IAlternatorMap = New AlternatorMap(auxConfig.ElectricalUserInputsConfig.AlternatorMap)
 alternatoMap.Initialise()
 
@@ -118,26 +117,14 @@ M3 = New M3_AveragePneumaticLoadDemand(auxConfig.PneumaticUserInputsConfig,
 
 
 M4 = New M4_AirCompressor(compressorMap,auxConfig.PneumaticUserInputsConfig.CompressorGearRatio,auxConfig.PneumaticUserInputsConfig.CompressorGearEfficiency,Signals)
-
-
 M5 = New M5__SmartAlternatorSetGeneration( M05, VectoInputs.PowerNetVoltage,auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency)
-
-
 M6 = New M6(M1,M2,M3,M4,M5,Signals)
-
-
 M7 = New M7(M5,M6,Signals)
-
 M8 = New M8(M1,M6,M7,Signals)
-
 M9 = New M9(M1,M4,M6,M8,fuelMap,auxConfig.PneumaticAuxillariesConfig,Signals)
-
 M10 = New M10(M3,M9,Signals)
-
 M11 = New M11(M1,M3,M6,M8,fuelMap,Signals)
-
 M12 = New M12( M11, Signals )
-
 M13 = New M13(M1,M10,M12,Signals)
 
 
@@ -167,7 +154,11 @@ End Sub
     End Function
 
     Public Function CycleStep(seconds As Integer, ByRef message As String) As Boolean Implements VectoAuxiliaries.IAdvancedAuxiliaries.CycleStep
-          throw new NotImplementedException
+         
+       M9.CycleStep( seconds )      
+       M11.CycleStep( seconds )
+     
+     
     End Function
 
     Public Event Message(Message As String, messageType As VectoAuxiliaries.AdvancedAuxiliaryMessageType) Implements VectoAuxiliaries.IAdvancedAuxiliaries.Message
@@ -180,8 +171,9 @@ End Sub
 
     Public Function RunStart( ByVal auxFilePath As String, ByRef message As String) As Boolean Implements VectoAuxiliaries.IAdvancedAuxiliaries.RunStart
           
-       Initialise(auxFilePath)        
 
+       Initialise(auxFilePath)        
+       'CycleStep( Signals.TotalCycleTimeSeconds, message)
 
     End Function
 
@@ -193,13 +185,31 @@ End Sub
 
     Public ReadOnly Property TotalFuelGRAMS As Single Implements VectoAuxiliaries.IAdvancedAuxiliaries.TotalFuelGRAMS
         Get
-              throw new NotImplementedException
+             If Not M13 is Nothing then
+
+               Return M13.TotalCycleFuelConsumptionGrams
+
+               Else
+               'TODO:Issue a message            
+               Return 0
+
+             End If
+
+             
         End Get
     End Property
 
     Public ReadOnly Property TotalFuelLITRES As Single Implements VectoAuxiliaries.IAdvancedAuxiliaries.TotalFuelLITRES
         Get
-              throw new NotImplementedException
+             If Not M13 is Nothing then
+
+               Return M13.TotalCycleFuelConsumptionLitres
+
+               Else
+               'TODO:Issue a message
+               Return 0
+
+             End If
         End Get
     End Property
 
@@ -217,9 +227,6 @@ End Sub
 
 
 
-    Public Property Signals As ISignals Implements IAdvancedAuxiliaries.Signals
-
-    Public Property VectoInputs As IVectoInputs Implements IAdvancedAuxiliaries.VectoInputs
 
     Private Function GetDoorActuationTimeFraction()As Single
    

VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb

@@ -9,24 +9,27 @@ imports VectoAuxiliaries
 
 
 
+
 <Serializable()>
 Public Class AuxiliaryConfig
  Implements IAuxiliaryConfig
 
 
+
+
  'Vecto
- Public Property VectoInputs As IVectoInputs
+ Public Property VectoInputs As IVectoInputs  implements IAuxiliaryConfig.VectoInputs
   
  'Electrical
- Public property ElectricalUserInputsConfig As IElectricsUserInputsConfig
+ Public property ElectricalUserInputsConfig As IElectricsUserInputsConfig  Implements IAuxiliaryConfig.ElectricalUserInputsConfig
 
 
  'Pneumatics
- public Property PneumaticUserInputsConfig As IPneumaticUserInputsConfig
- public Property PneumaticAuxillariesConfig As IPneumaticsAuxilliariesConfig
+ public Property PneumaticUserInputsConfig As IPneumaticUserInputsConfig Implements IAuxiliaryConfig.PneumaticUserInputsConfig
+ public Property PneumaticAuxillariesConfig As IPneumaticsAuxilliariesConfig  Implements IAuxiliaryConfig.PneumaticAuxillariesConfig
 
  'Hvac
- Public Property  HvacUserInputsConfig As IHVACUserInputsConfig
+ Public Property  HvacUserInputsConfig As IHVACUserInputsConfig Implements IAuxiliaryConfig.HvacUserInputsConfig
 
  'Vecto Signals
  public Property Signals As ISignals
@@ -226,7 +229,7 @@ Private Function ComparePneumaticUserConfig( other As AuxiliaryConfig ) As Boole
  Return true
 
 End Function
-Private Function CompareHVACConfig( other As AuxiliaryConfig) As Boolean
+Private Function CompareHVACConfig( other As AuxiliaryConfig) As Boolean Implements IAuxiliaryConfig.ConfigValuesAreTheSameAs
 
   If Me.HvacUserInputsConfig.SteadyStateModel.HVACElectricalLoadPowerWatts <> other.HvacUserInputsConfig.SteadyStateModel.HVACElectricalLoadPowerWatts then Return false
   If Me.HvacUserInputsConfig.SteadyStateModel.HVACFuellingLitresPerHour <> other.HvacUserInputsConfig.SteadyStateModel.HVACFuellingLitresPerHour then Return false
@@ -254,7 +257,8 @@ End Function
 
 
 'Persistance Functions
-Public Function Save(  auxFile As String ) As Boolean
+Public Function Save(  auxFile As String ) As Boolean  Implements IAuxiliaryConfig.Save
+
 
 
   Dim returnValue As Boolean = true
@@ -279,7 +283,7 @@ Public Function Save(  auxFile As String ) As Boolean
   Return returnValue
 
 End Function
-Public Function Load(  auxFile As String  ) As Boolean
+Public Function Load(  auxFile As String  ) As Boolean  Implements IAuxiliaryConfig.Load
 
   Dim returnValue As Boolean = true
   Dim settings As JsonSerializerSettings = new JsonSerializerSettings()
@@ -344,7 +348,7 @@ For  Each otherConsumer As IElectricalConsumer In other.ElectricalUserInputsConf
 Next
 
 'PowerNetVoltage
-other.ElectricalUserInputsConfig.PowerNetVoltage = other.ElectricalUserInputsConfig.PowerNetVoltage 
+Me.ElectricalUserInputsConfig.PowerNetVoltage = other.ElectricalUserInputsConfig.PowerNetVoltage 
 'ResultCardIdle
 Me.ElectricalUserInputsConfig.ResultCardIdle.Results.Clear
 For each result As SmartResult In other.ElectricalUserInputsConfig.ResultCardIdle.Results
@@ -409,26 +413,5 @@ End Sub
 #End Region
 
 
-    Public Function ConfigValuesAreTheSameAs1(other As AuxiliaryConfig) As Boolean Implements IAuxiliaryConfig.ConfigValuesAreTheSameAs
-
-    End Function
-
-    Public Property ElectricalUserInputsConfig1 As IElectricsUserInputsConfig Implements IAuxiliaryConfig.ElectricalUserInputsConfig
-
-    Public Property HvacUserInputsConfig1 As IHVACUserInputsConfig Implements IAuxiliaryConfig.HvacUserInputsConfig
-
-    Public Function Load1(filePath As String) As Boolean Implements IAuxiliaryConfig.Load
-
-    End Function
-
-    Public Property PneumaticAuxillariesConfig1 As IPneumaticsAuxilliariesConfig Implements IAuxiliaryConfig.PneumaticAuxillariesConfig
-
-    Public Property PneumaticUserInputsConfig1 As IPneumaticUserInputsConfig Implements IAuxiliaryConfig.PneumaticUserInputsConfig
-
-    Public Function Save1(filePath As String) As Boolean Implements IAuxiliaryConfig.Save
-
-    End Function
-
-    Public Property VectoInputs1 As IVectoInputs Implements IAuxiliaryConfig.VectoInputs
 End Class
 

VECTOAux/VectoAuxiliaries/AuxillaryEnvironment.vb

@@ -479,7 +479,7 @@ For  Each otherConsumer As IElectricalConsumer In other.ElectricalUserInputsConf
 Next
 
 'PowerNetVoltage
-other.ElectricalUserInputsConfig.PowerNetVoltage = other.ElectricalUserInputsConfig.PowerNetVoltage 
+Me.ElectricalUserInputsConfig.PowerNetVoltage = other.ElectricalUserInputsConfig.PowerNetVoltage 
 'ResultCardIdle
 Me.ElectricalUserInputsConfig.ResultCardIdle.Results.Clear
 For each result As SmartResult In other.ElectricalUserInputsConfig.ResultCardIdle.Results

VECTOAux/VectoAuxiliaries/DownstreamModules/IM10.vb

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

VECTOAux/VectoAuxiliaries/DownstreamModules/IM11.vb

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

VECTOAux/VectoAuxiliaries/DownstreamModules/IM9.vb

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

VECTOAux/VectoAuxiliaries/DownstreamModules/M11.vb

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

VECTOAux/VectoAuxiliaries/DownstreamModules/M12.vb

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