diff --git a/VECTO/MODcalc/cMOD.vb b/VECTO/MODcalc/cMOD.vb
index 0ce2de66e485f59f2eec0bd8712978017d274af8..bcd5151409193fd96c8a5d97ca1fdab4ad39b91a 100644
--- a/VECTO/MODcalc/cMOD.vb
+++ b/VECTO/MODcalc/cMOD.vb
@@ -57,15 +57,15 @@ Public Class cMOD
public AA_TotalCycleFC_Litres As List(Of single? )
'TODO:DIAGNOSTICS (D) REMOVE WHEN TESTED
- public AA_D_M12_P1X as list( of single )
- public AA_D_M12_P1Y as list( of single )
- public AA_D_M12_P2X as list( of single )
- public AA_D_M12_P2Y as list( of single )
- public AA_D_M12_P3X as list( of single )
- public AA_D_M12_P3Y as list( of single )
- public AA_D_M12_XTAIN as list( of single )
- public AA_D_M12_INTERP1 as list( of single )
- public AA_D_M12_INTERP2 as list( of single )
+ 'public AA_D_M12_P1X as list( of single )
+ 'public AA_D_M12_P1Y as list( of single )
+ 'public AA_D_M12_P2X as list( of single )
+ 'public AA_D_M12_P2Y as list( of single )
+ 'public AA_D_M12_P3X as list( of single )
+ 'public AA_D_M12_P3Y as list( of single )
+ 'public AA_D_M12_XTAIN as list( of single )
+ 'public AA_D_M12_INTERP1 as list( of single )
+ 'public AA_D_M12_INTERP2 as list( of single )
'***********************************************************
@@ -123,15 +123,16 @@ Public Class cMOD
AA_TotalCycleFC_Grams = new List(Of single? )
AA_TotalCycleFC_Litres = new List(Of single? )
- AA_D_M12_P1X = new List(Of single )
- AA_D_M12_P1Y = new List(Of single )
- AA_D_M12_P2X = new List(Of single )
- AA_D_M12_P2Y = new List(Of single )
- AA_D_M12_P3X = new List(Of single )
- AA_D_M12_P3Y = new List(Of single )
- AA_D_M12_XTAIN = new List(Of single )
- AA_D_M12_INTERP1 = new List(Of single )
- AA_D_M12_INTERP2 = new List(Of single )
+ 'TODO REMOVE WHEN TESTING COMPLETE
+ 'AA_D_M12_P1X = new List(Of single )
+ 'AA_D_M12_P1Y = new List(Of single )
+ 'AA_D_M12_P2X = new List(Of single )
+ 'AA_D_M12_P2Y = new List(Of single )
+ 'AA_D_M12_P3X = new List(Of single )
+ 'AA_D_M12_P3Y = new List(Of single )
+ 'AA_D_M12_XTAIN = new List(Of single )
+ 'AA_D_M12_INTERP1 = new List(Of single )
+ 'AA_D_M12_INTERP2 = new List(Of single )
'*************************************************************************
@@ -590,31 +591,31 @@ Public Class cMOD
'AA-TB
'Advanced Auxiliaries
- s.Append(",AA_NonSmartAlternatorsEfficiency [Fraction]")
- s.Append(",AA_SmartIdleCurrent_Amps [Amps] ")
- s.Append(",AA_SmartIdleAlternatorsEfficiency [Fraction]")
- s.Append(",AA_SmartTractionCurrent_Amps [Amps]")
- s.Append(",AA_SmartTractionAlternatorEfficiency [Fraction]")
- s.Append(",AA_SmartOverrunCurrent_Amps [Amps]")
- s.Append(",AA_SmartOverrunAlternatorEfficiency [Fraction]")
- s.Append(",AA_CompressorFlowRate_LitrePerSec [Ni L/S]")
- s.Append(",AA_OverrunFlag [Integer 0/1]")
- s.Append(",AA_EngineIdleFlag [Integer 0/1]")
- s.Append(",AA_CompressorFlag [Integer 0/1]")
- s.Append(",AA_TotalCycleFC_Grams")
- s.Append(",AA_TotalCycleFC_Litres")
+ 's.Append(",AA_NonSmartAlternatorsEfficiency [Fraction]")
+ 's.Append(",AA_SmartIdleCurrent_Amps [Amps] ")
+ 's.Append(",AA_SmartIdleAlternatorsEfficiency [Fraction]")
+ 's.Append(",AA_SmartTractionCurrent_Amps [Amps]")
+ 's.Append(",AA_SmartTractionAlternatorEfficiency [Fraction]")
+ 's.Append(",AA_SmartOverrunCurrent_Amps [Amps]")
+ 's.Append(",AA_SmartOverrunAlternatorEfficiency [Fraction]")
+ 's.Append(",AA_CompressorFlowRate_LitrePerSec [Ni L/S]")
+ 's.Append(",AA_OverrunFlag [Integer 0/1]")
+ 's.Append(",AA_EngineIdleFlag [Integer 0/1]")
+ 's.Append(",AA_CompressorFlag [Integer 0/1]")
+ 's.Append(",AA_TotalCycleFC_Grams")
+ 's.Append(",AA_TotalCycleFC_Litres")
'TODO:
'DIAGNOSTICS REMOVE WHEN TESTED
- s.Append(",AA_D_M12_P1X [Single]")
- s.Append(",AA_D_M12_P1Y [Single]")
- s.Append(",AA_D_M12_P2X [Single]")
- s.Append(",AA_D_M12_P2Y [Single]")
- s.Append(",AA_D_M12_P3X [Single]")
- s.Append(",AA_D_M12_P3Y [Single]")
- s.Append(",AA_D_M12_XTAIN [Single]")
- s.Append(",AA_D_M12_INTERP1 [Single]")
- s.Append(",AA_D_M12_INTERP2 [Single]")
+ 's.Append(",AA_D_M12_P1X [Single]")
+ 's.Append(",AA_D_M12_P1Y [Single]")
+ 's.Append(",AA_D_M12_P2X [Single]")
+ 's.Append(",AA_D_M12_P2Y [Single]")
+ 's.Append(",AA_D_M12_P3X [Single]")
+ 's.Append(",AA_D_M12_P3Y [Single]")
+ 's.Append(",AA_D_M12_XTAIN [Single]")
+ 's.Append(",AA_D_M12_INTERP1 [Single]")
+ 's.Append(",AA_D_M12_INTERP2 [Single]")
@@ -795,15 +796,15 @@ Public Class cMOD
'TODO:REMOVE WHEN TESTED
'DIAGNOSTICS
- s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_P1X (t).toString(),""))
- s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_P1Y (t).toString(),""))
- s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_P2X (t).toString(),""))
- s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_P2Y (t).toString(),""))
- s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_P3X (t).toString(),""))
- s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_P3Y (t).toString(),""))
- s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_XTAIN (t).toString(),""))
- s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_INTERP1 (t).toString(),""))
- s.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_INTERP2 (t).toString(),""))
+ 's.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_P1X (t).toString(),""))
+ 's.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_P1Y (t).toString(),""))
+ 's.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_P2X (t).toString(),""))
+ 's.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_P2Y (t).toString(),""))
+ 's.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_P3X (t).toString(),""))
+ 's.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_P3Y (t).toString(),""))
+ 's.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_XTAIN (t).toString(),""))
+ 's.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_INTERP1 (t).toString(),""))
+ 's.Append(Sepp & if(vecto_global.VEC.AuxiliaryAssembly<>"CLASSIC", AA_D_M12_INTERP2 (t).toString(),""))
diff --git a/VECTO/MODcalc/cPower.vb b/VECTO/MODcalc/cPower.vb
index 92eef83b65fc9313d7df7e92f4347ee09b4bd0f0..d5d5d6a622584351369dee2f281b283097b2c79c 100644
--- a/VECTO/MODcalc/cPower.vb
+++ b/VECTO/MODcalc/cPower.vb
@@ -1476,20 +1476,21 @@ lb_nOK:
'TODO:DIAGNOSTICS - REMOVE WHEN TESTED
- ModData.AA_D_M12_P1X .Add( advancedAuxModel.AA_D_M12_P1X)
- ModData.AA_D_M12_P1Y .Add( advancedAuxModel.AA_D_M12_P1Y)
- ModData.AA_D_M12_P2X .Add( advancedAuxModel.AA_D_M12_P2X)
- ModData.AA_D_M12_P2Y .Add( advancedAuxModel.AA_D_M12_P2Y)
- ModData.AA_D_M12_P3X .Add( advancedAuxModel.AA_D_M12_P3X)
- ModData.AA_D_M12_P3Y .Add( advancedAuxModel.AA_D_M12_P3Y)
- ModData.AA_D_M12_XTAIN .Add( advancedAuxModel.AA_D_M12_XTAIN)
- ModData.AA_D_M12_INTERP1 .Add( advancedAuxModel.AA_D_M12_INTERP1)
- ModData.AA_D_M12_INTERP2 .Add( advancedAuxModel.AA_D_M12_INTERP2)
+ 'ModData.AA_D_M12_P1X .Add( advancedAuxModel.AA_D_M12_P1X)
+ 'ModData.AA_D_M12_P1Y .Add( advancedAuxModel.AA_D_M12_P1Y)
+ 'ModData.AA_D_M12_P2X .Add( advancedAuxModel.AA_D_M12_P2X)
+ 'ModData.AA_D_M12_P2Y .Add( advancedAuxModel.AA_D_M12_P2Y)
+ 'ModData.AA_D_M12_P3X .Add( advancedAuxModel.AA_D_M12_P3X)
+ 'ModData.AA_D_M12_P3Y .Add( advancedAuxModel.AA_D_M12_P3Y)
+ 'ModData.AA_D_M12_XTAIN .Add( advancedAuxModel.AA_D_M12_XTAIN)
+ 'ModData.AA_D_M12_INTERP1 .Add( advancedAuxModel.AA_D_M12_INTERP1)
+ 'ModData.AA_D_M12_INTERP2 .Add( advancedAuxModel.AA_D_M12_INTERP2)
Catch ex as Exception
- 'TODO:SOMETHING MEANINGFUL
+ Dim dummy As Single=0
+
End try
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
index e7d518362c33ea1011abb38e4723b3ccf82c13c2..16a3ac53886110160a511d8bdf77a1cb84d5ee45 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/CombinedAlternatorTests.vb
@@ -403,7 +403,7 @@ Namespace UnitTests
End Sub
- ' <Test()>
+ '<Test()>
Public Sub Performance()
@@ -417,14 +417,22 @@ Namespace UnitTests
Dim demand As single
Dim rand As New Random(50)
+ Dim min As Single = 0.1
+ Dim max As single = 0.1
+
For x = 1 to 500000
- crank = rand.Next(500,3000)
- demand = rand.Next(1,200)
+ 'crank = rand.Next(500,3000)
+ 'demand = rand.Next(1,200)
+
+ crank = rand.Next(0,0)
+ demand = rand.Next(0,0)
Dim actual As AlternatorMapValues = ca.GetEfficiency(crank,demand)
+ If actual.Efficiency < min then min=actual.Efficiency
+ If actual.Efficiency > max then max = actual.Efficiency
Next
@@ -473,7 +481,22 @@ Namespace UnitTests
End Sub
- <Test()>
+ '<Test()>
+ ' Public Sub AlternatorsUnequalEfficiency()
+
+
+ ' Dim ca As new CombinedAlternator("abc.aalt")
+ ' Dim original As new CombinedAlternator("abc.aalt")
+
+ ' ca.Alternators(0).InputTable2000(1).Eff=0.99999
+
+ ' 'Only tests efficiency values table row 1-3
+ ' Assert.IsFalse(ca.IsEqualTo( original))
+
+ ' End Sub
+
+
+ <Test()>
Public Sub AlternatorsUnequalEfficiency()
@@ -488,6 +511,10 @@ Namespace UnitTests
End Sub
+
+
+
+
End Class