POST MOVE OF VECTO AND SIGNALS Interfaces and Classes to AdvancedInterfaces...

POST MOVE OF VECTO AND SIGNALS Interfaces and Classes to AdvancedInterfaces DLL ( this seems to work ok, all 264 Tests Run OK  )

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

AdvancedAuxiliaryInterfaces/AdvancedAuxiliaryInterfaces.vbproj

@@ -6,7 +6,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{B4B9BD2F-FD8F-4BB8-82FA-E2154D2C7FBD}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>AdvancedAuxiliaryInterfaces</RootNamespace>
+    <RootNamespace>VectoAuxiliaries</RootNamespace>
     <AssemblyName>AdvancedAuxiliaryInterfaces</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
@@ -86,6 +86,8 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Compile Include="Signals.vb" />
+    <Compile Include="VectoInputs.vb" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="My Project\Resources.resx">

AdvancedAuxiliaryInterfaces/IAdvancedAuxiliaries.vb

@@ -12,7 +12,7 @@ ReadOnly Property AuxiliaryVersion As String
 
 
 'Static Values
-property VectoInputs As AdvancedAuxiliaryInterfaces.IVectoInputs
+property VectoInputs As IVectoInputs
 
 'Running Properties
 property Signals as ISignals

AdvancedAuxiliaryInterfaces/My Project/Resources.Designer.vb

@@ -39,7 +39,7 @@ Namespace My.Resources
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("AdvancedAuxiliaryInterfaces.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("VectoAuxiliaries.Resources", GetType(Resources).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan

AdvancedAuxiliaryInterfaces/My Project/Settings.Designer.vb

@@ -64,9 +64,9 @@ Namespace My
     Friend Module MySettingsProperty
         
         <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.AdvancedAuxiliaryInterfaces.My.MySettings
+        Friend ReadOnly Property Settings() As Global.VectoAuxiliaries.My.MySettings
             Get
-                Return Global.AdvancedAuxiliaryInterfaces.My.MySettings.Default
+                Return Global.VectoAuxiliaries.My.MySettings.Default
             End Get
         End Property
     End Module

AdvancedAuxiliaryInterfaces/Signals.vb

+
+Public Class Signals
+Implements ISignals
+
+
+
+
+  Private _smartElectrics As Boolean
+
+    Public Property ClutchEngaged As Boolean Implements ISignals.ClutchEngaged
+
+    Public Property EngineDrivelinePower As Single Implements ISignals.EngineDrivelinePower
+
+    Public Property EngineDrivelineTorque As Single Implements ISignals.EngineDrivelineTorque
+
+    Public Property EngineMotoringPower As Single Implements ISignals.EngineMotoringPower
+
+    Public Property EngineSpeed As Integer Implements ISignals.EngineSpeed
+
+    Public Property SmartElectrics As Boolean Implements ISignals.SmartElectrics
+    Get
+    Return _smartElectrics
+    End Get
+    Set(value As Boolean)
+
+    _smartElectrics=value
+
+    Debug.WriteLine(String.Format("SmartElectrics {0}", _smartElectrics))
+
+    End Set
+
+     end property
+
+
+    Public Property SmartPneumatics As Boolean Implements ISignals.SmartPneumatics
+
+    Public Property TotalCycleTimeSeconds As Integer Implements ISignals.TotalCycleTimeSeconds
+
+    Public Property PreExistingAuxPower As Single Implements ISignals.PreExistingAuxPower
+
+    Public Property Idle As Boolean Implements ISignals.Idle
+
+    Public Property InNeutral As Boolean Implements ISignals.InNeutral
+
+
+
+End Class
+
+
+

AdvancedAuxiliaryInterfaces/VectoInputs.vb

+
+
+Public Class VectoInputs
+
+Implements IVectoInputs
+
+    Public Property Cycle As String Implements IVectoInputs.Cycle
+
+    Public Property VehicleWeightKG As Single Implements IVectoInputs.VehicleWeightKG
+
+    Public Property PowerNetVoltage As Single Implements IVectoInputs.PowerNetVoltage
+
+    Public Property CycleDurationMinutes As Single Implements IVectoInputs.CycleDurationMinutes
+
+    Public Property FuelMap As String Implements IVectoInputs.FuelMap
+
+End Class
+

AuxillaryTestHarness/AuxLauncher.vb

 Imports System.Reflection
-Imports AdvancedAuxiliaryInterfaces
+Imports VectoAuxiliaries
 
 Public Class AuxLauncher
 
@@ -71,6 +71,8 @@ Dim message As String = String.Empty
 'Set Statics
 advancedAuxiliaries.VectoInputs.Cycle="Urban"
 advancedAuxiliaries.VectoInputs.VehicleWeightKG=16500
+advancedAuxiliaries.VectoInputs.FuelMap= "testFuelGoodMap.vmap"
+advancedAuxiliaries.VectoInputs.PowerNetVoltage=26.3
 
 
 'set Signals
@@ -102,11 +104,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
+ ' 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")
+    ' MessageBox.Show("Unable to configure Advanced Auxilliaries")
 
-  End If
+ ' End If
 
   Catch ex As Exception
 

AuxillaryTestHarness/My Project/Application.Designer.vb

@@ -32,7 +32,7 @@ Namespace My
         
         <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
         Protected Overrides Sub OnCreateMainForm()
-            Me.MainForm = Global.AuxiliaryTestHarness.Dashboard
+            Me.MainForm = Global.AuxiliaryTestHarness.AuxLauncher
         End Sub
     End Class
 End Namespace

AuxillaryTestHarness/My Project/Application.myapp

 <?xml version="1.0" encoding="utf-8"?>
 <MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <MySubMain>true</MySubMain>
-  <MainForm>Dashboard</MainForm>
+  <MainForm>AuxLauncher</MainForm>
   <SingleInstance>false</SingleInstance>
   <ShutdownMode>0</ShutdownMode>
   <EnableVisualStyles>true</EnableVisualStyles>

VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb

-Imports AdvancedAuxiliaryInterfaces
+Imports VectoAuxiliaries
+Imports VectoAuxiliaries.Electrics
+Imports VectoAuxiliaries.Pneumatics
+Imports VectoAuxiliaries.Hvac
+Imports VectoAuxiliaries.DownstreamModules
+Imports System.Windows.Forms
 
 Public Class AdvancedAuxiliaries
-Implements  IAdvancedAuxiliaries
+ Implements IAdvancedAuxiliaries
+
 
 
 
@@ -9,13 +15,137 @@ Implements  IAdvancedAuxiliaries
    
     Public Sub new( )
 
-           'VectoInputs = New VectoInputs() 
-           'Signals     = New Signals()
+           VectoInputs = New VectoInputs() 
+           Signals     = New Signals()
 
     End Sub
 
 
-    Public Function Configure(filePath As String, vectoFilePath As String ) As Boolean Implements AdvancedAuxiliaryInterfaces.IAdvancedAuxiliaries.Configure
+  
+ '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
+  Public M0 As IM0_NonSmart_AlternatorsSetEfficiency
+  Public M05 As IM0_5_SmartAlternatorSetEfficiency
+  Public M1 As IM1_AverageHVACLoadDemand
+  Public M2 As IM2_AverageElectricalLoadDemand
+  Public M3 As IM3_AveragePneumaticLoadDemand
+  Public M4 As IM4_AirCompressor
+  Public M5 As IM5_SmartAlternatorSetGeneration
+  Public M6 As IM6
+  Public M7 As IM7
+  Public M8 As IM8
+  Public M9 As IM9
+  Public M10 As IM10
+  Public M11 As IM11
+  Public M12 As IM12
+  Public M13 As IM13
+
+Public Sub Initialise( auxPath  As String )
+
+auxConfig = New AuxiliaryConfig(auxPath)
+
+Dim alternatoMap As IAlternatorMap = New AlternatorMap(auxConfig.ElectricalUserInputsConfig.AlternatorMap)
+alternatoMap.Initialise()
+
+Dim actuationsMap As  IPneumaticActuationsMAP = New PneumaticActuationsMAP( auxConfig.PneumaticUserInputsConfig.ActuationsMap)
+
+Dim compressorMap As ICompressorMap = New CompressorMap( auxConfig.PneumaticUserInputsConfig.CompressorMap)
+compressorMap.Initialise()
+
+Dim fuelMap As IFUELMAP = New cMAP()
+fuelMap.FilePath= VectoInputs.FuelMap
+If Not fuelMap.ReadFile() then 
+MessageBox.Show("Unable to read fuel map, aborting.")
+return
+End If
+fuelMap.Triangulate()
+
+
+auxConfig.ElectricalUserInputsConfig.ElectricalConsumers.DoorDutyCycleFraction = GetDoorActuationTimeFraction()
+
+
+M0 = New M0_NonSmart_AlternatorsSetEfficiency( auxConfig.ElectricalUserInputsConfig.ElectricalConsumers,
+                                               New HVACInputs,
+                                               alternatoMap,
+                                               auxConfig.ElectricalUserInputsConfig.PowerNetVoltage,
+                                               Signals,
+                                               auxConfig.HvacUserInputsConfig.SteadyStateModel)
+
+
+M05 = New M0_5_SmartAlternatorSetEfficiency(M0, 
+                                            auxConfig.ElectricalUserInputsConfig.ElectricalConsumers, 
+                                            alternatoMap,
+                                            auxConfig.ElectricalUserInputsConfig.ResultCardIdle,
+                                            auxConfig.ElectricalUserInputsConfig.ResultCardTraction,
+                                            auxConfig.ElectricalUserInputsConfig.ResultCardOverrun,Signals)
+
+
+M1 = New M1_AverageHVACLoadDemand(M0,
+                                  New HVACMap(""),
+                                  New HVACInputs(), 
+                                  auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency, 
+                                  auxConfig.PneumaticUserInputsConfig.CompressorGearEfficiency,
+                                  auxConfig.ElectricalUserInputsConfig.PowerNetVoltage,
+                                  Signals,
+                                  auxConfig.HvacUserInputsConfig.SteadyStateModel)
+
+
+M2 = New M2_AverageElectricalLoadDemand(auxConfig.ElectricalUserInputsConfig.ElectricalConsumers,
+                                        M0,
+                                        auxConfig.ElectricalUserInputsConfig.AlternatorGearEfficiency, 
+                                        auxConfig.ElectricalUserInputsConfig.PowerNetVoltage,Signals )
+
+
+
+M3 = New M3_AveragePneumaticLoadDemand(auxConfig.PneumaticUserInputsConfig,
+         auxConfig.PneumaticAuxillariesConfig,
+         actuationsMap,
+         compressorMap, 
+         VectoInputs.VehicleWeightKG,
+         VectoInputs.Cycle,
+         Signals)
+
+
+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)
+
+
+End Sub
+
+
+
+    Public Function Configure(filePath As String, vectoFilePath As String ) As Boolean Implements VectoAuxiliaries.IAdvancedAuxiliaries.Configure
     
     try
 
@@ -36,56 +166,73 @@ Implements  IAdvancedAuxiliaries
 
     End Function
 
-    Public Function CycleStep(seconds As Integer, ByRef message As String) As Boolean Implements AdvancedAuxiliaryInterfaces.IAdvancedAuxiliaries.CycleStep
+    Public Function CycleStep(seconds As Integer, ByRef message As String) As Boolean Implements VectoAuxiliaries.IAdvancedAuxiliaries.CycleStep
           throw new NotImplementedException
     End Function
 
-    Public Event Message(Message As String, messageType As AdvancedAuxiliaryInterfaces.AdvancedAuxiliaryMessageType) Implements AdvancedAuxiliaryInterfaces.IAdvancedAuxiliaries.Message
+    Public Event Message(Message As String, messageType As VectoAuxiliaries.AdvancedAuxiliaryMessageType) Implements VectoAuxiliaries.IAdvancedAuxiliaries.Message
 
-    Public ReadOnly Property Running As Boolean Implements AdvancedAuxiliaryInterfaces.IAdvancedAuxiliaries.Running
+    Public ReadOnly Property Running As Boolean Implements VectoAuxiliaries.IAdvancedAuxiliaries.Running
         Get
               throw new NotImplementedException
         End Get
     End Property
 
-    Public Function RunStart( ByVal auxFilePath As String, ByRef message As String) As Boolean Implements AdvancedAuxiliaryInterfaces.IAdvancedAuxiliaries.RunStart
-          throw new NotImplementedException
+    Public Function RunStart( ByVal auxFilePath As String, ByRef message As String) As Boolean Implements VectoAuxiliaries.IAdvancedAuxiliaries.RunStart
+          
+       Initialise(auxFilePath)        
+
+
     End Function
 
-    Public Function RunStop(ByRef message As String) As Boolean Implements AdvancedAuxiliaryInterfaces.IAdvancedAuxiliaries.RunStop
+    Public Function RunStop(ByRef message As String) As Boolean Implements VectoAuxiliaries.IAdvancedAuxiliaries.RunStop
           throw new NotImplementedException
     End Function
 
 '
 
-    Public ReadOnly Property TotalFuelGRAMS As Single Implements AdvancedAuxiliaryInterfaces.IAdvancedAuxiliaries.TotalFuelGRAMS
+    Public ReadOnly Property TotalFuelGRAMS As Single Implements VectoAuxiliaries.IAdvancedAuxiliaries.TotalFuelGRAMS
         Get
               throw new NotImplementedException
         End Get
     End Property
 
-    Public ReadOnly Property TotalFuelLITRES As Single Implements AdvancedAuxiliaryInterfaces.IAdvancedAuxiliaries.TotalFuelLITRES
+    Public ReadOnly Property TotalFuelLITRES As Single Implements VectoAuxiliaries.IAdvancedAuxiliaries.TotalFuelLITRES
         Get
               throw new NotImplementedException
         End Get
     End Property
 
-    Public ReadOnly Property AuxiliaryName As String Implements AdvancedAuxiliaryInterfaces.IAdvancedAuxiliaries.AuxiliaryName
+    Public ReadOnly Property AuxiliaryName As String Implements VectoAuxiliaries.IAdvancedAuxiliaries.AuxiliaryName
         Get
           Return "BusAuxiliaries"
         End Get
     End Property
 
-    Public ReadOnly Property AuxiliaryVersion As String Implements AdvancedAuxiliaryInterfaces.IAdvancedAuxiliaries.AuxiliaryVersion
+    Public ReadOnly Property AuxiliaryVersion As String Implements VectoAuxiliaries.IAdvancedAuxiliaries.AuxiliaryVersion
         Get
            Return "Version 1.0 Beta"
         End Get
     End Property
 
 
-    Public Property Signals As AdvancedAuxiliaryInterfaces.ISignals Implements IAdvancedAuxiliaries.Signals
 
-    Public Property VectoInputs As AdvancedAuxiliaryInterfaces.IVectoInputs Implements IAdvancedAuxiliaries.VectoInputs
+    Public Property Signals As ISignals Implements IAdvancedAuxiliaries.Signals
 
+    Public Property VectoInputs As IVectoInputs Implements IAdvancedAuxiliaries.VectoInputs
+
+    Private Function GetDoorActuationTimeFraction()As Single
+   
+    Dim actuationsMap as PneumaticActuationsMAP = New PneumaticActuationsMAP( auxConfig.PneumaticUserInputsConfig.ActuationsMap )
+    Dim actuationsKey As ActuationsKey = New ActuationsKey( "Park brake + 2 doors",VectoInputs.Cycle)
+   
+    Dim numActuations       as single = actuationsMap.GetNumActuations( actuationsKey)
+    Dim secondsPerActuation As single = auxConfig.ElectricalUserInputsConfig.DoorActuationTimeSecond
+   
+    Dim doorDutyCycleFraction as Single = (numActuations * secondsPerActuation)/Signals.TotalCycleTimeSeconds
+   
+    Return doorDutyCycleFraction
+   
+   End Function
 
 End Class

VECTOAux/VectoAuxiliaries/AuxiliaryConfig.vb

@@ -5,6 +5,8 @@ Imports System.IO
 Imports VectoAuxiliaries.DownstreamModules
 Imports System.Windows.Forms
 Imports Newtonsoft.Json
+imports VectoAuxiliaries
+
 
 
 <Serializable()>

VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj

@@ -128,8 +128,6 @@
     <Compile Include="Hvac\IHVACUserInputsConfig.vb" />
     <Compile Include="Hvac\IM1_AverageHVACLoadDemand.vb" />
     <Compile Include="IAuxiliaryConfig.vb" />
-    <Compile Include="ISignals.vb" />
-    <Compile Include="IVectoInputs.vb" />
     <Compile Include="DownstreamModules\M6.vb" />
     <Compile Include="Pneumatics\ActuationsKey.vb" />
     <Compile Include="Pneumatics\IM3_AveragePneumaticLoadDemand.vb" />
@@ -165,7 +163,6 @@
     <Compile Include="Pneumatics\PneumaticActuationsMap.vb" />
     <Compile Include="Pneumatics\PneumaticsAuxilliariesConfig.vb" />
     <Compile Include="Pneumatics\PneumaticUserInputsConfig.vb" />
-    <Compile Include="Signals.vb" />
     <Compile Include="UI\cFileBrowser.vb" />
     <Compile Include="UI\frmAuxiliaryConfig.Designer.vb">
       <DependentUpon>frmAuxiliaryConfig.vb</DependentUpon>
@@ -187,7 +184,6 @@
     </Compile>
     <Compile Include="UI\FB_Global.vb" />
     <Compile Include="UI\VECTO_Types.vb" />
-    <Compile Include="VectoInputs.vb" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="My Project\Resources.resx">

VECTOAux/VectoAuxiliariesTests/UnitTests/M13Tests.vb

@@ -6,6 +6,7 @@ Imports NUnit.Framework
 Imports VectoAuxiliaries
 Imports Moq
 
+
 Namespace UnitTests
 <TestFixture()> _
 Public Class M13Tests

VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj

@@ -258,6 +258,10 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj">
+      <Project>{b4b9bd2f-fd8f-4bb8-82fa-e2154d2c7fbd}</Project>
+      <Name>AdvancedAuxiliaryInterfaces</Name>
+    </ProjectReference>
     <ProjectReference Include="..\VectoAuxiliaries\VectoAuxiliaries.vbproj">
       <Project>{FDEEE460-0B8A-4EF6-8D9E-72F203A50F65}</Project>
       <Name>VectoAuxiliaries</Name>