Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 5ed2bc38 authored by Terry Burns's avatar Terry Burns Committed by Kostis ANAGNOSTOPOULOS
Browse files
parent 73b6582c
No related branches found
No related tags found
No related merge requests found
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
End Function End Function
Public Function GetAveragePowerAtCrank(ByVal engineRpm As Integer, doorDutyCycleZeroToOne As Single) As Single Public Function GetAveragePowerAtCrank(ByVal engineRpm As Integer) As Single
Dim ElectricalPowerDemandsWatts As Single = GetAveragePowerDemandAtAlternator() * _powerNetVoltage Dim ElectricalPowerDemandsWatts As Single = GetAveragePowerDemandAtAlternator() * _powerNetVoltage
Dim alternatorsEfficiency As Single = _module0.GetEfficiency(engineRpm) Dim alternatorsEfficiency As Single = _module0.GetEfficiency(engineRpm)
......
...@@ -4,7 +4,6 @@ Namespace Electrics ...@@ -4,7 +4,6 @@ Namespace Electrics
Public Class M5__SmartAlternatorSetGeneration Public Class M5__SmartAlternatorSetGeneration
Implements IM5_SmartAlternatorSetGeneration Implements IM5_SmartAlternatorSetGeneration
Private _powerNetVoltage As Single Private _powerNetVoltage As Single
Private _m05 As M0_5_SmartAlternatorSetEfficiency Private _m05 As M0_5_SmartAlternatorSetEfficiency
Private _alternatorGearEfficiency As single Private _alternatorGearEfficiency As single
......
...@@ -4,53 +4,24 @@ Namespace Hvac ...@@ -4,53 +4,24 @@ Namespace Hvac
Public Class M1_AverageHVACLoadDemand Public Class M1_AverageHVACLoadDemand
Dim map As IHVACMap Private _m0 As IM0_NonSmart_AlternatorsSetEfficiency
Private _alternatorGearEfficiency As Single
Private _hvacInputs As IHVACInputs
Private _hvacMap As IHVACMap
Public Property Region As Integer Public Sub new ( m0 As IM0_NonSmart_AlternatorsSetEfficiency, altGearEfficiency As Single )
Public Property Season As Integer
Public Sub New(ByVal map As IHVACMap, inputs As IHVACInputs)
Me.map = map
Me.Region = inputs.Region
Me.Season = inputs.Season
End Sub End Sub
Public Function Initialise() As Boolean
End Function
Public Function AverageMechanicalPowerDemandAtCrank() As Single
Return 0 'TODO FIX THIS.
End Function End Class
Function AverageElectricalPowerDemandAtAlternator() As Single
Return 0 'TODO FIX THIS
End Function
Function AverageElectricalPowerDemandAtCrank(engineRPM As Single) As Single
Return 0 'TODO FIX THIS
End Function
End Class
End Namespace End Namespace
\ No newline at end of file
...@@ -57,7 +57,7 @@ Namespace UnitTests ...@@ -57,7 +57,7 @@ Namespace UnitTests
Public Sub GetAveragePowerAtCrankTest() Public Sub GetAveragePowerAtCrankTest()
Dim target As M2_AverageElectricalLoadDemand = GetAverageElectricalDemandInstance() Dim target As M2_AverageElectricalLoadDemand = GetAverageElectricalDemandInstance()
Dim expected As Single = 2356.12964 Dim expected As Single = 2356.12964
Dim actual As Single = target.GetAveragePowerAtCrank(2000, csngDoorDutyCycleZeroToOne) Dim actual As Single = target.GetAveragePowerAtCrank(2000)
Assert.AreEqual(expected, actual) Assert.AreEqual(expected, actual)
End Sub End Sub
......
Imports NUnit.Framework
Imports VectoAuxiliaries.Pneumatics
Imports VectoAuxiliariesTests.Mocks
Imports VectoAuxiliaries.Electrics
Imports VectoAuxiliaries.Hvac
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.csv"
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 sub Initialise()
Dim elecConsumers As New ElectricalConsumerList(26.3,0.096,True)
Dim hvacInputs As New HVACInputs(1,1)
Dim hvacMap As New HVACMap(_hvacMap)
hvacMap.Initialise()
Dim alternatoMap As New AlternatorMap(_altMap)
alternatoMap.Initialise()
Dim m0 As New M0_NonSmart_AlternatorsSetEfficiency(elecConsumers,hvacInputs,hvacMap,alternatoMap,_powerNetVoltage)
'Results Cards
Dim readings = new Dictionary(Of single, single)
readings.Add(10,8)
readings.Add(70,63)
Dim idleResult As New ResultCard(readings)
Dim tractionResult As New ResultCard(readings)
Dim overrunResult As New ResultCard(readings)
_m05 = New M0_5_SmartAlternatorSetEfficiency(m0,elecConsumers,alternatoMap,idleResult,tractionResult,overrunResult)
End Sub
<Test()> _
Public Sub CreateNewTest()
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05,_powerNetVoltage,_altGearPullyEfficiency)
Assert.IsNotNull( _target )
End Sub
<Test()> _
Public Sub PowerAtCrankIdleWatts()
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05,_powerNetVoltage,_altGearPullyEfficiency)
Dim expected As Single =1681.42822
Dim actual As Single = _target.AlternatorsGenerationPowerAtCrankIdleWatts(_rpm)
Assert.AreEqual( expected, actual)
End Sub
<Test()> _
Public Sub PowerAtCrankTractionWatts()
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05,_powerNetVoltage,_altGearPullyEfficiency)
Dim expected As Single =1681.42822
Dim actual As Single = _target.AlternatorsGenerationPowerAtCrankTractionOnWatts(_rpm)
Assert.AreEqual( expected, actual)
End Sub
<Test()> _
Public Sub PowerAtCrankOverrunWatts()
Initialise()
_target = New M5__SmartAlternatorSetGeneration(_m05,_powerNetVoltage,_altGearPullyEfficiency)
Dim expected As Single =1681.42822
Dim actual As Single = _target.AlternatorsGenerationPowerAtCrankOverrunWatts(_rpm)
Assert.AreEqual( expected, actual)
End Sub
End Class
End Namespace
...@@ -93,6 +93,7 @@ ...@@ -93,6 +93,7 @@
<Compile Include="UnitTests\AveragePneumaticLoadDemandTests.vb" /> <Compile Include="UnitTests\AveragePneumaticLoadDemandTests.vb" />
<Compile Include="UnitTests\ElectricalConsumerListTests.vb" /> <Compile Include="UnitTests\ElectricalConsumerListTests.vb" />
<Compile Include="UnitTests\HVACMapTests.vb" /> <Compile Include="UnitTests\HVACMapTests.vb" />
<Compile Include="UnitTests\M5_SmartAlternatorSetGenerationTests.vb" />
<Compile Include="UnitTests\PneumaticActuationsMapTests.vb" /> <Compile Include="UnitTests\PneumaticActuationsMapTests.vb" />
<Compile Include="UnitTests\AirCompressorTests.vb" /> <Compile Include="UnitTests\AirCompressorTests.vb" />
<Compile Include="UnitTests\AlternatorMapTests.vb" /> <Compile Include="UnitTests\AlternatorMapTests.vb" />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment