diff --git a/VECTOAux/VectoAuxiliaries/Pneumatics/M4_AirCompressor.vb b/VECTOAux/VectoAuxiliaries/Pneumatics/M4_AirCompressor.vb
index db87a9f6f987dca77d5daf3658f412257cd95f9b..450caa370b8fae389587adea39fd5a68dd8f1450 100644
--- a/VECTOAux/VectoAuxiliaries/Pneumatics/M4_AirCompressor.vb
+++ b/VECTOAux/VectoAuxiliaries/Pneumatics/M4_AirCompressor.vb
@@ -10,168 +10,164 @@
' See the LICENSE.txt for the specific language governing permissions and limitations.
Namespace Pneumatics
-
-
- Public Class M4_AirCompressor
-
- Implements IM4_AirCompressor
-
- Private Const MinRatio As Single = 1
- Private Const MaxRatio As Single = 10
- Private Const MinEff As Single = 0
- Private Const MaxEff As Single = 1
-
- Private _pulleyGearRatio As Single
- Private _pulleyGearEfficiency As Single
- Private _map As ICompressorMap
- Private _signals As ISignals
-
-
- ''' <summary>
- ''' Ratio of Gear or Pulley used to drive the compressor
- ''' </summary>
- ''' <value></value>
- ''' <returns></returns>
- ''' <remarks></remarks>
- Public Property PulleyGearRatio() As Single Implements IM4_AirCompressor.PulleyGearRatio
- Get
- Return _pulleyGearRatio
- End Get
- Set(value As Single)
- If (value < MinRatio OrElse value > MaxRatio) Then
- Throw New ArgumentOutOfRangeException(String.Format("Invalid value, should be in the range {0} to {1}", MinRatio, MaxRatio), value)
- Else
- _pulleyGearRatio = value
- End If
- End Set
- End Property
-
- ''' <summary>
- ''' Efficiency of the Pulley or Gear used to drive the compressor
- ''' </summary>
- ''' <value></value>
- ''' <returns></returns>
- ''' <remarks></remarks>
- Public Property PulleyGearEfficiency() As Single Implements IM4_AirCompressor.PulleyGearEfficiency
- Get
- Return _pulleyGearEfficiency
- End Get
- Set(value As Single)
- If (value < MinEff OrElse value > MaxEff) Then
- Throw New ArgumentOutOfRangeException(String.Format("Invalid value, should be in the range {0} to {1}", MinEff, MaxEff), value)
- Else
- _pulleyGearEfficiency = value
- End If
- End Set
- End Property
-
-
- '''<summary>
- ''' Creates a new instance of the AirCompressor Class
- ''' </summary>
- ''' <param name="map">map of compressor values against compressor rpm</param>
- ''' <param name="pulleyGearRatio">Ratio of Pulley/Gear</param>
- ''' <param name="pulleyGearEfficiency">Efficiency of Pulley/Gear</param>
- ''' <remarks></remarks>
- Public Sub New(ByVal map As ICompressorMap, byref pulleyGearRatio As Single, byref pulleyGearEfficiency As Single, signals As ISignals)
-
- _map = map
- _pulleyGearRatio = pulleyGearRatio
- _pulleyGearEfficiency = pulleyGearEfficiency
- _signals = signals
-
- End Sub
-
- ''' <summary>
- ''' Initialises the AirCompressor Class
- ''' </summary>
- ''' <returns></returns>
- ''' <remarks></remarks>
- Public Function Initialise() As Boolean Implements IM4_AirCompressor.Initialise
- Return _map.Initialise()
- End Function
-
- 'Queryable Compressor Methods
- '
- 'Compressor ( Speed ) Flow Rate
- 'Power @ Crank From Pnumatics compressor off ( A )
- 'Power @ Crank From Pnumatics compressor On ( B )
- 'Power Delta ( A ) vs ( B )
-
-
- 'Return Average Power Demand Per Compressor Unit Flow Rate
-
-
- ''' <summary>
- ''' Returns the flow rate [litres/second] of compressor for the given engine rpm
- ''' </summary>
- ''' <returns></returns>
- ''' <remarks></remarks>
- Public Function GetFlowRate() As Single Implements IM4_AirCompressor.GetFlowRate
- Dim compressorRpm As Single = _signals.EngineSpeed * PulleyGearRatio
-
- ''Flow Rate in the map is Litres/min so divide by 60 to get Units per second.
- Return _map.GetFlowRate(compressorRpm) / 60
-
- End Function
-
- ''' <summary>
- ''' Returns the power consumed for the given engine rpm when compressor is off
- ''' </summary>
- ''' <returns></returns>
- ''' <remarks></remarks>
- Public Function GetPowerCompressorOff() As Single Implements IM4_AirCompressor.GetPowerCompressorOff
- Return GetCompressorPower(False)
- End Function
-
- ''' <summary>
- ''' Returns the power consumed for the given engine rpm when compressor is on
- ''' </summary>
- ''' <returns></returns>
- ''' <remarks></remarks>
- Public Function GetPowerCompressorOn() As Single Implements IM4_AirCompressor.GetPowerCompressorOn
- Return GetCompressorPower( True)
- End Function
-
- ''' <summary>
- ''' Returns the difference in power between compressonr on and compressor off operation at the given engine rpm
- ''' </summary>
- ''' <returns></returns>
- ''' <remarks></remarks>
- Public Function GetPowerDifference() As Single Implements IM4_AirCompressor.GetPowerDifference
- Dim powerOn As Single = GetPowerCompressorOn()
- Dim powerOff As Single = GetPowerCompressorOff()
- Return powerOn - powerOff
- End Function
-
- ''' <summary>
- ''' Looks up the compressor power from the map at given engine speed
- ''' </summary>
- ''' <param name="compressorOn">Is compressor on</param>
- ''' <returns></returns>
- ''' <remarks></remarks>
- Private Function GetCompressorPower( ByVal compressorOn As Boolean) As Single
- Dim compressorRpm As Single = _signals.EngineSpeed * PulleyGearRatio
- If compressorOn Then
- Return _map.GetPowerCompressorOn(compressorRpm)
- Else
- Return _map.GetPowerCompressorOff(compressorRpm)
- End If
- End Function
-
- ''' <summary>
- ''' Aver
- ''' </summary>
- ''' <returns></returns>
- ''' <remarks></remarks>
- Public Function GetAveragePowerDemandPerCompressorUnitFlowRate() As Single Implements IM4_AirCompressor.GetAveragePowerDemandPerCompressorUnitFlowRate
-
- Return _map.GetAveragePowerDemandPerCompressorUnitFlowRate()
-
- End Function
-
-
-
- End Class
-
+ Public Class M4_AirCompressor
+ Implements IM4_AirCompressor
+
+ Private Const MinRatio As Single = 1
+ Private Const MaxRatio As Single = 10
+ Private Const MinEff As Single = 0
+ Private Const MaxEff As Single = 1
+
+ Private _pulleyGearRatio As Single
+ Private _pulleyGearEfficiency As Single
+ Private _map As ICompressorMap
+ Private _signals As ISignals
+
+
+ ''' <summary>
+ ''' Ratio of Gear or Pulley used to drive the compressor
+ ''' </summary>
+ ''' <value></value>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
+ Public Property PulleyGearRatio() As Single Implements IM4_AirCompressor.PulleyGearRatio
+ Get
+ Return _pulleyGearRatio
+ End Get
+ Set(value As Single)
+ If (value < MinRatio OrElse value > MaxRatio) Then
+ Throw _
+ New ArgumentOutOfRangeException(
+ String.Format("Invalid value, should be in the range {0} to {1}", MinRatio, MaxRatio), value)
+ Else
+ _pulleyGearRatio = value
+ End If
+ End Set
+ End Property
+
+ ''' <summary>
+ ''' Efficiency of the Pulley or Gear used to drive the compressor
+ ''' </summary>
+ ''' <value></value>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
+ Public Property PulleyGearEfficiency() As Single Implements IM4_AirCompressor.PulleyGearEfficiency
+ Get
+ Return _pulleyGearEfficiency
+ End Get
+ Set(value As Single)
+ If (value < MinEff OrElse value > MaxEff) Then
+ Throw _
+ New ArgumentOutOfRangeException(String.Format("Invalid value, should be in the range {0} to {1}", MinEff, MaxEff),
+ value)
+ Else
+ _pulleyGearEfficiency = value
+ End If
+ End Set
+ End Property
+
+
+ '''<summary>
+ ''' Creates a new instance of the AirCompressor Class
+ ''' </summary>
+ ''' <param name="map">map of compressor values against compressor rpm</param>
+ ''' <param name="pulleyGearRatio">Ratio of Pulley/Gear</param>
+ ''' <param name="pulleyGearEfficiency">Efficiency of Pulley/Gear</param>
+ ''' <remarks></remarks>
+ Public Sub New(ByVal map As ICompressorMap, ByRef pulleyGearRatio As Single, ByRef pulleyGearEfficiency As Single,
+ signals As ISignals)
+
+ _map = map
+ _pulleyGearRatio = pulleyGearRatio
+ _pulleyGearEfficiency = pulleyGearEfficiency
+ _signals = signals
+ End Sub
+
+ ''' <summary>
+ ''' Initialises the AirCompressor Class
+ ''' </summary>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
+ Public Function Initialise() As Boolean Implements IM4_AirCompressor.Initialise
+ Return _map.Initialise()
+ End Function
+
+ 'Queryable Compressor Methods
+ '
+ 'Compressor ( Speed ) Flow Rate
+ 'Power @ Crank From Pnumatics compressor off ( A )
+ 'Power @ Crank From Pnumatics compressor On ( B )
+ 'Power Delta ( A ) vs ( B )
+
+
+ 'Return Average Power Demand Per Compressor Unit Flow Rate
+
+
+ ''' <summary>
+ ''' Returns the flow rate [litres/second] of compressor for the given engine rpm
+ ''' </summary>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
+ Public Function GetFlowRate() As Single Implements IM4_AirCompressor.GetFlowRate
+ Dim compressorRpm As Single = _signals.EngineSpeed * PulleyGearRatio
+
+ ''Flow Rate in the map is Litres/min so divide by 60 to get Units per second.
+ Return _map.GetFlowRate(compressorRpm) / 60
+ End Function
+
+ ''' <summary>
+ ''' Returns the power consumed for the given engine rpm when compressor is off
+ ''' </summary>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
+ Public Function GetPowerCompressorOff() As Single Implements IM4_AirCompressor.GetPowerCompressorOff
+ Return GetCompressorPower(False)
+ End Function
+
+ ''' <summary>
+ ''' Returns the power consumed for the given engine rpm when compressor is on
+ ''' </summary>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
+ Public Function GetPowerCompressorOn() As Single Implements IM4_AirCompressor.GetPowerCompressorOn
+ Return GetCompressorPower(True)
+ End Function
+
+ ''' <summary>
+ ''' Returns the difference in power between compressonr on and compressor off operation at the given engine rpm
+ ''' </summary>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
+ Public Function GetPowerDifference() As Single Implements IM4_AirCompressor.GetPowerDifference
+ Dim powerOn As Single = GetPowerCompressorOn()
+ Dim powerOff As Single = GetPowerCompressorOff()
+ Return powerOn - powerOff
+ End Function
+
+ ''' <summary>
+ ''' Looks up the compressor power from the map at given engine speed
+ ''' </summary>
+ ''' <param name="compressorOn">Is compressor on</param>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
+ Private Function GetCompressorPower(ByVal compressorOn As Boolean) As Single
+ Dim compressorRpm As Single = _signals.EngineSpeed * PulleyGearRatio
+ If compressorOn Then
+ Return _map.GetPowerCompressorOn(compressorRpm)
+ Else
+ Return _map.GetPowerCompressorOff(compressorRpm)
+ End If
+ End Function
+
+ ''' <summary>
+ ''' Aver
+ ''' </summary>
+ ''' <returns></returns>
+ ''' <remarks></remarks>
+ Public Function GetAveragePowerDemandPerCompressorUnitFlowRate() As Single _
+ Implements IM4_AirCompressor.GetAveragePowerDemandPerCompressorUnitFlowRate
+
+ Return _map.GetAveragePowerDemandPerCompressorUnitFlowRate()
+ End Function
+ End Class
End Namespace
\ No newline at end of file