Schematic V8.0

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

VECTOAux/VectoAuxiliaries/DownstreamModules/M12.vb

@@ -50,7 +50,7 @@ End Class
      Private function Sum1()As single
 
         Dim  P1 as Point  = New Point with {.X=0, .Y=M11.TotalCycleFuelConsumptionZeroElectricalLoad }
-Dim  P2 As Point  = New Point With {.X=M11.SmartElectricalTotalCycleEletricalEnergyGenerated, .Y=M11.TotalCycleFuelConsumptionSmartElectricalLoad}
+        Dim  P2 As Point  = New Point With {.X=M11.SmartElectricalTotalCycleEletricalEnergyGenerated * ElectricConstants.StoredEnergyEfficiency, .Y=M11.TotalCycleFuelConsumptionSmartElectricalLoad}
 
         Dim IP5x As Single = M11.TotalCycleElectricalDemand
         Dim IP5y As Single = 0

VECTOAux/VectoAuxiliaries/Electrics/ElectricConstants.vb

@@ -31,7 +31,7 @@ Public Class ElectricConstants
     public const  AlternatorPulleyEfficiencyMax as single =1
 
     'Battery
-    Public Const StoredEnergyEfficiency As Single = 0.9025
+    Public Const StoredEnergyEfficiency As Single = 1'0.935 
 
 
 End Class

VECTOAux/VectoAuxiliaries/Electrics/ElectricalConsumerList.vb

@@ -44,7 +44,7 @@ End Sub
      Dim c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12, c13, c14, c15, c16, c17, c18, c19, c20 As IElectricalConsumer
     
      c1 = CType(New ElectricalConsumer(False, "Doors", "Doors per Door",                                                                        3.00, 0.096339, _powernetVoltage, 3), IElectricalConsumer)
-     c2 = CType(New ElectricalConsumer(True, "Veh Electronics &Engine", "Controllers,Valves etc",                                               25.00, 1.00, _powernetVoltage, 0), IElectricalConsumer)
+     c2 = CType(New ElectricalConsumer(True, "Veh Electronics &Engine", "Controllers,Valves etc",                                               25.00, 1.00, _powernetVoltage, 1), IElectricalConsumer)
      c3 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "Radio City",                                                           2.00, 0.80, _powernetVoltage, 1), IElectricalConsumer)
      c4 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "Radio Intercity",                                                      5.00, 0.80, _powernetVoltage, 0), IElectricalConsumer)
      c5 = CType(New ElectricalConsumer(False, "Vehicle basic equipment", "Radio/Audio Tourism",                                                  9.00, 0.80, _powernetVoltage, 0), IElectricalConsumer)

VECTOAux/VectoAuxiliaries/Electrics/M0_5_SmartAlternatorSetEfficiency.vb

@@ -99,8 +99,8 @@ End Property
 ''' <remarks></remarks>
       <ExcludeFromCodeCoverage>
 Private function HvacPlusNonBaseCurrents() As Single
-
-   Return _m0.GetHVACElectricalPowerDemandAmps() + (_electricalConsumables.GetTotalAverageDemandAmps(true) /ElectricConstants.StoredEnergyEfficiency)
+    'Stored Energy Efficience removed from V8.0 21/4/15 by Mike Preston  //tb
+   Return _m0.GetHVACElectricalPowerDemandAmps() + _electricalConsumables.GetTotalAverageDemandAmps(true)  '/ElectricConstants.StoredEnergyEfficiency)
 
 End Function
        

VECTOAux/VectoAuxiliaries/Electrics/M0_NonSmart_AlternatorsSetEfficiency.vb

@@ -53,7 +53,8 @@ Namespace Electrics
    Public ReadOnly Property  AlternatorsEfficiency As Single Implements IM0_NonSmart_AlternatorsSetEfficiency.AlternatorsEfficiency
 
      Get
-          Dim baseCurrentDemandAmps As Single = ( _electricalConsumersList.GetTotalAverageDemandAmps(false) /ElectricConstants.StoredEnergyEfficiency)
+          'Stored Energy Efficience removed from V8.0 21/4/15 by Mike Preston  //tb
+          Dim baseCurrentDemandAmps As Single =  _electricalConsumersList.GetTotalAverageDemandAmps(false)' ElectricConstants.StoredEnergyEfficiency
           Dim totalDemandAmps As Single = baseCurrentDemandAmps + GetHVACElectricalPowerDemandAmps
           Return _alternatorEfficiencyMap.GetEfficiency(_signals.EngineSpeed, totalDemandAmps).Efficiency
     End Get

VECTOAux/VectoAuxiliaries/Electrics/M2_AverageElectricalLoadDemand.vb

@@ -43,7 +43,9 @@ Namespace Electrics
         'Public class outputs (Properties)
         Public Function GetAveragePowerDemandAtAlternator() As Single Implements IM2_AverageElectricalLoadDemand.GetAveragePowerDemandAtAlternator
 
-             Return ( _electricalConsumers.GetTotalAverageDemandAmps(False)/ElectricConstants.StoredEnergyEfficiency) * _powerNetVoltage
+          'Stored Energy Efficience removed from V8.0 21/4/15 by Mike Preston  //tb
+          'Return ( _electricalConsumers.GetTotalAverageDemandAmps(False)/ElectricConstants.StoredEnergyEfficiency) * _powerNetVoltage
+           Return  _electricalConsumers.GetTotalAverageDemandAmps(False) * _powerNetVoltage
 
         End Function
         Public Function GetAveragePowerAtCrankFromElectrics() As Single Implements IM2_AverageElectricalLoadDemand.GetAveragePowerAtCrankFromElectrics

VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb

@@ -1344,6 +1344,7 @@ Private Sub SetupControls()
      cIndex = gvElectricalConsumables.Columns.Add(baseVehicle)
      gvElectricalConsumables.Columns(cIndex).DataPropertyName = "BaseVehicle"
      gvElectricalConsumables.Columns(cIndex).Width = 75
+     gvElectricalConsumables.Columns(cIndex).Visible=false
      gvElectricalConsumables.Columns(cIndex).HeaderCell.Style.Alignment = DataGridViewContentAlignment.TopCenter
      gvElectricalConsumables.Columns(cIndex).HeaderCell.Style.Padding = New Padding(1, 2, 1, 1)
      gvElectricalConsumables.Columns(cIndex).HeaderCell.ToolTipText = "Energy included in the calculations of base vehicle"
@@ -1351,6 +1352,7 @@ Private Sub SetupControls()
      cIndex = gvElectricalConsumables.Columns.Add("NominalConsumptionAmps", "Nominal Amps")
      gvElectricalConsumables.Columns(cIndex).DataPropertyName = "NominalConsumptionAmps"
      gvElectricalConsumables.Columns(cIndex).Width = 70
+     gvElectricalConsumables.Columns(cIndex).ReadOnly=true
      gvElectricalConsumables.Columns(cIndex).HeaderCell.Style.Alignment = DataGridViewContentAlignment.TopCenter
      gvElectricalConsumables.Columns(cIndex).HeaderCell.Style.Padding = New Padding(1, 2, 1, 1)
      gvElectricalConsumables.Columns(cIndex).HeaderCell.ToolTipText = "Nominal consumption in AMPS"
@@ -1358,6 +1360,7 @@ Private Sub SetupControls()
      cIndex = gvElectricalConsumables.Columns.Add("PhaseIdle_TractionOn", "PhaseIdle/ TractionOn")
      gvElectricalConsumables.Columns(cIndex).DataPropertyName = "PhaseIdle_TractionOn"
      gvElectricalConsumables.Columns(cIndex).Width = 70
+     gvElectricalConsumables.Columns(cIndex).ReadOnly=true
      gvElectricalConsumables.Columns(cIndex).HeaderCell.Style.Alignment = DataGridViewContentAlignment.TopCenter
      gvElectricalConsumables.Columns(cIndex).HeaderCell.Style.Padding = New Padding(1, 2, 1, 1)
      gvElectricalConsumables.Columns(cIndex).HeaderCell.ToolTipText = "Represents the amount of time (during engine fueling) as " & vbCrLf & "percentage that the consumer is active during the cycle."

VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb

@@ -94,7 +94,7 @@ End Sub
 Public Sub AlternatorsEfficiencyIdle2000rpmTest()
    Initialise()
 
-   Dim expected As Single = 0.311162233
+   Dim expected As Single = 0.3654489
    Dim actual As Single = target.AlternatorsEfficiencyIdleResultCard()
 
    Assert.AreEqual(expected, actual)
@@ -107,7 +107,7 @@ End Sub
 Public Sub AlternatorsEfficiencyTraction2000rpmTest()
    Initialise()
 
-   Dim expected As Single = 0.311162233
+   Dim expected As Single =  0.3654489
    Dim actual As Single = target.AlternatorsEfficiencyTractionOnResultCard()
 
    Assert.AreEqual(expected, actual)
@@ -119,7 +119,7 @@ End Sub
 Public Sub AlternatorsEfficiencyOverrun2000rpmTest()
    Initialise()
 
-   Dim expected As Single = 0.311162233
+   Dim expected As Single = 0.3654489
    Dim actual As Single = target.AlternatorsEfficiencyOverrunResultCard()
 
    Assert.AreEqual(expected, actual)

VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb

@@ -90,7 +90,7 @@ Public Sub EfficiencyValueTest()
 
        Dim actual As Single = target.AlternatorsEfficiency
 
-       Dim expected As Single = 0.655407
+       Dim expected As Single  = 0.6720275
 
        Assert.AreEqual(expected, actual)
 

VECTOAux/VectoAuxiliariesTests/UnitTests/M12Tests.vb

@@ -11,7 +11,7 @@ Namespace UnitTests
 Public Class M12Tests
 
 <Test()> _
-<TestCase(2,8,6,5,8,6,4.5f,4.5f)> _
+<TestCase(2,8,6,5,8,6,4.67379665f,4.5f)> _
 Public Sub InputOutputValues( IP2  As single, 
                               IP3  As single,
                               IP4  As single, 

VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb

@@ -78,7 +78,7 @@ Public Sub AveragePowerDemandAtCrankFromHVACElectricsWattsTest()
 
 
    Dim target As IM1_AverageHVACLoadDemand = GETM1Instance()
-   Dim expected As Single = 2831.40723
+   Dim expected As Single  = 1118.72766
    dim actual as Single = target.AveragePowerDemandAtCrankFromHVACElectricsWatts
 
    Assert.AreEqual( expected , actual)

VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb

@@ -67,7 +67,7 @@ End Function
         Public Sub GetAveragePowerAtAlternatorTest()
 
 
-            Dim expected As Single =1038.35547
+            Dim expected As Single  = 1594.61572
             Dim target As M2_AverageElectricalLoadDemand = GetAverageElectricalDemandInstance()
             Dim actual As Single = target.GetAveragePowerDemandAtAlternator()
             Assert.AreEqual(expected,actual)
@@ -77,7 +77,7 @@ End Function
         <Test()>
         Public Sub GetAveragePowerAtCrankTest()
             Dim target As M2_AverageElectricalLoadDemand = GetAverageElectricalDemandInstance()
-            Dim expected As Single = 5940.38135
+            Dim expected As Single  = 3604.51074
             Dim actual As Single = target.GetAveragePowerAtCrankFromElectrics()
             Assert.AreEqual(expected, actual)
         End Sub

VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb

@@ -81,7 +81,7 @@ Public Sub  PowerAtCrankIdleWatts()
 
  Initialise()
  _target = New M5__SmartAlternatorSetGeneration(_m05,_powerNetVoltage,_altGearPullyEfficiency)
- Dim expected As Single =5522.91553
+ Dim expected As Single  = 4385.07
  Dim actual As Single = _target.AlternatorsGenerationPowerAtCrankIdleWatts()
 
  Assert.AreEqual( expected,  actual)
@@ -93,7 +93,7 @@ Public Sub  PowerAtCrankTractionWatts()
 
  Initialise()
  _target = New M5__SmartAlternatorSetGeneration(_m05,_powerNetVoltage,_altGearPullyEfficiency)
- Dim expected As Single =5522.91553
+ Dim expected As Single  = 4385.07
  Dim actual As Single = _target.AlternatorsGenerationPowerAtCrankTractionOnWatts()
 
  Assert.AreEqual( expected, actual)
@@ -105,7 +105,7 @@ Public Sub  PowerAtCrankOverrunWatts()
 
  Initialise()
  _target = New M5__SmartAlternatorSetGeneration(_m05,_powerNetVoltage,_altGearPullyEfficiency)
- Dim expected As Single =5522.91553f
+ Dim expected As Single  = 4385.07f
 
  Dim actual As Single = _target.AlternatorsGenerationPowerAtCrankOverrunWatts()
 

VECTOAux/VectoAuxiliariesTests/UnitTests/M7Tests.vb

@@ -44,7 +44,7 @@ End Sub
 'OP3  OP3     :Smart Electrical Aux : Alternator             Power Gen @ Crank
 'OP4  OP4     :Smart Electrical Aux : Ait Compressor         Power Gen @ Crank 
 <Test()> _
-<TestCase(100,200,false,0,false,true,300,400,500,600,700,100,600,100,600)> _
+<TestCase(100,200,false,0,false,true,300,400,500,600,700,200,600,200,600)> _
 <TestCase(100,200,true,0,false,true,300,400,500,600,700,200,600,200,600)> _
 <TestCase(100,200,false,1,true,false,300,400,500,600,700,300,400,500,700)> _
 Public Sub InputOutputTests(byval IP1 As Single,  _