From c4a6e200ed46977d51582fc1bb8b8bbd4dd88eba Mon Sep 17 00:00:00 2001
From: "Burns, Terry" <Terry.Burns@ricardo.com>
Date: Wed, 15 Oct 2014 15:56:06 +0000
Subject: [PATCH] Module05Started
git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C1637
---
.../M0_5_SmartAlternatorSetEfficiency.vb | 72 +++++++++++++++++++
...dDemand.vb => M1_AverageHVACLoadDemand.vb} | 3 +-
...nd.vb => M3_AveragePneumaticLoadDemand.vb} | 2 +-
.../VectoAuxiliaries/VectoAuxiliaries.vbproj | 4 +-
4 files changed, 77 insertions(+), 4 deletions(-)
rename VECTOAux/VectoAuxiliaries/Hvac/{AverageHVACLoadDemand.vb => M1_AverageHVACLoadDemand.vb} (97%)
rename VECTOAux/VectoAuxiliaries/Pneumatics/{AveragePneumaticLoadDemand.vb => M3_AveragePneumaticLoadDemand.vb} (99%)
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/M0_5_SmartAlternatorSetEfficiency.vb b/VECTOAux/VectoAuxiliaries/Electrics/M0_5_SmartAlternatorSetEfficiency.vb
index b563eeed7b..2a088a0af2 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/M0_5_SmartAlternatorSetEfficiency.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/M0_5_SmartAlternatorSetEfficiency.vb
@@ -4,6 +4,78 @@ Namespace Electrics
Public Class M0_5_SmartAlternatorSetEfficiency
+private _m0 As IM0_NonSmart_AlternatorsSetEfficiency
+Private _electricalConsumables As IElectricalConsumerList
+Private _alternatorMap As IAlternatorMap
+Private _resultCardIdle As IResultCard
+Private _resultCardTraction As IResultCard
+Private _resultCardOverrun As IResultCard
+
+
+Public ReadOnly Property SmartIdleCurrent As single
+ Get
+
+ End Get
+End Property
+Public ReadOnly Property AlternatorsEfficiencyIdleResultCard As single
+ Get
+
+ End Get
+End Property
+
+
+Public readonly Property SmartTractionCurrent As Single
+ Get
+
+ End Get
+End Property
+Public readonly Property AlternatorsEfficiencyTractionOnResultCard As Single
+ Get
+
+ End Get
+End Property
+
+
+Public ReadOnly Property SmartOverrunCurrent As Single
+ Get
+
+ End Get
+End Property
+Public ReadOnly Property AlternatorsEfficiencyOverrunResultCard As single
+ Get
+
+ End Get
+End Property
+
+
+
+Public Sub new ( m0 As IM0_NonSmart_AlternatorsSetEfficiency, _
+ electricalConsumables as IElectricalConsumerList, _
+ alternatorMap As IAlternatorMap, _
+ resultCardIdle As IResultCard, _
+ resultCardTraction As IResultCard, _
+ resultCardOverrun As IResultCard)
+
+ 'Sanity Check on supplied arguments, throw an argument exception
+ If m0 is Nothing then Throw New ArgumentException("Module 0 must be supplied")
+ If electricalConsumables is Nothing then Throw New ArgumentException("ElectricalConsumablesList must be supplied even if empty")
+ If alternatorMap is Nothing then throw new ArgumentException("Must supply a valid alternator map")
+ if resultCardIdle is nothing then throw new ArgumentException("Result Card 'IDLE' must be supplied even if it has no contents")
+ if resultCardTraction is nothing then throw new ArgumentException("Result Card 'TRACTION' must be supplied even if it has no contents")
+ if resultCardOverrun is nothing then throw new ArgumentException("Result Card 'OVERRUN' must be supplied even if it has no contents")
+
+ 'Assignments to private variables.
+ _electricalConsumables = electricalConsumables
+ _alternatorMap = alternatorMap
+ _resultCardIdle = resultCardIdle
+ _resultCardTraction = resultCardTraction
+ _resultCardOverrun = resultCardOverrun
+
+End Sub
+
+
+
+
End Class
End Namespace
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/AverageHVACLoadDemand.vb b/VECTOAux/VectoAuxiliaries/Hvac/M1_AverageHVACLoadDemand.vb
similarity index 97%
rename from VECTOAux/VectoAuxiliaries/Hvac/AverageHVACLoadDemand.vb
rename to VECTOAux/VectoAuxiliaries/Hvac/M1_AverageHVACLoadDemand.vb
index bc349f24ca..fb022ca806 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/AverageHVACLoadDemand.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/M1_AverageHVACLoadDemand.vb
@@ -1,7 +1,8 @@
Imports VectoAuxiliaries.Electrics
Namespace Hvac
- Public Class AverageHVACLoadDemand
+
+ Public Class M1_AverageHVACLoadDemand
Dim map As IHVACMap
Dim alternator As IAlternator
diff --git a/VECTOAux/VectoAuxiliaries/Pneumatics/AveragePneumaticLoadDemand.vb b/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb
similarity index 99%
rename from VECTOAux/VectoAuxiliaries/Pneumatics/AveragePneumaticLoadDemand.vb
rename to VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb
index effa8efbf2..99abc326ad 100644
--- a/VECTOAux/VectoAuxiliaries/Pneumatics/AveragePneumaticLoadDemand.vb
+++ b/VECTOAux/VectoAuxiliaries/Pneumatics/M3_AveragePneumaticLoadDemand.vb
@@ -2,7 +2,7 @@
Namespace Pneumatics
- Public Class AveragePneumaticLoadDemand
+ Public Class M3_AveragePneumaticLoadDemand
Private _pneumaticUserInputsConfig As IPneumaticUserInputsConfig
diff --git a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
index 1c3fa98569..168d33cfd1 100644
--- a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
+++ b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
@@ -93,8 +93,8 @@
<Compile Include="Electrics\Alternator.vb" />
<Compile Include="Electrics\AlternatorMap.vb" />
<Compile Include="Electrics\M2_AverageElectricalLoadDemand.vb" />
- <Compile Include="Hvac\AverageHVACLoadDemand.vb" />
- <Compile Include="Pneumatics\AveragePneumaticLoadDemand.vb" />
+ <Compile Include="Hvac\M1_AverageHVACLoadDemand.vb" />
+ <Compile Include="Pneumatics\M3_AveragePneumaticLoadDemand.vb" />
<Compile Include="Pneumatics\CompressorMap.vb" />
<Compile Include="Electrics\ElectricalConsumer.vb" />
<Compile Include="Hvac\HVACMap.vb" />
--
GitLab