Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 2b8dc44f authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

code formatting, cleanup

parent 95881af5
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 924 additions and 997 deletions
VECTO/cConfig.vb
+ 149
− 157
View file @ 2b8dc44f
' Copyright 2014 European Union.
' Licensed under the EUPL (the 'Licence');
'
' * You may not use this work except in compliance with the Licence.
' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
' * Unless required by applicable law or agreed to in writing,
' software distributed under the Licence is distributed on an "AS IS" basis,
' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
'
' See the LICENSE.txt for the specific language governing permissions and limitations.
Imports System.Collections.Generic
Public Class cConfig
Public FilePath As String
Private Const FormatVersion As Short = 2
Private FileVersion As Short
Public GnUfromCycle As Boolean
Public BatchMode As Boolean
Public ModOut As Boolean
Public BATCHoutpath As String 'Output path for BATCH Mode
Public BATCHoutSubD As Boolean
Public DistCorr As Boolean
Public LogSize As Single
Public AirDensity As Single
Public OpenCmd As String
Public OpenCmdName As String
Public FuelDens As Single
Public CO2perFC As Single
Public FirstRun As Boolean
Public DeclMode As Boolean
Public Sub New()
SetDefault()
End Sub
Public Sub DeclInit()
AirDensity = cDeclaration.AirDensity
FuelDens = cDeclaration.FuelDens
CO2perFC = cDeclaration.CO2perFC
DistCorr = True
GnUfromCycle = False
End Sub
Public Sub SetDefault()
GnUfromCycle = True
BatchMode = False
ModOut = True
BATCHoutpath = sKey.JobPath
BATCHoutSubD = False
DistCorr = True
LogSize = 2
AirDensity = 1.2
OpenCmd = "notepad"
OpenCmdName = "Notepad"
FuelDens = 0.835
CO2perFC = 3.153
FirstRun = True
DeclMode = True
End Sub
Public Sub ConfigLOAD()
Dim JSON As New cJSON
SetDefault()
If Not IO.File.Exists(FilePath) Then Exit Sub
If Not JSON.ReadFile(FilePath) Then GUImsg(tMsgID.Err, "Failed to load settings! Using default settings.")
Try
FileVersion = JSON.Content("Header")("FileVersion")
If FileVersion < 2 Then
BatchMode = (JSON.Content("Body")("LastMode") = 1)
Else
BatchMode = JSON.Content("Body")("LastModeBatch")
End If
ModOut = JSON.Content("Body")("ModOut")
DistCorr = JSON.Content("Body")("DistCorrection")
GnUfromCycle = JSON.Content("Body")("UseGnUfromCycle")
LogSize = JSON.Content("Body")("LogSize")
BATCHoutpath = JSON.Content("Body")("BATCHoutpath")
BATCHoutSubD = JSON.Content("Body")("BATCHoutSubD")
AirDensity = JSON.Content("Body")("AirDensity")
FuelDens = JSON.Content("Body")("FuelDensity")
CO2perFC = JSON.Content("Body")("CO2perFC")
OpenCmd = JSON.Content("Body")("OpenCmd")
OpenCmdName = JSON.Content("Body")("OpenCmdName")
FirstRun = JSON.Content("Body")("FirstRun")
DeclMode = JSON.Content("Body")("DeclMode")
Catch ex As Exception
GUImsg(tMsgID.Err, "Error while loading settings!")
End Try
End Sub
Public Sub ConfigSAVE()
Dim JSON As New cJSON
Dim dic As Dictionary(Of String, Object)
'Header
dic = New Dictionary(Of String, Object)
dic.Add("CreatedBy", Lic.LicString & " (" & Lic.GUID & ")")
dic.Add("Date", Now.ToString)
dic.Add("AppVersion", VECTOvers)
dic.Add("FileVersion", FormatVersion)
JSON.Content.Add("Header", dic)
'Body
dic = New Dictionary(Of String, Object)
dic.Add("LastModeBatch", BatchMode)
dic.Add("ModOut", ModOut)
dic.Add("DistCorrection", DistCorr)
dic.Add("UseGnUfromCycle", GnUfromCycle)
dic.Add("LogSize", LogSize)
dic.Add("BATCHoutpath", BATCHoutpath)
dic.Add("BATCHoutSubD", BATCHoutSubD)
dic.Add("AirDensity", AirDensity)
dic.Add("FuelDensity", FuelDens)
dic.Add("CO2perFC", CO2perFC)
dic.Add("OpenCmd", OpenCmd)
dic.Add("OpenCmdName", OpenCmdName)
dic.Add("FirstRun", FirstRun)
dic.Add("DeclMode", DeclMode)
JSON.Content.Add("Body", dic)
JSON.WriteFile(FilePath)
End Sub
End Class
' Copyright 2014 European Union.
' Licensed under the EUPL (the 'Licence');
'
' * You may not use this work except in compliance with the Licence.
' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
' * Unless required by applicable law or agreed to in writing,
' software distributed under the Licence is distributed on an "AS IS" basis,
' WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
'
' See the LICENSE.txt for the specific language governing permissions and limitations.
Imports System.Collections.Generic
Public Class cConfig
Public FilePath As String
Private Const FormatVersion As Short = 2
Private FileVersion As Short
Public GnUfromCycle As Boolean
Public BatchMode As Boolean
Public ModOut As Boolean
Public BATCHoutpath As String 'Output path for BATCH Mode
Public BATCHoutSubD As Boolean
Public DistCorr As Boolean
Public LogSize As Single
Public AirDensity As Single
Public OpenCmd As String
Public OpenCmdName As String
Public FuelDens As Single
Public CO2perFC As Single
Public FirstRun As Boolean
Public DeclMode As Boolean
Public Sub New()
SetDefault()
End Sub
Public Sub DeclInit()
AirDensity = cDeclaration.AirDensity
FuelDens = cDeclaration.FuelDens
CO2perFC = cDeclaration.CO2perFC
DistCorr = True
GnUfromCycle = False
End Sub
Public Sub SetDefault()
GnUfromCycle = True
BatchMode = False
ModOut = True
BATCHoutpath = sKey.JobPath
BATCHoutSubD = False
DistCorr = True
LogSize = 2
AirDensity = 1.2
OpenCmd = "notepad"
OpenCmdName = "Notepad"
FuelDens = 0.835
CO2perFC = 3.153
FirstRun = True
DeclMode = True
End Sub
Public Sub ConfigLOAD()
Dim JSON As New cJSON
SetDefault()
If Not IO.File.Exists(FilePath) Then Exit Sub
If Not JSON.ReadFile(FilePath) Then GUImsg(tMsgID.Err, "Failed to load settings! Using default settings.")
Try
FileVersion = JSON.Content("Header")("FileVersion")
If FileVersion < 2 Then
BatchMode = (JSON.Content("Body")("LastMode") = 1)
Else
BatchMode = JSON.Content("Body")("LastModeBatch")
End If
ModOut = JSON.Content("Body")("ModOut")
DistCorr = JSON.Content("Body")("DistCorrection")
GnUfromCycle = JSON.Content("Body")("UseGnUfromCycle")
LogSize = JSON.Content("Body")("LogSize")
BATCHoutpath = JSON.Content("Body")("BATCHoutpath")
BATCHoutSubD = JSON.Content("Body")("BATCHoutSubD")
AirDensity = JSON.Content("Body")("AirDensity")
FuelDens = JSON.Content("Body")("FuelDensity")
CO2perFC = JSON.Content("Body")("CO2perFC")
OpenCmd = JSON.Content("Body")("OpenCmd")
OpenCmdName = JSON.Content("Body")("OpenCmdName")
FirstRun = JSON.Content("Body")("FirstRun")
DeclMode = JSON.Content("Body")("DeclMode")
Catch ex As Exception
GUImsg(tMsgID.Err, "Error while loading settings!")
End Try
End Sub
Public Sub ConfigSAVE()
Dim JSON As New cJSON
Dim dic As Dictionary(Of String, Object)
'Header
dic = New Dictionary(Of String, Object)
dic.Add("CreatedBy", Lic.LicString & " (" & Lic.GUID & ")")
dic.Add("Date", Now.ToString)
dic.Add("AppVersion", VECTOvers)
dic.Add("FileVersion", FormatVersion)
JSON.Content.Add("Header", dic)
'Body
dic = New Dictionary(Of String, Object)
dic.Add("LastModeBatch", BatchMode)
dic.Add("ModOut", ModOut)
dic.Add("DistCorrection", DistCorr)
dic.Add("UseGnUfromCycle", GnUfromCycle)
dic.Add("LogSize", LogSize)
dic.Add("BATCHoutpath", BATCHoutpath)
dic.Add("BATCHoutSubD", BATCHoutSubD)
dic.Add("AirDensity", AirDensity)
dic.Add("FuelDensity", FuelDens)
dic.Add("CO2perFC", CO2perFC)
dic.Add("OpenCmd", OpenCmd)
dic.Add("OpenCmdName", OpenCmdName)
dic.Add("FirstRun", FirstRun)
dic.Add("DeclMode", DeclMode)
JSON.Content.Add("Body", dic)
JSON.WriteFile(FilePath)
End Sub
End Class
VECTOAux/VectoAuxiliaries/DownstreamModules/IM9.vb
+ 1
− 1
View file @ 2b8dc44f
......@@ -30,7 +30,7 @@ Inherits IAuxiliaryEvent
''' </summary>
''' <param name="stepTimeInSeconds">Single : Mutiplies the values to be aggregated by number of seconds</param>
''' <remarks></remarks>
Sub CycleStep( Optional stepTimeInSeconds As Single = nothing)
Sub CycleStep(Optional stepTimeInSeconds As Single = 0.0)
''' <summary>
''' Litres Of Air: Compressor On Continually (L)
......
VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
+ 0
− 1
View file @ 2b8dc44f
......@@ -87,7 +87,6 @@
<Compile Include="DownstreamModules\cDelaunayMap.vb" />
<Compile Include="DownstreamModules\cFile V3.vb" />
<Compile Include="DownstreamModules\cMAP.vb" />
<Compile Include="DownstreamModules\IFUELMAP.vb" />
<Compile Include="DownstreamModules\IM10.vb" />
<Compile Include="DownstreamModules\IM11.vb" />
<Compile Include="DownstreamModules\IM12.vb" />
......
VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
+ 1
− 1
View file @ 2b8dc44f
......@@ -22,7 +22,7 @@ Private Function GetSSM() As ISSMTOOL
Const _SSMMAP As String = "TestFiles\ssm.Ahsm
Const _BusDatabase As String ="TestFiles\BusDatabase.abdb
'Const _BusDatabase As String ="TestFiles\BusDatabase.abdb
Dim ssm As ISSMTOOL = New SSMTOOL(_SSMMAP, New HVACConstants())
......
VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb
+ 114
− 125
View file @ 2b8dc44f
......@@ -8,131 +8,120 @@ Imports Moq
Namespace UnitTests
'This implements the ISSMTOOL and returns 50% of the EngineHeatWaste as a Fueling Value
'for the purpose of this test.
public class SSMToolMock
implements ISSMTOOL
Public Property Calculate As ISSMCalculate Implements ISSMTOOL.Calculate
Public Property SSMDisabled As Boolean Implements ISSMTOOL.SSMDisabled
Public Property HVACConstants As IHVACConstants Implements ISSMTOOL.HVACConstants
Public Sub Clone(from As ISSMTOOL) Implements ISSMTOOL.Clone
End Sub
Public ReadOnly Property ElectricalWAdjusted As Single Implements ISSMTOOL.ElectricalWAdjusted
Get
End Get
End Property
Public ReadOnly Property ElectricalWBase As Single Implements ISSMTOOL.ElectricalWBase
Get
End Get
End Property
Public ReadOnly Property FuelPerHBase As Single Implements ISSMTOOL.FuelPerHBase
Get
End Get
End Property
Public ReadOnly Property FuelPerHBaseAdjusted As Single Implements ISSMTOOL.FuelPerHBaseAdjusted
Get
End Get
End Property
Public Function FuelPerHBaseAsjusted(AverageUseableEngineWasteHeatKW As Single) As Single Implements ISSMTOOL.FuelPerHBaseAsjusted
Return 0.5 * AverageUseableEngineWasteHeatKW
End Function
Public Property GenInputs As ISSMGenInputs Implements ISSMTOOL.GenInputs
Get
Return New SSMGenInputs(True)
End Get
Set(value As ISSMGenInputs)
End Set
End Property
Public Function IsEqualTo(source As ISSMTOOL) As Boolean Implements ISSMTOOL.IsEqualTo
End Function
Public Function Load(filePath As String) As Boolean Implements ISSMTOOL.Load
End Function
Public ReadOnly Property MechanicalWBase As Single Implements ISSMTOOL.MechanicalWBase
Get
End Get
End Property
Public ReadOnly Property MechanicalWBaseAdjusted As Single Implements ISSMTOOL.MechanicalWBaseAdjusted
Get
End Get
End Property
Public Function Save(filePath As String) As Boolean Implements ISSMTOOL.Save
End Function
Public Property TechList As ISSMTechList Implements ISSMTOOL.TechList
public Event Message(ByRef sender As Object, message As String, messageType As AdvancedAuxiliaryMessageType) Implements ISSMTOOL.Message
End Class
<TestFixture()> _
Public Class M14Tests
<Test()> _
Public sub ValuesTest()
'Arrange
Dim ip1 As Single = 1000f
Dim ip5 As Single = 3114
Dim ip6 As Single = 3114
Dim expectedOut1 As Single = 780333.4F
Dim expectedOut2 As Single = 0.934531F
Dim m13 As New Mock(Of IM13)
Dim hvacSSM As New Mock(Of ISSMTOOL)
Dim signals As new Mock( Of ISignals)
Dim ssmMock As ISSMTOOL = New SSMToolMock()
Dim constants As IHVACConstants = New HVACConstants(835)
'Moq' Arrangements
m13.Setup ( Function(x) x.WHTCTotalCycleFuelConsumptionGrams).Returns(ip1)
signals.Setup( Function(x) x.CurrentCycleTimeInSeconds) .Returns(ip5)
'Act
Dim m14 As New M14(m13.Object,ssmMock,constants,signals.Object)
'Assert
Assert.AreEqual( expectedOut1, m14.TotalCycleFCGrams)
Assert.AreEqual( expectedOut2, m14.TotalCycleFCLitres)
End sub
End Class
'This implements the ISSMTOOL and returns 50% of the EngineHeatWaste as a Fueling Value
'for the purpose of this test.
Public Class SSMToolMock
Implements ISSMTOOL
Public Property Calculate As ISSMCalculate Implements ISSMTOOL.Calculate
Public Property SSMDisabled As Boolean Implements ISSMTOOL.SSMDisabled
Public Property HVACConstants As IHVACConstants Implements ISSMTOOL.HVACConstants
Public Sub Clone(from As ISSMTOOL) Implements ISSMTOOL.Clone
End Sub
Public ReadOnly Property ElectricalWAdjusted As Single Implements ISSMTOOL.ElectricalWAdjusted
Get
Throw New NotImplementedException
End Get
End Property
Public ReadOnly Property ElectricalWBase As Single Implements ISSMTOOL.ElectricalWBase
Get
Throw New NotImplementedException
End Get
End Property
Public ReadOnly Property FuelPerHBase As Single Implements ISSMTOOL.FuelPerHBase
Get
Throw New NotImplementedException
End Get
End Property
Public ReadOnly Property FuelPerHBaseAdjusted As Single Implements ISSMTOOL.FuelPerHBaseAdjusted
Get
Throw New NotImplementedException
End Get
End Property
Public Function FuelPerHBaseAsjusted(AverageUseableEngineWasteHeatKW As Single) As Single _
Implements ISSMTOOL.FuelPerHBaseAsjusted
Return 0.5 * AverageUseableEngineWasteHeatKW
End Function
Public Property GenInputs As ISSMGenInputs Implements ISSMTOOL.GenInputs
Get
Return New SSMGenInputs(True)
End Get
Set(value As ISSMGenInputs)
End Set
End Property
Public Function IsEqualTo(source As ISSMTOOL) As Boolean Implements ISSMTOOL.IsEqualTo
Throw New NotImplementedException
End Function
Public Function Load(filePath As String) As Boolean Implements ISSMTOOL.Load
Throw New NotImplementedException
End Function
Public ReadOnly Property MechanicalWBase As Single Implements ISSMTOOL.MechanicalWBase
Get
Throw New NotImplementedException
End Get
End Property
Public ReadOnly Property MechanicalWBaseAdjusted As Single Implements ISSMTOOL.MechanicalWBaseAdjusted
Get
Throw New NotImplementedException
End Get
End Property
Public Function Save(filePath As String) As Boolean Implements ISSMTOOL.Save
Throw New NotImplementedException
End Function
Public Property TechList As ISSMTechList Implements ISSMTOOL.TechList
Public Event Message(ByRef sender As Object, message As String, messageType As AdvancedAuxiliaryMessageType) _
Implements ISSMTOOL.Message
End Class
<TestFixture()>
Public Class M14Tests
<Test()>
Public Sub ValuesTest()
'Arrange
Dim ip1 As Single = 1000.0F
Dim ip5 As Single = 3114
Dim ip6 As Single = 3114
Dim expectedOut1 As Single = 780333.4F
Dim expectedOut2 As Single = 0.934531F
Dim m13 As New Mock(Of IM13)
Dim hvacSSM As New Mock(Of ISSMTOOL)
Dim signals As New Mock(Of ISignals)
Dim ssmMock As ISSMTOOL = New SSMToolMock()
Dim constants As IHVACConstants = New HVACConstants(835)
'Moq' Arrangements
m13.Setup(Function(x) x.WHTCTotalCycleFuelConsumptionGrams).Returns(ip1)
signals.Setup(Function(x) x.CurrentCycleTimeInSeconds).Returns(ip5)
'Act
Dim m14 As New M14(m13.Object, ssmMock, constants, signals.Object)
'Assert
Assert.AreEqual(expectedOut1, m14.TotalCycleFCGrams)
Assert.AreEqual(expectedOut2, m14.TotalCycleFCLitres)
End Sub
End Class
End Namespace
VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
+ 69
− 81
View file @ 2b8dc44f
......@@ -6,117 +6,105 @@ Imports VectoAuxiliaries.Hvac
Imports VectoAuxiliaries
Namespace UnitTests
<TestFixture()>
Public Class M5_SmartAlternatorSetGenerationTests
'Constants
Private Const _powerNetVoltage As Single = 26.3
Private Const _hvacMap As String = "testFiles\TestHvacMap.csv"
Private Const _altMap As String = "testFiles\testAlternatormap.aalt"
Private Const _rpm As Integer = 2000
Private Const _altGearPullyEfficiency As Single = 0.8
<TestFixture()>
Public Class M5_SmartAlternatorSetGenerationTests
'Private fields
Private _m05 As M0_5_SmartAlternatorSetEfficiency
Private _target As M5__SmartAlternatorSetGeneration
Private _signals As ISignals = New Signals
Private ssmHVac As IHVACSteadyStateModel = New HVACSteadyStateModel(100, 100, 100)
'Constants
Private const _powerNetVoltage As Single = 26.3
Private Const _hvacMap As String = "testFiles\TestHvacMap.csv"
Private Const _altMap As String = "testFiles\testAlternatormap.aalt"
Private const _rpm as Integer = 2000
Private const _altGearPullyEfficiency As Single =0.8
'Private fields
Private _m05 As M0_5_SmartAlternatorSetEfficiency
Private _target As M5__SmartAlternatorSetGeneration
Private _signals As ISignals = New Signals
Private ssmHVac As IHVACSteadyStateModel = New HVACSteadyStateModel(100,100,100)
Private Function GetSSM() As ISSMTOOL
Private Function GetSSM() As ISSMTOOL
Const _SSMMAP As String = "TestFiles\ssm.Ahsm"
'Const _BusDatabase As String ="TestFiles\BusDatabase.abdb
Dim ssm As ISSMTOOL = New SSMTOOL(_SSMMAP, New HVACConstants())
Const _SSMMAP As String = "TestFiles\ssm.Ahsm
Const _BusDatabase As String ="TestFiles\BusDatabase.abdb
Dim ssm As ISSMTOOL = New SSMTOOL(_SSMMAP, New HVACConstants())
ssm.Load(_SSMMAP)
ssm.Load( _SSMMAP)
Return ssm
End Function
Private Sub Initialise()
Return ssm
_signals.EngineSpeed = 2000
Dim elecConsumers As New ElectricalConsumerList(_powerNetVoltage, 0.096, True)
End Function
Dim alternatoMap As New AlternatorMap(_altMap)
alternatoMap.Initialise()
Dim m0 As New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers, alternatoMap, _powerNetVoltage, _signals, GetSSM())
Private sub Initialise()
'Results Cards
Dim readings = New List(Of SmartResult)
readings.Add(New SmartResult(10, 8))
readings.Add(New SmartResult(70, 63))
_signals.EngineSpeed= 2000
Dim idleResult As New ResultCard(readings)
Dim tractionResult As New ResultCard(readings)
Dim overrunResult As New ResultCard(readings)
Dim elecConsumers As New ElectricalConsumerList(_powerNetVoltage,0.096,True)
Dim signals As ISignals = New Signals
signals.EngineSpeed = 2000
Dim alternatoMap As New AlternatorMap(_altMap)
alternatoMap.Initialise()
Dim m0 As New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers,alternatoMap,_powerNetVoltage,_signals,GetSSM())
_m05 = New M0_5_SmartAlternatorSetEfficiency(m0, elecConsumers, alternatoMap, idleResult, tractionResult,
overrunResult, signals)
End Sub
'Results Cards
Dim readings = new List(Of SmartResult)
readings.Add( New SmartResult(10,8))
readings.Add( New SmartResult(70,63))
<Test()>
Public Sub CreateNewTest()
Dim idleResult As New ResultCard(readings)
Dim tractionResult As New ResultCard(readings)
Dim overrunResult As New ResultCard(readings)
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05, _powerNetVoltage, _altGearPullyEfficiency)
Assert.IsNotNull(_target)
End Sub
Dim signals As ISignals = New Signals
signals.EngineSpeed=2000
<Test()>
Public Sub PowerAtCrankIdleWatts()
_m05 = New M0_5_SmartAlternatorSetEfficiency(m0,elecConsumers,alternatoMap,idleResult,tractionResult,overrunResult,signals)
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05, _powerNetVoltage, _altGearPullyEfficiency)
Dim expected As Single = 1641.35791
Dim actual As Single = _target.AlternatorsGenerationPowerAtCrankIdleWatts()
End Sub
Assert.AreEqual(expected, actual)
End Sub
<Test()> _
Public Sub CreateNewTest()
<Test()>
Public Sub PowerAtCrankTractionWatts()
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05,_powerNetVoltage,_altGearPullyEfficiency)
Assert.IsNotNull( _target )
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05, _powerNetVoltage, _altGearPullyEfficiency)
Dim expected As Single = 1641.35791
Dim actual As Single = _target.AlternatorsGenerationPowerAtCrankTractionOnWatts()
End Sub
Assert.AreEqual(expected, actual)
End Sub
<Test()> _
Public Sub PowerAtCrankIdleWatts()
<Test()>
Public Sub PowerAtCrankOverrunWatts()
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05,_powerNetVoltage,_altGearPullyEfficiency)
Dim expected As Single = 1641.35791
Dim actual As Single = _target.AlternatorsGenerationPowerAtCrankIdleWatts()
Assert.AreEqual( expected, actual)
End Sub
<Test()> _
Public Sub PowerAtCrankTractionWatts()
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05,_powerNetVoltage,_altGearPullyEfficiency)
Dim expected As Single = 1641.35791
Dim actual As Single = _target.AlternatorsGenerationPowerAtCrankTractionOnWatts()
Assert.AreEqual( expected, actual)
End Sub
<Test()> _
Public Sub PowerAtCrankOverrunWatts()
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05,_powerNetVoltage,_altGearPullyEfficiency)
Dim expected As Single = 1641.35791F
Dim actual As Single = _target.AlternatorsGenerationPowerAtCrankOverrunWatts()
Assert.AreEqual( expected,actual)
End Sub
End Class
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05, _powerNetVoltage, _altGearPullyEfficiency)
Dim expected As Single = 1641.35791F
Dim actual As Single = _target.AlternatorsGenerationPowerAtCrankOverrunWatts()
Assert.AreEqual(expected, actual)
End Sub
End Class
End Namespace
VECTOAux/VectoAuxiliariesTests/UnitTests/M9Tests.vb
+ 108
− 115
View file @ 2b8dc44f
......@@ -7,121 +7,114 @@ Imports VectoAuxiliaries
Imports Moq
Namespace UnitTests
<TestFixture()>
Public Class M9Tests
<Test()> _
<TestCase(50, 50, 400, 200, 100, 1200, 50, 0, 0, 0.5F, False, 50.0F, 0, 0.181108221F, 0.180887148F)> _
<TestCase(50, 50, 400, 200, 100, 1200, 50, 1, 0, 0.5F, False, 50.0F, 0, 0.181108221F, 0.180887148F)> _
<TestCase(50, 50, 400, 200, 100, 1200, 50, 0, 1, 0.5F, False, 50.0F, 0, 0.181108221F, 0.180887148F)> _
<TestCase(50, 50, 400, 200, 100, 1200, 50, 1, 1, 0.5F, False, 50.0F, 0, 0.181108221F, 0.180887148F)> _
<TestCase(50, 50, 400, 200, 100, 1200, 50, 1, 1, 0.5F, True, 0, 0, 0, 0)> _
Public Sub ValuesInOutTests(IP1 As Single,
IP2 As Single,
IP3 As Single,
IP4 As Single,
IP5 As Single,
IP6 As Single,
IP7 As Single,
IP8 As Single,
IP9 As Single,
IP10 As Single,
IP11 As Boolean,
AG1 As Single,
AG2 As Single,
AG3 As Single,
AG4 As Single)
Dim m1Mock As New Mock(Of IM1_AverageHVACLoadDemand)
Dim m4Mock As New Mock(Of IM4_AirCompressor)
Dim m6Mock As New Mock(Of IM6)
Dim m8Mock As New Mock(Of IM8)
Dim fMapMock As New MockFuel50PC()
Dim sgnlsMock As New Mock(Of ISignals)
Dim psac As New Mock(Of IPneumaticsAuxilliariesConfig)
m6Mock.Setup(Function(x) x.AvgPowerDemandAtCrankFromElectricsIncHVAC).Returns(IP1)
m1Mock.Setup(Function(x) x.AveragePowerDemandAtCrankFromHVACMechanicalsWatts).Returns(IP2)
m4Mock.Setup(Function(x) x.GetPowerCompressorOn).Returns(IP3)
m4Mock.Setup(Function(x) x.GetPowerCompressorOff).Returns(IP4)
sgnlsMock.Setup(Function(x) x.EngineDrivelineTorque).Returns(IP5)
sgnlsMock.Setup(Function(x) x.EngineSpeed).Returns(IP6)
m4Mock.Setup(Function(x) x.GetFlowRate).Returns(IP7)
m6Mock.Setup(Function(x) x.OverrunFlag).Returns(IP8)
m8Mock.Setup(Function(x) x.CompressorFlag).Returns(IP9)
psac.Setup(Function(x) x.OverrunUtilisationForCompressionFraction).Returns(IP10)
sgnlsMock.Setup(Function(x) x.EngineStopped).Returns(IP11)
Dim target As New M9(m1Mock.Object, m4Mock.Object, m6Mock.Object, m8Mock.Object, fMapMock, psac.Object, sgnlsMock.Object)
target.CycleStep(1)
Assert.AreEqual(target.LitresOfAirCompressorOnContinually, AG1)
Assert.AreEqual(target.LitresOfAirCompressorOnOnlyInOverrun, AG2)
Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOnContinuously, CType(Math.Round(AG3, 7), Single))
Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOffContinuously, AG4)
End Sub
<Test()> _
<TestCase(50,50,400,200,100,1200,50,0,0,0.5f,false,50f,0, 0.18110822f,0.18088715f)> _
Public Sub NEGATIVEINTERPADJUSTMENTValuesInOutTests(IP1 As Single,
IP2 As Single,
IP3 As Single,
IP4 As Single,
IP5 As Single,
IP6 As Single,
IP7 As Single,
IP8 As Single,
IP9 As Single,
IP10 As Single,
IP11 As Boolean,
AG1 As Single,
AG2 As Single,
AG3 As Single,
AG4 As Single)
Dim m1Mock As New Mock(Of IM1_AverageHVACLoadDemand)
Dim m4Mock As New Mock(Of IM4_AirCompressor)
Dim m6Mock As New Mock(Of IM6)
Dim m8Mock As New Mock(Of IM8)
Dim fMapMock As New Mock(Of IFuelMap )
Dim sgnlsMock As New Mock(Of ISignals)
Dim psac As New Mock(Of IPneumaticsAuxilliariesConfig )
fMapMock.Setup ( Function(x) x.fFCdelaunay_Intp(1,1) ).Returns(-1)
m6Mock.Setup ( Function(x) x.AvgPowerDemandAtCrankFromElectricsIncHVAC ) .Returns(IP1)
m1Mock.Setup ( Function(x) x.AveragePowerDemandAtCrankFromHVACMechanicalsWatts ).Returns(IP2)
m4Mock.Setup ( Function(x) x.GetPowerCompressorOn) .Returns(IP3)
m4Mock.Setup ( Function(x) x.GetPowerCompressorOff) .Returns(IP4)
sgnlsMock.Setup( Function(x) x.EngineDrivelineTorque) .Returns(IP5)
sgnlsMock.Setup( Function(x) x.EngineSpeed) .Returns(IP6)
m4Mock.Setup ( Function(x) x.GetFlowRate) .Returns(IP7)
m6Mock.Setup ( Function(x) x.OverrunFlag) .Returns(IP8)
m8Mock.Setup ( Function(x) x.CompressorFlag) .Returns(IP9)
psac.Setup ( Function(x) x.OverrunUtilisationForCompressionFraction) .Returns(IP10)
sgnlsMock.Setup( Function(x) x.EngineStopped) .Returns(IP11)
Dim target As New M9( m1Mock.Object, m4Mock.Object, m6Mock.Object,m8Mock.Object,fMapMock.Object,psac.Object,sgnlsMock.Object)
target.CycleStep(1)
Assert.AreEqual(target.LitresOfAirCompressorOnContinually , AG1 )
Assert.AreEqual(target.LitresOfAirCompressorOnOnlyInOverrun , AG2 )
Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOnContinuously , 0 )
Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOffContinuously, 0)
End Sub
End Class
<TestFixture()>
Public Class M9Tests
<Test()> _
<TestCase(50, 50, 400, 200, 100, 1200, 50, 0, 0, 0.5F, False, 50.0F, 0, 0.181108221F, 0.180887148F)> _
<TestCase(50, 50, 400, 200, 100, 1200, 50, 1, 0, 0.5F, False, 50.0F, 0, 0.181108221F, 0.180887148F)> _
<TestCase(50, 50, 400, 200, 100, 1200, 50, 0, 1, 0.5F, False, 50.0F, 0, 0.181108221F, 0.180887148F)> _
<TestCase(50, 50, 400, 200, 100, 1200, 50, 1, 1, 0.5F, False, 50.0F, 0, 0.181108221F, 0.180887148F)> _
<TestCase(50, 50, 400, 200, 100, 1200, 50, 1, 1, 0.5F, True, 0, 0, 0, 0)>
Public Sub ValuesInOutTests(IP1 As Single,
IP2 As Single,
IP3 As Single,
IP4 As Single,
IP5 As Single,
IP6 As Single,
IP7 As Single,
IP8 As Single,
IP9 As Single,
IP10 As Single,
IP11 As Boolean,
AG1 As Single,
AG2 As Single,
AG3 As Single,
AG4 As Single)
Dim m1Mock As New Mock(Of IM1_AverageHVACLoadDemand)
Dim m4Mock As New Mock(Of IM4_AirCompressor)
Dim m6Mock As New Mock(Of IM6)
Dim m8Mock As New Mock(Of IM8)
Dim fMapMock As New MockFuel50PC()
Dim sgnlsMock As New Mock(Of ISignals)
Dim psac As New Mock(Of IPneumaticsAuxilliariesConfig)
m6Mock.Setup(Function(x) x.AvgPowerDemandAtCrankFromElectricsIncHVAC).Returns(IP1)
m1Mock.Setup(Function(x) x.AveragePowerDemandAtCrankFromHVACMechanicalsWatts).Returns(IP2)
m4Mock.Setup(Function(x) x.GetPowerCompressorOn).Returns(IP3)
m4Mock.Setup(Function(x) x.GetPowerCompressorOff).Returns(IP4)
sgnlsMock.Setup(Function(x) x.EngineDrivelineTorque).Returns(IP5)
sgnlsMock.Setup(Function(x) x.EngineSpeed).Returns(IP6)
m4Mock.Setup(Function(x) x.GetFlowRate).Returns(IP7)
m6Mock.Setup(Function(x) x.OverrunFlag).Returns(IP8)
m8Mock.Setup(Function(x) x.CompressorFlag).Returns(IP9)
psac.Setup(Function(x) x.OverrunUtilisationForCompressionFraction).Returns(IP10)
sgnlsMock.Setup(Function(x) x.EngineStopped).Returns(IP11)
Dim _
target As _
New M9(m1Mock.Object, m4Mock.Object, m6Mock.Object, m8Mock.Object, fMapMock, psac.Object, sgnlsMock.Object)
target.CycleStep(1)
Assert.AreEqual(target.LitresOfAirCompressorOnContinually, AG1)
Assert.AreEqual(target.LitresOfAirCompressorOnOnlyInOverrun, AG2)
Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOnContinuously, CType(Math.Round(AG3, 7), Single))
Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOffContinuously, AG4)
End Sub
<Test()> _
<TestCase(50, 50, 400, 200, 100, 1200, 50, 0, 0, 0.5F, False, 50.0F, 0, 0.181108221F, 0.180887148F)>
Public Sub NEGATIVEINTERPADJUSTMENTValuesInOutTests(IP1 As Single,
IP2 As Single,
IP3 As Single,
IP4 As Single,
IP5 As Single,
IP6 As Single,
IP7 As Single,
IP8 As Single,
IP9 As Single,
IP10 As Single,
IP11 As Boolean,
AG1 As Single,
AG2 As Single,
AG3 As Single,
AG4 As Single)
Dim m1Mock As New Mock(Of IM1_AverageHVACLoadDemand)
Dim m4Mock As New Mock(Of IM4_AirCompressor)
Dim m6Mock As New Mock(Of IM6)
Dim m8Mock As New Mock(Of IM8)
Dim fMapMock As New Mock(Of IFuelConsumptionMap)
Dim sgnlsMock As New Mock(Of ISignals)
Dim psac As New Mock(Of IPneumaticsAuxilliariesConfig)
fMapMock.Setup(Function(x) x.GetFuelConsumption(1, 1)).Returns(-1)
m6Mock.Setup(Function(x) x.AvgPowerDemandAtCrankFromElectricsIncHVAC).Returns(IP1)
m1Mock.Setup(Function(x) x.AveragePowerDemandAtCrankFromHVACMechanicalsWatts).Returns(IP2)
m4Mock.Setup(Function(x) x.GetPowerCompressorOn).Returns(IP3)
m4Mock.Setup(Function(x) x.GetPowerCompressorOff).Returns(IP4)
sgnlsMock.Setup(Function(x) x.EngineDrivelineTorque).Returns(IP5)
sgnlsMock.Setup(Function(x) x.EngineSpeed).Returns(IP6)
m4Mock.Setup(Function(x) x.GetFlowRate).Returns(IP7)
m6Mock.Setup(Function(x) x.OverrunFlag).Returns(IP8)
m8Mock.Setup(Function(x) x.CompressorFlag).Returns(IP9)
psac.Setup(Function(x) x.OverrunUtilisationForCompressionFraction).Returns(IP10)
sgnlsMock.Setup(Function(x) x.EngineStopped).Returns(IP11)
Dim _
target As _
New M9(m1Mock.Object, m4Mock.Object, m6Mock.Object, m8Mock.Object, fMapMock.Object, psac.Object, sgnlsMock.Object)
target.CycleStep(1)
Assert.AreEqual(target.LitresOfAirCompressorOnContinually, AG1)
Assert.AreEqual(target.LitresOfAirCompressorOnOnlyInOverrun, AG2)
Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOnContinuously, 0)
Assert.AreEqual(target.TotalCycleFuelConsumptionCompressorOffContinuously, 0)
End Sub
End Class
End Namespace
VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
+ 481
− 514
View file @ 2b8dc44f
This diff is collapsed.
VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
+ 1
− 2
View file @ 2b8dc44f
......@@ -101,6 +101,7 @@
<ItemGroup>
<Compile Include="Mocks\AlternatorMapMock.vb" />
<Compile Include="Mocks\CompressorMapMock.vb" />
<Compile Include="Mocks\MockFuel50PC.vb" />
<Compile Include="UnitTests\AuxiliaryEnvironmentComparisonTests.vb" />
<Compile Include="Mocks\M1_Mock.vb" />
<Compile Include="Mocks\M2_Mock.vb" />
......@@ -109,11 +110,9 @@
<Compile Include="Mocks\M5_Mock.vb" />
<Compile Include="Mocks\M6_Mock.vb" />
<Compile Include="Mocks\M7_Mock.vb" />
<Compile Include="Mocks\MockFuel50PC.vb" />
<Compile Include="UnitTests\BusDatabaseTests.vb" />
<Compile Include="UnitTests\CombinedAlternatorTests.vb" />
<Compile Include="UnitTests\FilePathUtilityTests.vb" />
<Compile Include="UnitTests\FuelMapTests.vb" />
<Compile Include="UnitTests\HVACSSMMapTests.vb" />
<Compile Include="UnitTests\M0_5_SmartAlternatorSetEfficiencyTests.vb" />
<Compile Include="UnitTests\M0_NonSmart_AlternatorsSetEfficiencyTests.vb" />
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about