M6 and M7 Written, now looking at unit tests for them. WIP Checkpoint

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

AuxillaryTestHarness/AuxillaryTestHarness.vbproj

@@ -28,7 +28,7 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>5</ApplicationRevision>
+    <ApplicationRevision>6</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -168,6 +168,9 @@
     <Content Include="testPneumaticActuationsMap_GOODMAP.csv">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="testAlternatorMap - Copy.csv">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VECTOAux\VectoAuxiliaries\VectoAuxiliaries.vbproj">

AuxillaryTestHarness/Dashboard.vb

@@ -871,7 +871,7 @@ Private sub RefreshDisplays()
 
      'M2
      txtM2_out_AvgPowerAtAltFromElectrics.Text=auxEnvironment.M2.GetAveragePowerDemandAtAlternator
-     txtM2_out_AvgPowerAtCrankFromElectrics.Text=auxEnvironment.M2.GetAveragePowerAtCrank()
+     txtM2_out_AvgPowerAtCrankFromElectrics.Text=auxEnvironment.M2.GetAveragePowerAtCrankFromElectrics()
 
      'M3
      txtM3_out_AveragePowerAtCrankFromPneumatics.Text=auxEnvironment.M3.GetAveragePowerDemandAtCrankFromPneumatics

AuxillaryTestHarness/testAlternatorMap - Copy.csv

+Amp,RPM,Efficiency
+10,1500,0.615
+27,1500,0.70
+53,1500,0.1947
+63,1500,0.00
+68,1500,0.00
+125,1500,0.00
+136,1500,0.00
+10,2000,0.62
+27,2000,0.70
+53,2000,0.30
+63,2000,0.1462
+68,2000,0.692
+125,2000,0.00
+136,2000,0.00
+10,4000,0.64
+27,4000,0.6721
+53,4000,0.7211
+63,4000,0.7400
+68,4000,0.7352
+125,4000,0.6800
+136,4000,0.6694
+10,6000,0.5300
+27,6000,0.5798
+53,6000,0.6560
+63,6000,0.6853
+68,6000,0.7000
+125,6000,0.6329
+136,6000,0.6200
+10,7000,0.4750
+27,7000,0.5337
+53,7000,0.6235
+63,7000,0.6580
+68,7000,0.6824
+125,7000,0.6094
+136,7000,0.5953

AuxillaryTestHarness/testAlternatorMap.csv

 Amp,RPM,Efficiency
-10,1500,0.615
-27,1500,0.70
-53,1500,0.1947
-63,1500,0.00
-68,1500,0.00
-125,1500,0.00
-136,1500,0.00
-10,2000,0.62
-27,2000,0.70
-53,2000,0.30
-63,2000,0.1462
-68,2000,0.692
-125,2000,0.00
-136,2000,0.00
-10,4000,0.64
-27,4000,0.6721
-53,4000,0.7211
-63,4000,0.7400
-68,4000,0.7352
-125,4000,0.6800
-136,4000,0.6694
-10,6000,0.5300
-27,6000,0.5798
-53,6000,0.6560
-63,6000,0.6853
-68,6000,0.7000
-125,6000,0.6329
-136,6000,0.6200
-10,7000,0.4750
-27,7000,0.5337
-53,7000,0.6235
-63,7000,0.6580
-68,7000,0.6824
-125,7000,0.6094
-136,7000,0.5953
+10,1500,0.5
+27,1500,0.5
+53,1500,0.5
+63,1500,0.5
+68,1500,0.5
+125,1500,0.5
+136,1500,0.5
+10,2000,0.5
+27,2000,0.5
+53,2000,0.5
+63,2000,0.5
+68,2000,0.5
+125,2000,0.5
+136,2000,0.5
+10,4000,0.5
+27,4000,0.5
+53,4000,0.5
+63,4000,0.5
+68,4000,0.5
+125,4000,0.5
+136,4000,0.5
+10,6000,0.5
+27,6000,0.5
+53,6000,0.5
+63,6000,0.5
+68,6000,0.5
+125,6000,0.5
+136,6000,0.5
+10,7000,0.5
+27,7000,0.5
+53,7000,0.5
+63,7000,0.5
+68,7000,0.5
+125,7000,0.5
+136,7000,0.5

VECTO/Input Files/cVECTO.vb

@@ -9,7 +9,6 @@
 '
 ' See the LICENSE.txt for the specific language governing permissions and limitations.
 
-Imports VectoAuxiliaries.ElectricalConsumers
 
 Imports System.Collections.Generic
 

VECTOAux/VectoAuxiliaries/DownstreamModules/IM6.vb

+
+'Module 6: OVER-RUN smart and non-smart systems alternator and air compressor load calculations
+
+Namespace DownstreamModules
+
+
+Public Interface IM6
+
+'Watts
+ Readonly Property  OverrunFlag As Integer
+ Readonly Property  SmartElecAndPneumaticsCompressorFlag As integer
+ ReadOnly Property  SmartElecAndPneumaticAltPowerGenAtCrank As Single
+ ReadOnly Property  SmartElecAndPneumaticAirCompPowerGenAtCrank As Single
+ ReadOnly Property  SmartElecOnlyAltPowerGenAtCrank As Single
+ ReadOnly Property  AveragePowerDemandAtCrankFromPneumatics As Single
+ ReadOnly Property  SmartPneumaticOnlyAirCompPowerGenAtCrank As Single
+                   
+ ReadOnly Property  AvgPowerDemandAtCrankFromElectricsIncHVAC As Single
+ ReadOnly Property  SmartPneumaticsOnlyCompressorFlag As Integer
+ 
+
+
+End Interface
+
+
+End Namespace
+
+

VECTOAux/VectoAuxiliaries/DownstreamModules/IM7.vb

+
+Imports VectoAuxiliaries.Electrics
+Imports VectoAuxiliaries.Pneumatics
+Imports VectoAuxiliaries.Hvac
+
+Namespace DownstreamModules
+
+
+Public Interface IM7
+
+
+   ReadOnly Property SmartElectricalAndPneumaticAuxAltPowerGenAtCrank As Single
+   ReadOnly Property SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank As Single
+   ReadOnly property SmartElectricalOnlyAuxAltPowerGenAtCrank as single
+   ReadOnly Property SmartPneumaticOnlyAuxAirCompPowerGenAtCrank As Single
+   
+End Interface
+
+
+End Namespace
+
+

VECTOAux/VectoAuxiliaries/DownstreamModules/M6.vb

+
+Imports VectoAuxiliaries.Electrics
+Imports VectoAuxiliaries.Pneumatics
+Imports VectoAuxiliaries.Hvac
+
+Namespace DownstreamModules
+
+Public Class M6
+Implements IM6
+
+
+ private _m1      As IM1_AverageHVACLoadDemand
+ private _m2      As IM2_AverageElectricalLoadDemand
+ private _m3      As IM3_AveragePneumaticLoadDemand
+ Private _m4      As IM4_AirCompressor
+ Private _m5      As IM5_SmartAlternatorSetGeneration
+ Private _signals As ISignals
+
+
+ Public ReadOnly Property AveragePowerDemandAtCrankFromPneumatics As Single Implements IM6.AveragePowerDemandAtCrankFromPneumatics
+        Get
+         Return _m3.GetAveragePowerDemandAtCrankFromPneumatics
+        End Get
+    End Property
+ Public ReadOnly Property AvgPowerDemandAtCrankFromElectricsIncHVAC As Single Implements IM6.AvgPowerDemandAtCrankFromElectricsIncHVAC
+        Get
+ 
+          Return Sum1
+
+        End Get
+
+    End Property
+ Public ReadOnly Property OverrunFlag As Integer Implements IM6.OverrunFlag
+        
+        Get
+           Return  VC0
+        End Get
+    End Property
+ Public ReadOnly Property SmartElecAndPneumaticAltPowerGenAtCrank As Single Implements IM6.SmartElecAndPneumaticAltPowerGenAtCrank
+        Get
+         Return Max1
+        End Get
+    End Property
+ Public ReadOnly Property SmartElecAndPneumaticAirCompPowerGenAtCrank As Single Implements IM6.SmartElecAndPneumaticAirCompPowerGenAtCrank
+        Get
+        Return Sum16
+        End Get
+    End Property
+ Public ReadOnly Property SmartElecAndPneumaticsCompressorFlag As integer Implements IM6.SmartElecAndPneumaticsCompressorFlag
+        Get
+         Return VC2
+        End Get
+    End Property
+ Public ReadOnly Property SmartElecOnlyAltPowerGenAtCrank As Single Implements IM6.SmartElecOnlyAltPowerGenAtCrank
+        Get
+         Return Max2
+        End Get
+    End Property
+ Public ReadOnly Property SmartPneumaticOnlyAirCompPowerGenAtCrank As Single Implements IM6.SmartPneumaticOnlyAirCompPowerGenAtCrank
+        Get
+         Return Sum19
+        End Get
+    End Property
+ Public ReadOnly Property SmartPneumaticsOnlyCompressorFlag As Integer Implements IM6.SmartPneumaticsOnlyCompressorFlag
+        Get
+         Return VC4
+        End Get
+    End Property
+
+
+'switches
+Private ReadOnly Property SW1 As Single
+    Get
+
+    Return If( _signals.SmartElectrics, _m5.AlternatorsGenerationPowerAtCrankTractionOnWatts,Sum1)
+
+    End Get
+End Property
+
+'Max's
+
+'Max of Sum5 vs Sum10
+Public ReadOnly Property Max1 As Single
+    Get
+       Return If( Sum5 > Sum10, Sum5, Sum10)
+    End Get
+End Property
+'Max of Sum10 vs Sum7
+Public ReadOnly Property Max2 As Single
+    Get
+        Return If( Sum7 > Sum10, Sum7, Sum10)
+    End Get
+End Property
+
+'Value Choices
+Public ReadOnly Property VC0 As Single
+    Get
+    Return  If( Sum3<0,1,0)
+    End Get
+End Property
+Public ReadOnly Property VC1 As Single
+    Get
+     Return If( Sum12>0,1,0)
+    End Get
+End Property
+Public ReadOnly Property VC2 As Single
+    Get
+    Return If( Sum12<0 orelse Sum12=0,1,0)
+    End Get
+End Property
+Public ReadOnly Property VC3 As Single
+    Get
+    Return If( Sum13>0,1,0)
+    End Get
+End Property
+Public ReadOnly Property VC4 As Single
+    Get
+    Return If( Sum13<0 orelse Sum13=0, 1,0)
+    End Get
+End Property
+
+'Sums
+Public ReadOnly Property Sum1 As Single
+    Get
+      Return  _m1.AveragePowerDemandAtCrankFromHVACElectricsWatts + _m2.GetAveragePowerAtCrankFromElectrics
+    End Get
+End Property
+Public ReadOnly Property Sum2 As Single
+    Get
+
+    Return _signals.PreExistingAuxPower + _
+           _m1.AveragePowerDemandAtCrankFromHVACMechanicalsWatts +  _
+           _m3.GetAveragePowerDemandAtCrankFromPneumatics + _
+           SW1
+
+    End Get
+End Property
+Public ReadOnly Property Sum3 As Single
+    Get
+
+    Return _signals.EngineMotoringPower  + _
+           _signals.EngineDrivelinePower + _
+           Sum2 
+
+    End Get
+End Property
+Public ReadOnly Property Sum4 As Single
+    Get
+
+      Return Sum3 - SW1 - _m3.GetAveragePowerDemandAtCrankFromPneumatics + _m4.GetPowerCompressorOff
+
+    End Get
+End Property
+Public ReadOnly Property Sum5 As Single
+    Get
+      Return OverrunFlag * Sum4
+    End Get
+End Property
+Public ReadOnly Property Sum6 As Single 
+    Get
+     Return Sum4  -  _m4.GetPowerCompressorOff + _m3.GetAveragePowerDemandAtCrankFromPneumatics
+    End Get
+End Property
+Public ReadOnly Property Sum7 As Single
+    Get
+     Return VC0 * Sum6
+    End Get
+End Property
+Public ReadOnly Property Sum8 As Single
+    Get
+    Return  Sum4 + SW1
+    End Get
+End Property
+Public ReadOnly Property Sum9 As Single
+    Get
+    Return VC0 * Sum8
+    End Get
+End Property
+Public ReadOnly Property Sum10 As Single
+    Get
+    Return -1 * _m5.AlternatorsGenerationPowerAtCrankOverrunWatts
+    End Get
+End Property
+Public ReadOnly Property Sum11 As Single
+    Get
+      Return Sum5 - Max1
+    End Get
+End Property
+Public ReadOnly Property Sum12 As Single
+    Get
+    Return _m4.GetPowerDifference + Sum11
+    End Get
+End Property
+Public ReadOnly Property Sum13 As Single
+    Get
+     Return Sum9 + _m4.GetPowerDifference
+    End Get
+End Property
+Public ReadOnly Property Sum14 As Single
+    Get
+    Return VC1 * _m4.GetPowerCompressorOff
+    End Get
+End Property
+Public ReadOnly Property Sum15 As Single
+    Get
+    Return VC2 * _m4.GetPowerCompressorOn
+    End Get
+End Property
+Public ReadOnly property Sum16 as single
+    Get
+      Return Sum14 + Sum16
+    End Get
+End Property
+Public ReadOnly Property Sum17 As Single
+    Get
+    Return _m4.GetPowerCompressorOff * VC3
+    End Get
+End Property
+Public ReadOnly Property Sum18 As Single
+    Get
+    Return VC4 * _m4.GetPowerCompressorOn
+    End Get
+End Property
+Public ReadOnly Property Sum19 As Single
+    Get
+    Return Sum17 + Sum18
+    end get
+End Property
+
+
+
+ Public Sub new ( m1 As IM1_AverageHVACLoadDemand,
+                  m2 As IM2_AverageElectricalLoadDemand,
+                  m3 As IM3_AveragePneumaticLoadDemand,
+                  m4 As IM4_AirCompressor,
+                  m5 As IM5_SmartAlternatorSetGeneration ,
+                  signals As ISignals )
+
+      _m1=m1
+      _m2=m2
+      _m3=m3
+      _m4=m4
+      _m5=m5
+      _signals= signals
+                  
+ End Sub
+
+
+End Class
+
+End Namespace
+
+
+

VECTOAux/VectoAuxiliaries/DownstreamModules/M7.vb

+Imports VectoAuxiliaries.Electrics
+Imports VectoAuxiliaries.Pneumatics
+Imports VectoAuxiliaries.Hvac
+
+Namespace DownstreamModules
+
+Public Class M7
+     implements IM7
+
+       Private _m5 As IM5_SmartAlternatorSetGeneration
+       Private _m6 As IM6
+       Private _signals As ISignals
+
+        'Boolan  Conditions IE 
+        Private readonly property C1 As Boolean
+
+           Get
+             Return _m6.OverrunFlag=1 Andalso _signals.ClutchEngaged Andalso _signals.InNeutral=false
+           End Get
+
+       End Property
+
+
+        'Internal Switched Outputs 
+        Private readonly Property SW1 As Single
+           Get
+           Return If ( _signals.Idle, _m5.AlternatorsGenerationPowerAtCrankIdleWatts, _m5.AlternatorsGenerationPowerAtCrankTractionOnWatts)
+           End Get
+       End Property
+        Private readonly Property SW2 As Single
+           Get
+             Return  If( C1, _m6.SmartElecAndPneumaticAltPowerGenAtCrank, SW1)
+           End Get
+       End Property
+        Private readonly Property SW3 As Single
+           Get
+            Return If( C1,_m6.SmartElecAndPneumaticAirCompPowerGenAtCrank,_m6.AveragePowerDemandAtCrankFromPneumatics)
+           End Get
+       End Property
+        Private readonly Property SW4 As Single
+           Get
+            Return If( C1,_m6.SmartElecOnlyAltPowerGenAtCrank,SW1)
+           End Get
+       End Property
+        Private readonly Property SW5 As Single
+           Get
+           Return If( C1, _m6.SmartPneumaticOnlyAirCompPowerGenAtCrank,_m6.AveragePowerDemandAtCrankFromPneumatics)
+           End Get
+       End Property
+       
+
+        'Public readonly properties  ( Outputs )
+        Public ReadOnly Property SmartElectricalAndPneumaticAuxAltPowerGenAtCrank As Single Implements IM7.SmartElectricalAndPneumaticAuxAltPowerGenAtCrank
+            Get
+               Return SW2
+            End Get
+        End Property
+        Public ReadOnly Property SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank As Single Implements IM7.SmartElectricalAndPneumaticAuxAirCompPowerGenAtCrank
+            Get
+            Return SW3
+            End Get
+        End Property
+        Public ReadOnly Property SmartElectricalOnlyAuxAltPowerGenAtCrank As Single Implements IM7.SmartElectricalOnlyAuxAltPowerGenAtCrank
+            Get
+            Return SW4
+            End Get
+        End Property
+        Public ReadOnly Property SmartPneumaticOnlyAuxAirCompPowerGenAtCrank As Single Implements IM7.SmartPneumaticOnlyAuxAirCompPowerGenAtCrank
+            Get
+            Return SW5
+            End Get
+        End Property
+
+        Public sub new ( m5 as IM5_SmartAlternatorSetGeneration, _
+                         m6 As IM6, _
+                         signals As ISignals)
+            
+          _m5  = m5
+          _m6  = m6
+          _signals = signals
+
+        End Sub
+
+
+End Class
+
+
+End Namespace
+
+
+

VECTOAux/VectoAuxiliaries/Electrics/IM2_AverageElectricalLoadDemand.vb

@@ -3,7 +3,7 @@
 Public Interface IM2_AverageElectricalLoadDemand
 
     Function GetAveragePowerDemandAtAlternator() As Single
-    Function GetAveragePowerAtCrank() As Single
+    Function GetAveragePowerAtCrankFromElectrics() As Single
 
 End Interface
 

VECTOAux/VectoAuxiliaries/Electrics/IM5_SmartAlternatorSetGeneration.vb

-Public Interface IM5_SmartAlternatorSetGeneration
+
+
+Namespace Electrics
+
+Public Interface IM5_SmartAlternatorSetGeneration
 
 
 
@@ -7,7 +11,10 @@ function  AlternatorsGenerationPowerAtCrankTractionOnWatts() As Single
 function  AlternatorsGenerationPowerAtCrankOverrunWatts() As Single 
 
 
+End Interface
+
 
 
+End Namespace
+
 
-End Interface

VECTOAux/VectoAuxiliaries/Electrics/M2_AverageElectricalLoadDemand.vb

@@ -38,7 +38,7 @@
         End Function
 
 
-        Public Function GetAveragePowerAtCrank() As Single Implements IM2_AverageElectricalLoadDemand.GetAveragePowerAtCrank
+        Public Function GetAveragePowerAtCrankFromElectrics() As Single Implements IM2_AverageElectricalLoadDemand.GetAveragePowerAtCrankFromElectrics
 
             Dim ElectricalPowerDemandsWatts As Single = GetAveragePowerDemandAtAlternator()
             Dim alternatorsEfficiency As Single       = _module0.AlternatorsEfficiency

VECTOAux/VectoAuxiliaries/Hvac/IM1_AverageHVACLoadDemand.vb

-Public Interface IM1_AverageHVACLoadDemand
+
+Namespace Pneumatics
+
+
+Public Interface IM1_AverageHVACLoadDemand
 
 Function AveragePowerDemandAtCrankFromHVACMechanicalsWatts() As Single
 
@@ -14,3 +18,7 @@ Function HVACFuelingLitresPerHour() As Single
 
 
 End Interface
+
+End Namespace
+
+

VECTOAux/VectoAuxiliaries/Hvac/M1_AverageHVACLoadDemand.vb

 Imports VectoAuxiliaries.Electrics
+Imports VectoAuxiliaries.Pneumatics
 
 Namespace Hvac
 
@@ -7,49 +8,49 @@ Namespace Hvac
 
 
     Private _m0 As IM0_NonSmart_AlternatorsSetEfficiency
-    Private _alternatorGearEfficiency As Single 
-    Private _compressorGearEfficiency As single
+    Private _alternatorGearEfficiency As Single
+    Private _compressorGearEfficiency As Single
     Private _hvacInputs As IHVACInputs
     Private _hvacMap As IHVACMap
     Private _signals As ISignals
-    Private _powernetVoltage As single
+    Private _powernetVoltage As Single
     Private _steadyStateModel As IHVACSteadyStateModel
 
 
-    Public Sub new ( m0 As IM0_NonSmart_AlternatorsSetEfficiency, hvacMap As IHVACMap, hvacInputs As IHVACInputs, altGearEfficiency As Single,compressorGearEfficiency As Single,  powernetVoltage As Single, signals As ISignals, ssm As IHVACSteadyStateModel )
+    Public Sub New(m0 As IM0_NonSmart_AlternatorsSetEfficiency, hvacMap As IHVACMap, hvacInputs As IHVACInputs, altGearEfficiency As Single, compressorGearEfficiency As Single, powernetVoltage As Single, signals As ISignals, ssm As IHVACSteadyStateModel)
 
           'Sanity Check - Illegal operations without all params.
-          If m0 is Nothing then  Throw New ArgumentException("Module0 as supplied is null")
-          If hvacMap is Nothing then  Throw New ArgumentException("hvacMap as supplied is null")
-          If hvacInputs is Nothing then  Throw New ArgumentException("hvacInputs as supplied is null")
-          If altGearEfficiency< ElectricConstants.AlternatorPulleyEfficiencyMin orelse altGearEfficiency> ElectricConstants.AlternatorPulleyEfficiencyMax then _
-              Throw New ArgumentException(String.Format("Gear efficiency must be between {0} and {1}",ElectricConstants.AlternatorPulleyEfficiencyMin,ElectricConstants.AlternatorPulleyEfficiencyMax ))
+          If m0 Is Nothing Then Throw New ArgumentException("Module0 as supplied is null")
+          If hvacMap Is Nothing Then Throw New ArgumentException("hvacMap as supplied is null")
+          If hvacInputs Is Nothing Then Throw New ArgumentException("hvacInputs as supplied is null")
+          If altGearEfficiency < ElectricConstants.AlternatorPulleyEfficiencyMin OrElse altGearEfficiency > ElectricConstants.AlternatorPulleyEfficiencyMax Then _
+              Throw New ArgumentException(String.Format("Gear efficiency must be between {0} and {1}", ElectricConstants.AlternatorPulleyEfficiencyMin, ElectricConstants.AlternatorPulleyEfficiencyMax))
 
-          If signals is Nothing then Throw New Exception ("Signals object as supplied is null")
-          If powernetVoltage< ElectricConstants.PowenetVoltageMin orelse powernetVoltage> ElectricConstants.PowenetVoltageMax then _
-          Throw New ArgumentException(String.Format("PowenetVoltage supplied must be in the range {0} to {1}",ElectricConstants.PowenetVoltageMin,ElectricConstants.PowenetVoltageMax))
-          If ssm is Nothing then Throw New ArgumentException("Steady State model was not supplied")
-          If compressorGearEfficiency< 0 orelse altGearEfficiency> 1 then _
-              Throw New ArgumentException(String.Format("Compressor Gear efficiency must be between {0} and {1}",0,1 ))
+          If signals Is Nothing Then Throw New Exception("Signals object as supplied is null")
+          If powernetVoltage < ElectricConstants.PowenetVoltageMin OrElse powernetVoltage > ElectricConstants.PowenetVoltageMax Then _
+          Throw New ArgumentException(String.Format("PowenetVoltage supplied must be in the range {0} to {1}", ElectricConstants.PowenetVoltageMin, ElectricConstants.PowenetVoltageMax))
+          If ssm Is Nothing Then Throw New ArgumentException("Steady State model was not supplied")
+          If compressorGearEfficiency < 0 OrElse altGearEfficiency > 1 Then _
+              Throw New ArgumentException(String.Format("Compressor Gear efficiency must be between {0} and {1}", 0, 1))
 
 
           'Assign
-          _m0=m0
-          _hvacMap= hvacMap
+          _m0 = m0
+          _hvacMap = hvacMap
           _hvacInputs = hvacInputs
-          _alternatorGearEfficiency=altGearEfficiency
+          _alternatorGearEfficiency = altGearEfficiency
           _signals = signals
-          _steadyStateModel=ssm
+          _steadyStateModel = ssm
           _compressorGearEfficiency = compressorGearEfficiency
-          _powernetVoltage=powernetVoltage
+          _powernetVoltage = powernetVoltage
+
 
 
-         
     End Sub
 
 
-        Public Function AveragePowerDemandAtCrankFromHVACMechanicalsWatts() As Single Implements IM1_AverageHVACLoadDemand.AveragePowerDemandAtCrankFromHVACMechanicalsWatts          
-            
+        Public Function AveragePowerDemandAtCrankFromHVACMechanicalsWatts() As Single Implements IM1_AverageHVACLoadDemand.AveragePowerDemandAtCrankFromHVACMechanicalsWatts
+
             Return _steadyStateModel.HVACMechanicalLoadPowerWatts / _compressorGearEfficiency
 
 
@@ -61,15 +62,15 @@ Namespace Hvac
 
        End Function
 
-        Public Function AveragePowerDemandAtCrankFromHVACElectricsWatts() As Single Implements IM1_AverageHVACLoadDemand.AveragePowerDemandAtCrankFromHVACElectricsWatts     
+        Public Function AveragePowerDemandAtCrankFromHVACElectricsWatts() As Single Implements IM1_AverageHVACLoadDemand.AveragePowerDemandAtCrankFromHVACElectricsWatts
+
 
-        
-       Return _steadyStateModel.HVACElectricalLoadPowerWatts/ _m0.AlternatorsEfficiency()
+       Return _steadyStateModel.HVACElectricalLoadPowerWatts / _m0.AlternatorsEfficiency()
 
         End Function
 
 
-        Public Function HVACFuelingLitresPerHour() As Single Implements IM1_AverageHVACLoadDemand.HVACFuelingLitresPerHour   
+        Public Function HVACFuelingLitresPerHour() As Single Implements IM1_AverageHVACLoadDemand.HVACFuelingLitresPerHour
 
 
             Return _steadyStateModel.HVACFuellingLitresPerHour

VECTOAux/VectoAuxiliaries/ISignals.vb

 Public Interface ISignals
 
-
-
-
+Property PreExistingAuxPower As single
 Property EngineMotoringPower As single
 property EngineDrivelinePower as single
 property SmartElectrics As Boolean
@@ -11,7 +9,7 @@ Property EngineSpeed as integer
 Property SmartPneumatics As Boolean
 Property TotalCycleTimeSeconds As Integer
 property EngineDrivelineTorque as single
-
-
+Property Idle As Boolean
+Property InNeutral As Boolean
 
 End Interface

VECTOAux/VectoAuxiliaries/Signals.vb

@@ -2,6 +2,8 @@
 Public Class Signals
 Implements ISignals
 
+
+
     Public Property ClutchEngaged As Boolean Implements ISignals.ClutchEngaged
 
     Public Property EngineDrivelinePower As Single Implements ISignals.EngineDrivelinePower
@@ -18,6 +20,12 @@ Implements ISignals
 
     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
 
 

VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj

@@ -73,6 +73,9 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AuxillaryEnvironment.vb" />
+    <Compile Include="DownstreamModules\IM6.vb" />
+    <Compile Include="DownstreamModules\IM7.vb" />
+    <Compile Include="DownstreamModules\M7.vb" />
     <Compile Include="Electrics\AlternatorMapValues.vb" />
     <Compile Include="Electrics\AlternatorMap.vb" />
     <Compile Include="Electrics\ElectricsUserInputsConfig.vb" />
@@ -103,6 +106,7 @@
     <Compile Include="Hvac\IM1_AverageHVACLoadDemand.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" />
     <Compile Include="Pneumatics\M4_AirCompressor.vb" />

VECTOAux/VectoAuxiliariesTests/Mocks/M1_Mock.vb

+
+Imports VectoAuxiliaries.Electrics
+Imports VectoAuxiliaries.Pneumatics
+Imports VectoAuxiliaries.Hvac
+Imports VectoAuxiliaries.DownstreamModules
+
+
+Public Class M1_Mock
+Implements IM1_AverageHVACLoadDemand
+
+Public  _AveragePowerDemandAtAlternatorFromHVACElectricsWatts As Single
+public _AveragePowerDemandAtCrankFromHVACElectricsWatts As single
+Public _AveragePowerDemandAtCrankFromHVACMechanicalsWatts As Single
+Public _HVACFuelingLitresPerHour As single
+
+    Public Function AveragePowerDemandAtAlternatorFromHVACElectricsWatts() As Single Implements IM1_AverageHVACLoadDemand.AveragePowerDemandAtAlternatorFromHVACElectricsWatts
+       Return AveragePowerDemandAtAlternatorFromHVACElectricsWatts
+    End Function
+
+    Public Function AveragePowerDemandAtCrankFromHVACElectricsWatts() As Single Implements IM1_AverageHVACLoadDemand.AveragePowerDemandAtCrankFromHVACElectricsWatts
+        Return _AveragePowerDemandAtCrankFromHVACElectricsWatts
+    End Function
+
+    Public Function AveragePowerDemandAtCrankFromHVACMechanicalsWatts() As Single Implements IM1_AverageHVACLoadDemand.AveragePowerDemandAtCrankFromHVACMechanicalsWatts
+       Return _AveragePowerDemandAtCrankFromHVACMechanicalsWatts
+    End Function
+
+    Public Function HVACFuelingLitresPerHour() As Single Implements IM1_AverageHVACLoadDemand.HVACFuelingLitresPerHour
+       Return _HVACFuelingLitresPerHour
+    End Function
+
+
+Public Sub new ( AveragePowerDemandAtAlternatorFromHVACElectricsWatts  As Single, _
+                 AveragePowerDemandAtCrankFromHVACElectricsWatts       As single, _
+                 AveragePowerDemandAtCrankFromHVACMechanicalsWatts     As Single, _
+                 HVACFuelingLitresPerHour                              As single)
+
+                 'Assign Values
+                _AveragePowerDemandAtAlternatorFromHVACElectricsWatts  = AveragePowerDemandAtAlternatorFromHVACElectricsWatts
+                _AveragePowerDemandAtCrankFromHVACElectricsWatts       = AveragePowerDemandAtCrankFromHVACElectricsWatts
+                _AveragePowerDemandAtCrankFromHVACMechanicalsWatts     = AveragePowerDemandAtCrankFromHVACMechanicalsWatts
+                _HVACFuelingLitresPerHour                              = HVACFuelingLitresPerHour
+                                                              
+                                                            
+End Sub                                                                              
+
+
+
+
+End Class
+

VECTOAux/VectoAuxiliariesTests/Mocks/M2_Mock.vb

+Imports VectoAuxiliaries.Electrics
+Imports VectoAuxiliaries.Pneumatics
+Imports VectoAuxiliaries.Hvac
+Imports VectoAuxiliaries.DownstreamModules
+
+Public Class M2_Mock
+Implements IM2_AverageElectricalLoadDemand
+
+
+Public _GetAveragePowerAtCrankFromElectrics As Single
+Public _GetAveragePowerDemandAtAlternator   As Single
+
+
+
+    Public Function GetAveragePowerAtCrankFromElectrics() As Single Implements IM2_AverageElectricalLoadDemand.GetAveragePowerAtCrankFromElectrics
+       Return _GetAveragePowerAtCrankFromElectrics
+    End Function
+
+    Public Function GetAveragePowerDemandAtAlternator() As Single Implements IM2_AverageElectricalLoadDemand.GetAveragePowerDemandAtAlternator
+     Return _GetAveragePowerDemandAtAlternator
+    End Function
+
+
+
+Public Sub new ( GetAveragePowerAtCrankFromElectrics As Single,GetAveragePowerDemandAtAlternator As single )
+
+
+ _GetAveragePowerAtCrankFromElectrics =  GetAveragePowerAtCrankFromElectrics
+ _GetAveragePowerDemandAtAlternator   =  GetAveragePowerDemandAtAlternator  
+
+End Sub
+
+
+End Class
+

VECTOAux/VectoAuxiliariesTests/Mocks/M3_Mock.vb

+Imports VectoAuxiliaries.Electrics
+Imports VectoAuxiliaries.Pneumatics
+Imports VectoAuxiliaries.Hvac
+Imports VectoAuxiliaries.DownstreamModules
+
+Public Class M3_Mock
+ Implements IM3_AveragePneumaticLoadDemand
+
+ public _GetAveragePowerDemandAtCrankFromPneumatics    as single
+ public _TotalAirConsumedPerCycle                      as single
+
+
+    Public Function GetAveragePowerDemandAtCrankFromPneumatics() As Single Implements IM3_AveragePneumaticLoadDemand.GetAveragePowerDemandAtCrankFromPneumatics
+     Return _GetAveragePowerDemandAtCrankFromPneumatics
+    End Function
+
+    Public Function TotalAirConsumedPerCycle() As Single Implements IM3_AveragePneumaticLoadDemand.TotalAirConsumedPerCycle
+     Return _TotalAirConsumedPerCycle
+    End Function
+
+
+Public Sub new ( GetAveragePowerDemandAtCrankFromPneumatics As Single,TotalAirConsumedPerCycle As single )
+
+_GetAveragePowerDemandAtCrankFromPneumatics= GetAveragePowerDemandAtCrankFromPneumatics
+_TotalAirConsumedPerCycle = TotalAirConsumedPerCycle
+
+End Sub
+
+
+
+End Class
+