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