From bf3b4b202d871020fca8674cea9c415066dabc11 Mon Sep 17 00:00:00 2001
From: "Burns, Terry" <Terry.Burns@ricardo.com>
Date: Wed, 26 Nov 2014 14:23:00 +0000
Subject: [PATCH] WIP - MAP File Browsing Added, New File Extenstions
Implemented for various new Maps Alternator, Compressor, ActuationsMap. Fixed
several small bugs whilst doing this.
git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C1688
---
.../AuxiliaryTestHarness.vbproj | 14 +-
AuxillaryTestHarness/Dashboard.Designer.vb | 276 +++++++++---------
AuxillaryTestHarness/Dashboard.vb | 166 ++++++++++-
AuxillaryTestHarness/UI/FB_Global.vb | 130 +++++++++
...Copy.csv => testAlternatorMap - Copy.aalt} | 0
...ternatorMap.csv => testAlternatorMap.aalt} | 0
...mpressorMap.csv => testCompressorMap.acmp} | 0
...> testPneumaticActuationsMap_GOODMAP.apac} | 0
.../Persistance/AuxillaryEnvironment.vb | 177 ++++++++++-
.../PersistanceTB/Persistance/Dashboard.vb | 16 +-
.../AuxiliaryEnvironmentComparisonTests.vb | 23 ++
VECTO/File Browser/FB_Global.vb | 4 +-
.../VectoAuxiliaries/AuxillaryEnvironment.vb | 5 +-
.../Pneumatics/PneumaticActuationsMap.vb | 14 +-
.../Pneumatics/PneumaticUserInputsConfig.vb | 4 +-
...ternatorMap.csv => testAlternatorMap.aalt} | 0
...sv => testAlternatorMapNotEnoughRows.aalt} | 0
...nly.csv => testAlternatorMapReadOnly.aalt} | 0
...stAlternatorMapWithInvalidEfficiency.aalt} | 0
...v => testAlternatorMapWithInvalidRpm.aalt} | 0
...=> testAlternatorMapWrongNoOfColumns.aalt} | 0
...Copy.csv => testCompressorMap - Copy.acmp} | 0
...mpressorMap.csv => testCompressorMap.acmp} | 0
....csv => testCompressorMapInvalidFlow.acmp} | 0
... => testCompressorMapInvalidOffPower.acmp} | 0
...v => testCompressorMapInvalidOnPower.acmp} | 0
...m.csv => testCompressorMapInvalidRpm.acmp} | 0
...sv => testCompressorMapNotEnoughRows.acmp} | 0
...estCompressorMapWrongNumberOfColumns.acmp} | 0
...tPneumaticActuationsMap_DUPLICATEKEY.apac} | 0
...neumaticActuationsMap_GOODMAP - Copy.apac} | 0
...> testPneumaticActuationsMap_GOODMAP.apac} | 0
...ticActuationsMap_INVALIDCONSUMERNAME.apac} | 0
...umaticActuationsMap_INVALIDCYCLENAME.apac} | 0
.../UnitTests/AlternatorMapTests.vb | 10 +-
.../AveragePneumaticLoadDemandTests.vb | 4 +-
.../UnitTests/CompressorMapTests.vb | 14 +-
.../M0_5_SmartAlternatorSetEfficiencyTests.vb | 2 +-
..._NonSmart_AlternatorsSetEfficiencyTests.vb | 4 +-
.../M1_AverageHVACLoadDemandTests.vb | 2 +-
.../M2_AverageElectricalLoadTests.vb | 2 +-
.../M5_SmartAlternatorSetGenerationTests.vb | 2 +-
.../UnitTests/PneumaticActuationsMapTests.vb | 12 +-
.../VectoAuxiliariesTests.vbproj | 40 +--
44 files changed, 695 insertions(+), 226 deletions(-)
rename AuxillaryTestHarness/{testAlternatorMap - Copy.csv => testAlternatorMap - Copy.aalt} (100%)
rename AuxillaryTestHarness/{testAlternatorMap.csv => testAlternatorMap.aalt} (100%)
rename AuxillaryTestHarness/{testCompressorMap.csv => testCompressorMap.acmp} (100%)
rename AuxillaryTestHarness/{testPneumaticActuationsMap_GOODMAP.csv => testPneumaticActuationsMap_GOODMAP.apac} (100%)
rename VECTOAux/VectoAuxiliariesTests/TestFiles/{testAlternatorMap.csv => testAlternatorMap.aalt} (100%)
rename VECTOAux/VectoAuxiliariesTests/TestFiles/{testAlternatorMapNotEnoughRows.csv => testAlternatorMapNotEnoughRows.aalt} (100%)
rename VECTOAux/VectoAuxiliariesTests/TestFiles/{testAlternatorMapReadOnly.csv => testAlternatorMapReadOnly.aalt} (100%)
rename VECTOAux/VectoAuxiliariesTests/TestFiles/{testAlternatorMapWithInvalidEfficiency.csv => testAlternatorMapWithInvalidEfficiency.aalt} (100%)
rename VECTOAux/VectoAuxiliariesTests/TestFiles/{testAlternatorMapWithInvalidRpm.csv => testAlternatorMapWithInvalidRpm.aalt} (100%)
rename VECTOAux/VectoAuxiliariesTests/TestFiles/{testAlternatorMapWrongNoOfColumns.csv => testAlternatorMapWrongNoOfColumns.aalt} (100%)
rename VECTOAux/VectoAuxiliariesTests/TestFiles/{testCompressorMap - Copy.csv => testCompressorMap - Copy.acmp} (100%)
rename VECTOAux/VectoAuxiliariesTests/TestFiles/{testCompressorMap.csv => testCompressorMap.acmp} (100%)
rename VECTOAux/VectoAuxiliariesTests/TestFiles/{testCompressorMapInvalidFlow.csv => testCompressorMapInvalidFlow.acmp} (100%)
rename VECTOAux/VectoAuxiliariesTests/TestFiles/{testCompressorMapInvalidOffPower.csv => testCompressorMapInvalidOffPower.acmp} (100%)
rename VECTOAux/VectoAuxiliariesTests/TestFiles/{testCompressorMapInvalidOnPower.csv => testCompressorMapInvalidOnPower.acmp} (100%)
rename VECTOAux/VectoAuxiliariesTests/TestFiles/{testCompressorMapInvalidRpm.csv => testCompressorMapInvalidRpm.acmp} (100%)
rename VECTOAux/VectoAuxiliariesTests/TestFiles/{testCompressorMapNotEnoughRows.csv => testCompressorMapNotEnoughRows.acmp} (100%)
rename VECTOAux/VectoAuxiliariesTests/TestFiles/{testCompressorMapWrongNumberOfColumns.csv => testCompressorMapWrongNumberOfColumns.acmp} (100%)
rename VECTOAux/VectoAuxiliariesTests/TestFiles/{testPneumaticActuationsMap_DUPLICATEKEY.csv => testPneumaticActuationsMap_DUPLICATEKEY.apac} (100%)
rename VECTOAux/VectoAuxiliariesTests/TestFiles/{testPneumaticActuationsMap_GOODMAP - Copy.csv => testPneumaticActuationsMap_GOODMAP - Copy.apac} (100%)
rename VECTOAux/VectoAuxiliariesTests/TestFiles/{testPneumaticActuationsMap_GOODMAP.csv => testPneumaticActuationsMap_GOODMAP.apac} (100%)
rename VECTOAux/VectoAuxiliariesTests/TestFiles/{testPneumaticActuationsMap_INVALIDCONSUMERNAME.csv => testPneumaticActuationsMap_INVALIDCONSUMERNAME.apac} (100%)
rename VECTOAux/VectoAuxiliariesTests/TestFiles/{testPneumaticActuationsMap_INVALIDCYCLENAME.csv => testPneumaticActuationsMap_INVALIDCYCLENAME.apac} (100%)
diff --git a/AuxillaryTestHarness/AuxiliaryTestHarness.vbproj b/AuxillaryTestHarness/AuxiliaryTestHarness.vbproj
index f5e6425758..55d6dd395b 100644
--- a/AuxillaryTestHarness/AuxiliaryTestHarness.vbproj
+++ b/AuxillaryTestHarness/AuxiliaryTestHarness.vbproj
@@ -181,18 +181,18 @@
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
</None>
<None Include="App.config" />
- <Content Include="testAlternatorMap.csv">
+ <None Include="testAlternatorMap.aalt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
- <Content Include="testCompressorMap.csv">
+ </None>
+ <Content Include="testCompressorMap.acmp">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="testPneumaticActuationsMap_GOODMAP.csv">
+ <None Include="testPneumaticActuationsMap_GOODMAP.apac">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
- <Content Include="testAlternatorMap - Copy.csv">
+ </None>
+ <None Include="testAlternatorMap - Copy.aalt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
+ </None>
<Content Include="testFuelGoodMap.vmap">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
diff --git a/AuxillaryTestHarness/Dashboard.Designer.vb b/AuxillaryTestHarness/Dashboard.Designer.vb
index 2b59e60320..b6f3e25435 100644
--- a/AuxillaryTestHarness/Dashboard.Designer.vb
+++ b/AuxillaryTestHarness/Dashboard.Designer.vb
@@ -23,20 +23,22 @@ Partial Class Dashboard
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
- Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.pnlMain = New System.Windows.Forms.Panel()
+ Me.btnLoad = New System.Windows.Forms.Button()
Me.btnCancel = New System.Windows.Forms.Button()
+ Me.btnSave = New System.Windows.Forms.Button()
Me.tabMain = New System.Windows.Forms.TabControl()
Me.tabGeneralConfig = New System.Windows.Forms.TabPage()
Me.btnFuelMap = New System.Windows.Forms.Button()
@@ -67,7 +69,7 @@ Partial Class Dashboard
Me.lblPowerNetVoltage = New System.Windows.Forms.Label()
Me.tabPneumaticConfig = New System.Windows.Forms.TabPage()
Me.pnlPneumaticsUserInput = New System.Windows.Forms.Panel()
- Me.Button1 = New System.Windows.Forms.Button()
+ Me.btnActuationsMap = New System.Windows.Forms.Button()
Me.btnCompressorMap = New System.Windows.Forms.Button()
Me.lblPneumaticsVariablesTitle = New System.Windows.Forms.Label()
Me.lblActuationsMap = New System.Windows.Forms.Label()
@@ -282,8 +284,6 @@ Partial Class Dashboard
Me.DeleteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ErrorProvider = New System.Windows.Forms.ErrorProvider(Me.components)
Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
- Me.btnSave = New System.Windows.Forms.Button()
- Me.btnLoad = New System.Windows.Forms.Button()
Me.pnlMain.SuspendLayout
Me.tabMain.SuspendLayout
Me.tabGeneralConfig.SuspendLayout
@@ -329,6 +329,15 @@ Partial Class Dashboard
Me.pnlMain.Size = New System.Drawing.Size(1502, 794)
Me.pnlMain.TabIndex = 1
'
+ 'btnLoad
+ '
+ Me.btnLoad.Location = New System.Drawing.Point(946, 749)
+ Me.btnLoad.Name = "btnLoad"
+ Me.btnLoad.Size = New System.Drawing.Size(78, 25)
+ Me.btnLoad.TabIndex = 11
+ Me.btnLoad.Text = "Load"
+ Me.btnLoad.UseVisualStyleBackColor = true
+ '
'btnCancel
'
Me.btnCancel.Location = New System.Drawing.Point(1156, 749)
@@ -338,6 +347,15 @@ Partial Class Dashboard
Me.btnCancel.Text = "Cancel"
Me.btnCancel.UseVisualStyleBackColor = true
'
+ 'btnSave
+ '
+ Me.btnSave.Location = New System.Drawing.Point(842, 749)
+ Me.btnSave.Name = "btnSave"
+ Me.btnSave.Size = New System.Drawing.Size(85, 25)
+ Me.btnSave.TabIndex = 10
+ Me.btnSave.Text = "Save"
+ Me.btnSave.UseVisualStyleBackColor = true
+ '
'tabMain
'
Me.tabMain.AccessibleDescription = ""
@@ -469,97 +487,97 @@ Partial Class Dashboard
'
'gvResultsCardOverrun
'
- DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardOverrun.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle25
+ DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardOverrun.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle13
Me.gvResultsCardOverrun.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardOverrun.DefaultCellStyle = DataGridViewCellStyle26
+ DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvResultsCardOverrun.DefaultCellStyle = DataGridViewCellStyle14
Me.gvResultsCardOverrun.Location = New System.Drawing.Point(590, 451)
Me.gvResultsCardOverrun.Name = "gvResultsCardOverrun"
- DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardOverrun.RowHeadersDefaultCellStyle = DataGridViewCellStyle27
+ DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardOverrun.RowHeadersDefaultCellStyle = DataGridViewCellStyle15
Me.gvResultsCardOverrun.Size = New System.Drawing.Size(246, 125)
Me.gvResultsCardOverrun.TabIndex = 18
'
'gvResultsCardTraction
'
- DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardTraction.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle28
+ DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardTraction.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle16
Me.gvResultsCardTraction.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardTraction.DefaultCellStyle = DataGridViewCellStyle29
+ DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvResultsCardTraction.DefaultCellStyle = DataGridViewCellStyle17
Me.gvResultsCardTraction.Location = New System.Drawing.Point(311, 451)
Me.gvResultsCardTraction.Name = "gvResultsCardTraction"
- DataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardTraction.RowHeadersDefaultCellStyle = DataGridViewCellStyle30
+ DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardTraction.RowHeadersDefaultCellStyle = DataGridViewCellStyle18
Me.gvResultsCardTraction.Size = New System.Drawing.Size(258, 125)
Me.gvResultsCardTraction.TabIndex = 17
'
'gvResultsCardIdle
'
- DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle31.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardIdle.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle31
+ DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardIdle.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle19
Me.gvResultsCardIdle.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle32.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvResultsCardIdle.DefaultCellStyle = DataGridViewCellStyle32
+ DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvResultsCardIdle.DefaultCellStyle = DataGridViewCellStyle20
Me.gvResultsCardIdle.Location = New System.Drawing.Point(35, 451)
Me.gvResultsCardIdle.Name = "gvResultsCardIdle"
- DataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle33.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvResultsCardIdle.RowHeadersDefaultCellStyle = DataGridViewCellStyle33
+ DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvResultsCardIdle.RowHeadersDefaultCellStyle = DataGridViewCellStyle21
Me.gvResultsCardIdle.Size = New System.Drawing.Size(256, 125)
Me.gvResultsCardIdle.TabIndex = 16
'
@@ -611,33 +629,33 @@ Partial Class Dashboard
'
'gvElectricalConsumables
'
- DataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvElectricalConsumables.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle34
+ DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvElectricalConsumables.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22
Me.gvElectricalConsumables.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Window
- DataGridViewCellStyle35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.ControlText
- DataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
- Me.gvElectricalConsumables.DefaultCellStyle = DataGridViewCellStyle35
+ DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window
+ DataGridViewCellStyle23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.gvElectricalConsumables.DefaultCellStyle = DataGridViewCellStyle23
Me.gvElectricalConsumables.Location = New System.Drawing.Point(33, 170)
Me.gvElectricalConsumables.Name = "gvElectricalConsumables"
- DataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
- DataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control
- DataGridViewCellStyle36.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- DataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText
- DataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight
- DataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText
- DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
- Me.gvElectricalConsumables.RowHeadersDefaultCellStyle = DataGridViewCellStyle36
+ DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control
+ DataGridViewCellStyle24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ DataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.gvElectricalConsumables.RowHeadersDefaultCellStyle = DataGridViewCellStyle24
Me.gvElectricalConsumables.Size = New System.Drawing.Size(803, 250)
Me.gvElectricalConsumables.TabIndex = 10
'
@@ -718,7 +736,7 @@ Partial Class Dashboard
'
'pnlPneumaticsUserInput
'
- Me.pnlPneumaticsUserInput.Controls.Add(Me.Button1)
+ Me.pnlPneumaticsUserInput.Controls.Add(Me.btnActuationsMap)
Me.pnlPneumaticsUserInput.Controls.Add(Me.btnCompressorMap)
Me.pnlPneumaticsUserInput.Controls.Add(Me.lblPneumaticsVariablesTitle)
Me.pnlPneumaticsUserInput.Controls.Add(Me.lblActuationsMap)
@@ -745,14 +763,14 @@ Partial Class Dashboard
Me.pnlPneumaticsUserInput.Size = New System.Drawing.Size(491, 576)
Me.pnlPneumaticsUserInput.TabIndex = 53
'
- 'Button1
+ 'btnActuationsMap
'
- Me.Button1.Location = New System.Drawing.Point(449, 343)
- Me.Button1.Name = "Button1"
- Me.Button1.Size = New System.Drawing.Size(35, 23)
- Me.Button1.TabIndex = 21
- Me.Button1.Text = ". . ."
- Me.Button1.UseVisualStyleBackColor = true
+ Me.btnActuationsMap.Location = New System.Drawing.Point(449, 343)
+ Me.btnActuationsMap.Name = "btnActuationsMap"
+ Me.btnActuationsMap.Size = New System.Drawing.Size(35, 23)
+ Me.btnActuationsMap.TabIndex = 21
+ Me.btnActuationsMap.Text = ". . ."
+ Me.btnActuationsMap.UseVisualStyleBackColor = true
'
'btnCompressorMap
'
@@ -2808,24 +2826,6 @@ Partial Class Dashboard
'
Me.Timer1.Interval = 1000
'
- 'btnSave
- '
- Me.btnSave.Location = New System.Drawing.Point(842, 749)
- Me.btnSave.Name = "btnSave"
- Me.btnSave.Size = New System.Drawing.Size(85, 25)
- Me.btnSave.TabIndex = 10
- Me.btnSave.Text = "Save"
- Me.btnSave.UseVisualStyleBackColor = true
- '
- 'btnLoad
- '
- Me.btnLoad.Location = New System.Drawing.Point(946, 749)
- Me.btnLoad.Name = "btnLoad"
- Me.btnLoad.Size = New System.Drawing.Size(78, 25)
- Me.btnLoad.TabIndex = 11
- Me.btnLoad.Text = "Load"
- Me.btnLoad.UseVisualStyleBackColor = true
- '
'Dashboard
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
@@ -2920,7 +2920,7 @@ End Sub
Friend WithEvents lblPowerNetVoltage As System.Windows.Forms.Label
Friend WithEvents tabPneumaticConfig As System.Windows.Forms.TabPage
Friend WithEvents pnlPneumaticsUserInput As System.Windows.Forms.Panel
- Friend WithEvents Button1 As System.Windows.Forms.Button
+ Friend WithEvents btnActuationsMap As System.Windows.Forms.Button
Friend WithEvents btnCompressorMap As System.Windows.Forms.Button
Friend WithEvents lblPneumaticsVariablesTitle As System.Windows.Forms.Label
Friend WithEvents lblActuationsMap As System.Windows.Forms.Label
diff --git a/AuxillaryTestHarness/Dashboard.vb b/AuxillaryTestHarness/Dashboard.vb
index e3a98bffa7..b516d838d3 100644
--- a/AuxillaryTestHarness/Dashboard.vb
+++ b/AuxillaryTestHarness/Dashboard.vb
@@ -12,6 +12,8 @@ private TabColors As Dictionary( Of TabPage, Color) = new Dictionary( Of TabP
Private processing As Boolean = False
Private SecondsIntoCycle As Integer=0
+Private vectoFile As String = "C:\Users\tb28\Source\Workspaces\VECTO\AuxillaryTestHarness\bin\Debug\vectopath.vecto"
+
#End Region
@@ -449,6 +451,25 @@ Public function Validate_Pneumatics( ) As boolean
'Actuations Map : txtActuationsMap
+ If txtActuationsMap.Text.Trim.Length=0 then
+ errorProvider.SetError(txtActuationsMap ,"Please enter the localtion of a valid Pneumatic Actuations map.")
+ result=false
+ else
+ errorProvider.SetError(txtActuationsMap ,String.Empty)
+ End if
+ 'Test File is valid
+ Dim actuations As PneumaticActuationsMAP
+ Try
+
+ actuations = New PneumaticActuationsMap( txtActuationsMap.Text)
+ actuations.Initialise()
+ errorProvider.SetError(txtActuationsMap ,String.Empty)
+ Catch ex As Exception
+ errorProvider.SetError(txtActuationsMap ,"Error : Pneumatic Actuations map is invalid or cannot be found, please select a valid map")
+ result=false
+ End Try
+
+
'NOT Required but included here so readers can see this is a positive ommission
'******************************************************************************
@@ -612,6 +633,19 @@ Dim result As Boolean = true
End Function
+
+Public Function ValidateAll() As Boolean
+
+ If Validate_Pneumatics=False Orelse Validate_Electrics=false Orelse Validate_Pneumatics=False
+
+ Return False
+
+ End If
+
+ Return true
+
+End Function
+
'***** IMPUTS VALIDATION
#End Region
@@ -649,7 +683,7 @@ Private Sub Dashboard_Load(sender As Object, e As EventArgs) Handles MyBase.Load
'Finally Initialise Environment.
- auxEnvironment.Initialise()
+ 'auxEnvironment.Initialise()
SetProcessingStatus()
End Sub
@@ -861,12 +895,27 @@ End Sub
Private Sub btnStart_Click( sender As Object, e As EventArgs) Handles btnStart.Click
-SecondsIntoCycle=0
+
+If Not ValidateAll then
+
+MessageBox.Show("There are validation errors, please fix before trying again")
+Exit sub
+
+End If
+
+try
+ SecondsIntoCycle=0
auxEnvironment.Initialise()
processing=true
SetProcessingStatus
+ Timer1.Start
+
+ Catch ex As Exception
-Timer1.Start
+ MessageBox.Show("Unable to initialise :" & ex.Message)
+
+ End Try
+
End Sub
Private Sub btnFinish_Click( sender As Object, e As EventArgs) Handles btnFinish.Click
@@ -1027,7 +1076,7 @@ Protected Overrides Function ProcessCmdKey(ByRef msg As Message, keyData As Keys
End If
- Return MyBase.ProcessCmdKey(msg, keyData)
+ Return MyBase.ProcessCmdKey(msg, keyData)
@@ -1082,10 +1131,111 @@ End Sub
Private Sub btnFuelMap_Click( sender As Object, e As EventArgs) Handles btnFuelMap.Click
- 'If fbVEH.OpenDialog(fFileRepl(Me.TbVEH.Text,
- 'fPATH(VECTOfile))) Then
+ Dim fbAux As New cFileBrowser(True,false)
+
+
+
+ ' Dim vectoFile As String = "C:\Users\tb28\Source\Workspaces\VECTO\AuxillaryTestHarness\bin\Debug\vectopath.vecto"
+ Dim fname As String = fFILE( vectoFile,true)
+
+ fbAux.Extensions = New String() {"vmap"}
+ ' If fbAux.OpenDialog(fFileRepl(fname, fPATH(VECTOfile))) Then
+ If fbAux.OpenDialog( fPATH(VECTOfile)) Then
+
+ txtFuelMap.Text = fFileWoDir(fbAux.Files(0), fPATH(VECTOfile))
+
+ End If
+
+ 'fbFileLists.Extensions = New String() {"txt"}
+ 'fbVECTO.Extensions = New String() {"vecto"}
+ 'fbVEH.Extensions = New String() {"vveh"} - Vehicle FIle
+ 'fbMAP.Extensions = New String() {"vmap"} - Fuel Map
+ 'fbDRI.Extensions = New String() {"vdri"} - Diving Cycle
+ 'fbFLD.Extensions = New String() {"vfld"} - Full Load & Drag Toque
+ 'fbENG.Extensions = New String() {"veng"} - Vehicle Engine
+ 'fbGBX.Extensions = New String() {"vgbx"} - Vehicle Gearbox
+ 'fbACC.Extensions = New String() {"vacc"} - Acceleration Limiting Input File
+ 'fbAUX.Extensions = New String() {"vaux"} - Vehicle Auxiliaries
+ 'fbGBS.Extensions = New String() {"vgbs"} - Shift Polygons
+ 'fbRLM.Extensions = New String() {"vrlm"} - Retarder Loss Input
+ 'fbTLM.Extensions = New String() {"vtlm"} - Tranmission Loss Map
+ 'fbTCC.Extensions = New String() {"vtcc"} - Torque Converter Characteristics
+ 'fbCDx.Extensions = New String() {"vcdv", "vcdb"} - Cross Wind Correction Speed types
+
+ 'fbVMOD.Extensions = New String() {"vmod"} - Modal Results.
+
+
+
- 'End If
- 'Me.TbVEH.Text = fFileWoDir(fbVEH.Files(0), fPATH(VECTOfile))
End Sub
+
+Private Sub btnAlternatorMapPath_Click( sender As Object, e As EventArgs) Handles btnAlternatorMapPath.Click
+
+
+
+ Dim fbAux As New cFileBrowser(True,false)
+
+
+
+ ' Dim vectoFile As String = "C:\Users\tb28\Source\Workspaces\VECTO\AuxillaryTestHarness\bin\Debug\vectopath.vecto"
+ Dim fname As String = fFILE( vectoFile,true)
+
+ fbAux.Extensions = New String() {"AALT"}
+ If fbAux.OpenDialog(fPATH(VECTOfile)) Then
+
+ txtAlternatorMapPath.Text = fFileWoDir(fbAux.Files(0), fPATH(VECTOfile))
+
+ End If
+
+ Validate_Electrics
+
+
+End Sub
+
+
+
+Private Sub btnCompressorMap_Click( sender As Object, e As EventArgs) Handles btnCompressorMap.Click
+
+
+ Dim fbAux As New cFileBrowser(True,false)
+
+
+
+ ' Dim vectoFile As String = "C:\Users\tb28\Source\Workspaces\VECTO\AuxillaryTestHarness\bin\Debug\vectopath.vecto"
+ Dim fname As String = fFILE( vectoFile,true)
+
+ fbAux.Extensions = New String() {"ACMP"}
+ If fbAux.OpenDialog(fPATH(VECTOfile)) Then
+
+ txtCompressorMap.Text = fFileWoDir(fbAux.Files(0), fPATH(VECTOfile))
+
+ End If
+
+ Validate_Pneumatics
+
+
+
+End Sub
+
+
+
+Private Sub btnActuationsMap_Click( sender As Object, e As EventArgs) Handles btnActuationsMap.Click
+
+ Dim fbAux As New cFileBrowser(True,false)
+
+ ' Dim vectoFile As String = "C:\Users\tb28\Source\Workspaces\VECTO\AuxillaryTestHarness\bin\Debug\vectopath.vecto"
+ Dim fname As String = fFILE( vectoFile,true)
+
+ fbAux.Extensions = New String() {"APAC"}
+ If fbAux.OpenDialog(fPATH(VECTOfile)) Then
+
+ txtActuationsMap.Text = fFileWoDir(fbAux.Files(0), fPATH(VECTOfile))
+
+ End If
+
+ Validate_Pneumatics
+
+End Sub
+
+
End Class
\ No newline at end of file
diff --git a/AuxillaryTestHarness/UI/FB_Global.vb b/AuxillaryTestHarness/UI/FB_Global.vb
index fccdf4f558..80f51fe3e3 100644
--- a/AuxillaryTestHarness/UI/FB_Global.vb
+++ b/AuxillaryTestHarness/UI/FB_Global.vb
@@ -41,6 +41,136 @@ Module FB_Global
Public fbVMOD As cFileBrowser
+ 'Paths
+ private MyAppPath = My.Application.Info.DirectoryPath & "\"
+ private MyConfPath = MyAppPath & "Config\"
+ private MyDeclPath = MyAppPath & "Declaration\"
+ 'private FB_FilHisDir = MyConfPath & "FileHistory\"
+ private HomePath As String = "<HOME>"
+ private JobPath As String = "<JOBPATH>"
+ private DefVehPath As String = "<VEHDIR>"
+ private NoFile As String = "<NOFILE>"
+ private EmptyString As String = "<EMPTYSTRING>"
+ private Break As String = "<//>"
+
+ private Normed As String = "NORM"
+
+ private PauxSply As String = "<AUX_"
+
+ private EngDrag As String = "<DRAG>"
+
+#Region "File path functions"
+
+ 'When no path is specified, then insert either HomeDir or MainDir Special-folders
+ Public Function fFileRepl(ByVal file As String, Optional ByVal MainDir As String = "") As String
+
+ Dim ReplPath As String
+
+ 'Trim Path
+ file = Trim(file)
+
+ 'If empty file => Abort
+ If file = "" Then Return ""
+
+ 'Replace sKeys
+ file = Microsoft.VisualBasic.Strings.Replace(file, DefVehPath & "\", MyAppPath & "Default Vehicles\", 1, -1, CompareMethod.Text)
+ file = Microsoft.VisualBasic.Strings.Replace(file, DefVehPath & "\", MyAppPath, 1, -1, CompareMethod.Text)
+
+ 'Replace - Determine folder
+ If MainDir = "" Then
+ ReplPath = MyAppPath
+ Else
+ ReplPath = MainDir
+ End If
+
+ ' "..\" => One folder-level up
+ Do While ReplPath.Length > 0 AndAlso Left(file, 3) = "..\"
+ ReplPath = fPathUp(ReplPath)
+ file = file.Substring(3)
+ Loop
+
+
+ 'Supplement Path, if not available
+ If fPATH(file) = "" Then
+
+ Return ReplPath & file
+
+ Else
+ Return file
+ End If
+
+ End Function
+
+ 'Path one-level-up "C:\temp\ordner1\" >> "C:\temp\"
+ Private Function fPathUp(ByVal Pfad As String) As String
+ Dim x As Int16
+
+ Pfad = Pfad.Substring(0, Pfad.Length - 1)
+
+ x = Pfad.LastIndexOf("\")
+
+ If x = -1 Then Return ""
+
+ Return Pfad.Substring(0, x + 1)
+
+ End Function
+
+ 'File name without the path "C:\temp\TEST.txt" >> "TEST.txt" oder "TEST"
+ Public Function fFILE(ByVal Pfad As String, ByVal MitEndung As Boolean) As String
+ Dim x As Int16
+ x = Pfad.LastIndexOf("\") + 1
+ Pfad = Microsoft.VisualBasic.Right(Pfad, Microsoft.VisualBasic.Len(Pfad) - x)
+ If Not MitEndung Then
+ x = Pfad.LastIndexOf(".")
+ If x > 0 Then Pfad = Microsoft.VisualBasic.Left(Pfad, x)
+ End If
+ Return Pfad
+ End Function
+
+ 'Filename without extension "C:\temp\TEST.txt" >> "C:\temp\TEST"
+ Public Function fFileWoExt(ByVal Path As String) As String
+ Return fPATH(Path) & fFILE(Path, False)
+ End Function
+
+ 'Filename without path if Path = WorkDir or MainDir
+ Public Function fFileWoDir(ByVal file As String, Optional ByVal MainDir As String = "") As String
+ Dim path As String
+
+ If MainDir = "" Then
+ path = MyAppPath
+ Else
+ path = MainDir
+ End If
+
+ If UCase(fPATH(file)) = UCase(path) Then file = fFILE(file, True)
+
+ Return file
+
+ End Function
+
+ 'Path alone "C:\temp\TEST.txt" >> "C:\temp\"
+ ' "TEST.txt" >> ""
+ Public Function fPATH(ByVal Pfad As String) As String
+ Dim x As Int16
+ If Pfad Is Nothing OrElse Pfad.Length < 3 OrElse Pfad.Substring(1, 2) <> ":\" Then Return ""
+ x = Pfad.LastIndexOf("\")
+ Return Microsoft.VisualBasic.Left(Pfad, x + 1)
+ End Function
+
+ 'Extension alone "C:\temp\TEST.txt" >> ".txt"
+ Public Function fEXT(ByVal Pfad As String) As String
+ Dim x As Int16
+ x = Pfad.LastIndexOf(".")
+ If x = -1 Then
+ Return ""
+ Else
+ Return Microsoft.VisualBasic.Right(Pfad, Microsoft.VisualBasic.Len(Pfad) - x)
+ End If
+ End Function
+
+
+#End Region
+
End Module
diff --git a/AuxillaryTestHarness/testAlternatorMap - Copy.csv b/AuxillaryTestHarness/testAlternatorMap - Copy.aalt
similarity index 100%
rename from AuxillaryTestHarness/testAlternatorMap - Copy.csv
rename to AuxillaryTestHarness/testAlternatorMap - Copy.aalt
diff --git a/AuxillaryTestHarness/testAlternatorMap.csv b/AuxillaryTestHarness/testAlternatorMap.aalt
similarity index 100%
rename from AuxillaryTestHarness/testAlternatorMap.csv
rename to AuxillaryTestHarness/testAlternatorMap.aalt
diff --git a/AuxillaryTestHarness/testCompressorMap.csv b/AuxillaryTestHarness/testCompressorMap.acmp
similarity index 100%
rename from AuxillaryTestHarness/testCompressorMap.csv
rename to AuxillaryTestHarness/testCompressorMap.acmp
diff --git a/AuxillaryTestHarness/testPneumaticActuationsMap_GOODMAP.csv b/AuxillaryTestHarness/testPneumaticActuationsMap_GOODMAP.apac
similarity index 100%
rename from AuxillaryTestHarness/testPneumaticActuationsMap_GOODMAP.csv
rename to AuxillaryTestHarness/testPneumaticActuationsMap_GOODMAP.apac
diff --git a/Tools/Ricardo/PersistanceTB/Persistance/AuxillaryEnvironment.vb b/Tools/Ricardo/PersistanceTB/Persistance/AuxillaryEnvironment.vb
index 3e030a0dea..00585e0b3e 100644
--- a/Tools/Ricardo/PersistanceTB/Persistance/AuxillaryEnvironment.vb
+++ b/Tools/Ricardo/PersistanceTB/Persistance/AuxillaryEnvironment.vb
@@ -158,8 +158,27 @@ End Sub
Public Sub new(auxConfigFile As String)
+If auxConfigFile="EMPTY" then
-If auxConfigFile is Nothing orelse auxConfigFile.Trim().Length=0 orelse Not FILE.Exists(auxConfigFile) then
+
+ElectricalUserInputsConfig = New ElectricsUserInputsConfig() With { .PowerNetVoltage= 26.3}
+
+
+ElectricalUserInputsConfig.ElectricalConsumers= New ElectricalConsumerList(26.3,0.096,true)
+ElectricalUserInputsConfig.ResultCardIdle = new ResultCard( New List(Of SmartResult ))
+ElectricalUserInputsConfig.ResultCardOverrun= new ResultCard( New List(Of SmartResult ))
+ElectricalUserInputsConfig.ResultCardTraction= new ResultCard( New List(Of SmartResult ))
+
+PneumaticAuxillariesConfig= New PneumaticsAuxilliariesConfig(False)
+PneumaticUserInputsConfig= New PneumaticUserInputsConfig(False)
+HvacUserInputsConfig = New HVACUserInputsConfig()
+HvacUserInputsConfig.SteadyStateModel= New HVACSteadyStateModel()
+
+return
+
+End If
+
+If auxConfigFile is Nothing orelse auxConfigFile.Trim().Length=0 orelse Not FILE.Exists(auxConfigFile) then
setdefaults()
@@ -341,9 +360,7 @@ Private Function CompareHVACConfig( other As AuxillaryEnvironment) As Boolean
End Function
-Public Function ShallowCopy() As AuxillaryEnvironment
- Return DirectCast(Me.MemberwiseClone(), AuxillaryEnvironment)
- End Function
+
Public Function ConfigValuesAreTheSameAs( other As AuxillaryEnvironment) As Boolean
@@ -356,5 +373,157 @@ Public Function ConfigValuesAreTheSameAs( other As AuxillaryEnvironment) As Bool
End Function
+
+'Persistance Functions
+Public Function Save( optional filePath As String = "auxilaryConfig.json" ) As Boolean
+
+ Dim returnValue As Boolean = true
+ Dim settings = new JsonSerializerSettings()
+ settings.TypeNameHandling = TypeNameHandling.Objects
+
+ 'JSON METHOD
+ try
+
+ Dim output As string = JsonConvert.SerializeObject(me, Formatting.Indented, settings)
+
+ File.WriteAllText(filePath, output)
+
+ Catch ex as Exception
+
+ 'TODO:Do something meaningfull here perhaps logging
+
+ returnValue= False
+ End Try
+
+ Return returnValue
+
+End Function
+Public Function Load( optional filePath As String = "auxilaryConfig.json" ) As Boolean
+
+ Dim returnValue As Boolean = true
+ Dim settings = new JsonSerializerSettings()
+ Dim tmpAux As AuxillaryEnvironment
+
+ settings.TypeNameHandling = TypeNameHandling.Objects
+
+ 'JSON METHOD
+ try
+
+ me.ClearDown()
+
+ Dim output As String = File.ReadAllText("auxilaryConfig.json")
+
+ tmpAux = JsonConvert.DeserializeObject( Of AuxillaryEnvironment)(output,settings)
+
+ 'This is where we Assume values of loaded( Deserialized ) object.
+ AssumeValuesOfOther( tmpAux )
+
+ Catch ex as Exception
+
+ 'TODO:Do something meaningfull here perhaps logging
+
+ returnValue= False
+ End Try
+
+ Return returnValue
+
+End Function
+
+'Persistance Helpers
+Private sub AssumeValuesOfOther( other As AuxillaryEnvironment )
+
+ CloneElectricaConfiguration( other )
+ ClonePneumaticsAuxiliariesConfig( other )
+ ClonePneumaticsUserInputsConfig(other)
+ CloneHVAC(other)
+
+End sub
+Private sub CloneElectricaConfiguration( other as AuxillaryEnvironment)
+
+'AlternatorGearEfficiency
+me.ElectricalUserInputsConfig.AlternatorGearEfficiency = other.ElectricalUserInputsConfig.AlternatorGearEfficiency
+'AlternatorMap
+me.ElectricalUserInputsConfig.AlternatorMap = other.ElectricalUserInputsConfig.AlternatorMap
+'DoorActuationTimeSecond
+me.ElectricalUserInputsConfig.DoorActuationTimeSecond = other.ElectricalUserInputsConfig.DoorActuationTimeSecond
+
+'Electrical Consumer list
+Me.ElectricalUserInputsConfig.ElectricalConsumers.Items.Clear
+For Each otherConsumer As IElectricalConsumer In other.ElectricalUserInputsConfig.ElectricalConsumers.Items
+
+ Dim newConsumer = New ElectricalConsumer( otherConsumer.BaseVehicle, _
+ otherConsumer.Category, _
+ otherConsumer.ConsumerName, _
+ otherConsumer.NominalConsumptionAmps, _
+ otherConsumer.PhaseIdle_TractionOn, _
+ otherConsumer.PowerNetVoltage, _
+ otherConsumer.NumberInActualVehicle )
+
+ Me.ElectricalUserInputsConfig.ElectricalConsumers.Items.Add( newConsumer )
+
+Next
+
+'PowerNetVoltage
+other.ElectricalUserInputsConfig.PowerNetVoltage = other.ElectricalUserInputsConfig.PowerNetVoltage
+'ResultCardIdle
+Me.ElectricalUserInputsConfig.ResultCardIdle.Results.Clear
+For each result As SmartResult In other.ElectricalUserInputsConfig.ResultCardIdle.Results
+ Me.ElectricalUserInputsConfig.ResultCardIdle.Results.Add( New SmartResult(result.Amps,result.SmartAmps))
+Next
+'ResultCardOverrun
+For each result As SmartResult In other.ElectricalUserInputsConfig.ResultCardOverrun.Results
+ Me.ElectricalUserInputsConfig.ResultCardOverrun.Results.Add( New SmartResult(result.Amps,result.SmartAmps))
+Next
+'ResultCardTraction
+For each result As SmartResult In other.ElectricalUserInputsConfig.ResultCardTraction.Results
+ Me.ElectricalUserInputsConfig.ResultCardTraction.Results.Add( New SmartResult(result.Amps,result.SmartAmps))
+Next
+'SmartElectrical
+Me.ElectricalUserInputsConfig.SmartElectrical = other.ElectricalUserInputsConfig.SmartElectrical
+
+End Sub
+Private sub ClonePneumaticsAuxiliariesConfig( other as AuxillaryEnvironment)
+
+ Me.PneumaticAuxillariesConfig.AdBlueNIperMinute =other.PneumaticAuxillariesConfig.AdBlueNIperMinute
+ Me.PneumaticAuxillariesConfig.AirControlledSuspensionNIperMinute =other.PneumaticAuxillariesConfig.AirControlledSuspensionNIperMinute
+ Me.PneumaticAuxillariesConfig.BrakingNoRetarderNIperKG =other.PneumaticAuxillariesConfig.BrakingNoRetarderNIperKG
+ Me.PneumaticAuxillariesConfig.BrakingWithRetarderNIperKG =other.PneumaticAuxillariesConfig.BrakingWithRetarderNIperKG
+ Me.PneumaticAuxillariesConfig.BreakingPerKneelingNIperKGinMM =other.PneumaticAuxillariesConfig.BreakingPerKneelingNIperKGinMM
+ Me.PneumaticAuxillariesConfig.DeadVolBlowOutsPerLitresperHour =other.PneumaticAuxillariesConfig.DeadVolBlowOutsPerLitresperHour
+ Me.PneumaticAuxillariesConfig.DeadVolumeLitres =other.PneumaticAuxillariesConfig.DeadVolumeLitres
+ Me.PneumaticAuxillariesConfig.NonSmartRegenFractionTotalAirDemand =other.PneumaticAuxillariesConfig.NonSmartRegenFractionTotalAirDemand
+ Me.PneumaticAuxillariesConfig.PerDoorOpeningNI =other.PneumaticAuxillariesConfig.PerDoorOpeningNI
+ Me.PneumaticAuxillariesConfig.PerStopBrakeActuationNIperKG =other.PneumaticAuxillariesConfig.PerStopBrakeActuationNIperKG
+ Me.PneumaticAuxillariesConfig.SmartRegenFractionTotalAirDemand =other.PneumaticAuxillariesConfig.SmartRegenFractionTotalAirDemand
+ Me.PneumaticAuxillariesConfig.OverrunUtilisationForCompressionFraction =other.PneumaticAuxillariesConfig.OverrunUtilisationForCompressionFraction
+
+End Sub
+Private Sub ClonePneumaticsUserInputsConfig ( other As AuxillaryEnvironment )
+
+ Me.PneumaticUserInputsConfig.ActuationsMap = other.PneumaticUserInputsConfig.ActuationsMap
+ Me.PneumaticUserInputsConfig.AdBlueDosing = other.PneumaticUserInputsConfig.AdBlueDosing
+ Me.PneumaticUserInputsConfig.AirSuspensionControl = other.PneumaticUserInputsConfig.AirSuspensionControl
+ Me.PneumaticUserInputsConfig.CompressorGearEfficiency = other.PneumaticUserInputsConfig.CompressorGearEfficiency
+ Me.PneumaticUserInputsConfig.CompressorGearRatio = other.PneumaticUserInputsConfig.CompressorGearRatio
+ Me.PneumaticUserInputsConfig.CompressorMap = other.PneumaticUserInputsConfig.CompressorMap
+ Me.PneumaticUserInputsConfig.Doors = other.PneumaticUserInputsConfig.Doors
+ Me.PneumaticUserInputsConfig.KneelingHeightMillimeters = other.PneumaticUserInputsConfig.KneelingHeightMillimeters
+ Me.PneumaticUserInputsConfig.RetarderBrake = other.PneumaticUserInputsConfig.RetarderBrake
+ Me.PneumaticUserInputsConfig.SmartAirCompression = other.PneumaticUserInputsConfig.SmartAirCompression
+ Me.PneumaticUserInputsConfig.SmartRegeneration = other.PneumaticUserInputsConfig.SmartRegeneration
+
+
+End Sub
+Private Sub CloneHVAC( other As AuxillaryEnvironment)
+
+ Me.HvacUserInputsConfig.SteadyStateModel.HVACElectricalLoadPowerWatts = other.HvacUserInputsConfig.SteadyStateModel.HVACElectricalLoadPowerWatts
+ Me.HvacUserInputsConfig.SteadyStateModel.HVACFuellingLitresPerHour = other.HvacUserInputsConfig.SteadyStateModel.HVACFuellingLitresPerHour
+ Me.HvacUserInputsConfig.SteadyStateModel.HVACMechanicalLoadPowerWatts = other.HvacUserInputsConfig.SteadyStateModel.HVACMechanicalLoadPowerWatts
+
+
+End Sub
+
+
+
End Class
diff --git a/Tools/Ricardo/PersistanceTB/Persistance/Dashboard.vb b/Tools/Ricardo/PersistanceTB/Persistance/Dashboard.vb
index a369810ed1..bda28779b7 100644
--- a/Tools/Ricardo/PersistanceTB/Persistance/Dashboard.vb
+++ b/Tools/Ricardo/PersistanceTB/Persistance/Dashboard.vb
@@ -1038,11 +1038,8 @@ Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Clic
auxEnvironment.ClearDown()
- dim settings = new JsonSerializerSettings()
- settings.TypeNameHandling = TypeNameHandling.Objects
- Dim output As string = JsonConvert.SerializeObject(auxEnvironment, Formatting.Indented, settings)
+ auxEnvironment.Save()
- File.WriteAllText("auxilaryConfig.json", output)
'BINARY METHOD
'Dim formatter = New BinaryFormatter
@@ -1059,27 +1056,20 @@ End Sub
Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
-dim settings = new JsonSerializerSettings()
-settings.TypeNameHandling = TypeNameHandling.Objects
+
'JSON METHOD
'Release existing databindings
UnbindAllControls( Me)
- auxEnvironment.ClearDown()
-
- Dim output As String = File.ReadAllText("auxilaryConfig.json")
-
- auxEnvironment = JsonConvert.DeserializeObject( Of AuxillaryEnvironment)(output,settings)
+ auxEnvironment.Load()
''Only required for Harness environment
auxEnvironment.Initialise()
CreateBindings()
-
-
'BINARY METHOD
'Dim formatter As IFormatter = New BinaryFormatter()
'Dim stream As Stream
diff --git a/Tools/Ricardo/PersistanceTB/PersistanceUnitTesting/AuxiliaryEnvironmentComparisonTests.vb b/Tools/Ricardo/PersistanceTB/PersistanceUnitTesting/AuxiliaryEnvironmentComparisonTests.vb
index ab6dc1c748..23131511d6 100644
--- a/Tools/Ricardo/PersistanceTB/PersistanceUnitTesting/AuxiliaryEnvironmentComparisonTests.vb
+++ b/Tools/Ricardo/PersistanceTB/PersistanceUnitTesting/AuxiliaryEnvironmentComparisonTests.vb
@@ -846,6 +846,29 @@ Public Class AuxilaryComparisonTests
#End Region
+ <Test()>
+ <Category("Persistance")> _
+ Public Sub Persistance_A_BasicSaveAndLoad()
+
+ 'Arrange
+ Dim auxEmpty = New AuxillaryEnvironment("EMPTY")
+ Dim auxDefault = New AuxillaryEnvironment("")
+ Dim actual As Boolean =false
+ Dim expected As Boolean = true
+
+
+ 'Act
+ auxDefault.Save()
+ auxEmpty.Load()
+ actual =auxEmpty.ConfigValuesAreTheSameAs(auxDefault)
+
+
+
+ Assert.AreEqual( expected,actual )
+
+ End Sub
+
+
diff --git a/VECTO/File Browser/FB_Global.vb b/VECTO/File Browser/FB_Global.vb
index fccdf4f558..be1c6977b5 100644
--- a/VECTO/File Browser/FB_Global.vb
+++ b/VECTO/File Browser/FB_Global.vb
@@ -13,7 +13,7 @@
''' Global File Brower properties and cFilebrowser instances.
''' </summary>
''' <remarks></remarks>
-Module FB_Global
+public Module FB_Global
Public FB_FolderHistory(19) As String
Public FB_Drives() As String
@@ -42,5 +42,7 @@ Module FB_Global
Public fbVMOD As cFileBrowser
+
+
End Module
diff --git a/VECTOAux/VectoAuxiliaries/AuxillaryEnvironment.vb b/VECTOAux/VectoAuxiliaries/AuxillaryEnvironment.vb
index b6ce8ac1e7..3be6cf1606 100644
--- a/VECTOAux/VectoAuxiliaries/AuxillaryEnvironment.vb
+++ b/VECTOAux/VectoAuxiliaries/AuxillaryEnvironment.vb
@@ -158,7 +158,7 @@ End Sub
Sub new()
- Call Me.New("")
+ Call Me.New("EMPTY")
End Sub
@@ -185,6 +185,7 @@ If auxConfigFile is Nothing orelse auxConfigFile.Trim().Length=0 orelse Not FILE
Else
setDefaults()
+ 'ElectricalUserInputsConfig.ElectricalConsumers.Items.Clear
If Not Load(auxConfigFile)
MessageBox.Show(String.Format("Unable to load file {0}", auxConfigFile))
End If
@@ -219,7 +220,7 @@ Private Sub setDefaults()
.ResultCardOverrun= New ResultCard(New List(Of SmartResult)),
.ResultCardTraction=New ResultCard(New List(Of SmartResult)),
.SmartElectrical=True,
- .AlternatorMap="testAlternatorMap.csv"
+ .AlternatorMap="testAlternatorMap.aalt"
}
HvacUserInputsConfig = New HVACUserInputsConfig( New HVACSteadyStateModel(100,100,100))
diff --git a/VECTOAux/VectoAuxiliaries/Pneumatics/PneumaticActuationsMap.vb b/VECTOAux/VectoAuxiliaries/Pneumatics/PneumaticActuationsMap.vb
index be96415174..fd80d5509e 100644
--- a/VECTOAux/VectoAuxiliaries/Pneumatics/PneumaticActuationsMap.vb
+++ b/VECTOAux/VectoAuxiliaries/Pneumatics/PneumaticActuationsMap.vb
@@ -14,7 +14,7 @@ Private filePath As String
Public Function GetNumActuations(key As ActuationsKey) As Integer Implements IPneumaticActuationsMAP.GetNumActuations
If map Is Nothing OrElse Not map.ContainsKey(key) Then
- Throw New ArgumentException("Not in map")
+ Throw New ArgumentException(String.Format("Pneumatic Actuations map does not contain the key '{0}'.", key.CycleName & ":" & key.ConsumerName))
End If
Return map(key)
@@ -26,6 +26,9 @@ End Function
Public Sub New(filePath As String)
Me.filePath = filePath
+
+ If filePath.Trim.Length=0 then Throw New ArgumentException("A filename for the Pneumatic Actuations Map has not been supplied")
+
Initialise()
@@ -43,7 +46,7 @@ End Sub
Dim lines() As String = sr.ReadToEnd().Split(CType(Environment.NewLine, Char()), StringSplitOptions.RemoveEmptyEntries)
'Must have at least 2 entries in map to make it usable [dont forget the header row]
- If lines.Length < 3 Then Throw New ArgumentException("Insufficient rows in csv to build a usable map")
+ If lines.Length < 3 Then Throw New ArgumentException("Pneumatic Actuations Map does not have sufficient rows in file to build a usable map")
map = New Dictionary(Of ActuationsKey, Integer)()
Dim firstline As Boolean = True
@@ -53,14 +56,14 @@ End Sub
'split the line
Dim elements() As String = line.Split(New Char() {","}, StringSplitOptions.RemoveEmptyEntries)
'3 entries per line required
- If (elements.Length <> 3) Then Throw New ArgumentException("Incorrect number of values in csv file")
+ If (elements.Length <> 3) Then Throw New ArgumentException("Pneumatic Actuations Map has Incorrect number of values in file")
'add values to map
If Not Integer.TryParse(elements(2), numActuations) Then
- Throw New ArgumentException("Map Contains Non Integer values in actuations column")
+ Throw New ArgumentException("Pneumatic Actuations Map Contains Non Integer values in actuations column")
End If
'Should throw exception if ConsumerName or CycleName are empty.
@@ -76,7 +79,8 @@ End Sub
Else
- Throw New ArgumentException("supplied input file does not exist")
+ Throw New ArgumentException(String.Format(" Pneumatic Acutations map '{0}' supplied does not exist", filePath))
+ Return False
End If
'If we get here then all should be well and we can return a True value of success.
diff --git a/VECTOAux/VectoAuxiliaries/Pneumatics/PneumaticUserInputsConfig.vb b/VECTOAux/VectoAuxiliaries/Pneumatics/PneumaticUserInputsConfig.vb
index 609367bff9..761d9d6e33 100644
--- a/VECTOAux/VectoAuxiliaries/Pneumatics/PneumaticUserInputsConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/Pneumatics/PneumaticUserInputsConfig.vb
@@ -37,12 +37,12 @@ End Sub
Public sub SetPropertiesToDefaults()
- ActuationsMap="testPneumaticActuationsMap_GOODMAP.csv"
+ ActuationsMap=""
AdBlueDosing="Pneumatic"
AirSuspensionControl="Electrically"
CompressorGearEfficiency=0.8
CompressorGearRatio=1.0
- CompressorMap="testCompressorMap.csv"
+ CompressorMap="testCompressorMap.acmp"
Doors="Pneumatic"
KneelingHeightMillimeters=80
RetarderBrake=True
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMap.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMap.aalt
similarity index 100%
rename from VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMap.csv
rename to VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMap.aalt
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMapNotEnoughRows.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMapNotEnoughRows.aalt
similarity index 100%
rename from VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMapNotEnoughRows.csv
rename to VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMapNotEnoughRows.aalt
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMapReadOnly.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMapReadOnly.aalt
similarity index 100%
rename from VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMapReadOnly.csv
rename to VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMapReadOnly.aalt
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMapWithInvalidEfficiency.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMapWithInvalidEfficiency.aalt
similarity index 100%
rename from VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMapWithInvalidEfficiency.csv
rename to VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMapWithInvalidEfficiency.aalt
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMapWithInvalidRpm.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMapWithInvalidRpm.aalt
similarity index 100%
rename from VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMapWithInvalidRpm.csv
rename to VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMapWithInvalidRpm.aalt
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMapWrongNoOfColumns.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMapWrongNoOfColumns.aalt
similarity index 100%
rename from VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMapWrongNoOfColumns.csv
rename to VECTOAux/VectoAuxiliariesTests/TestFiles/testAlternatorMapWrongNoOfColumns.aalt
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMap - Copy.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMap - Copy.acmp
similarity index 100%
rename from VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMap - Copy.csv
rename to VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMap - Copy.acmp
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMap.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMap.acmp
similarity index 100%
rename from VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMap.csv
rename to VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMap.acmp
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapInvalidFlow.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapInvalidFlow.acmp
similarity index 100%
rename from VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapInvalidFlow.csv
rename to VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapInvalidFlow.acmp
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapInvalidOffPower.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapInvalidOffPower.acmp
similarity index 100%
rename from VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapInvalidOffPower.csv
rename to VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapInvalidOffPower.acmp
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapInvalidOnPower.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapInvalidOnPower.acmp
similarity index 100%
rename from VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapInvalidOnPower.csv
rename to VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapInvalidOnPower.acmp
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapInvalidRpm.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapInvalidRpm.acmp
similarity index 100%
rename from VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapInvalidRpm.csv
rename to VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapInvalidRpm.acmp
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapNotEnoughRows.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapNotEnoughRows.acmp
similarity index 100%
rename from VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapNotEnoughRows.csv
rename to VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapNotEnoughRows.acmp
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapWrongNumberOfColumns.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapWrongNumberOfColumns.acmp
similarity index 100%
rename from VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapWrongNumberOfColumns.csv
rename to VECTOAux/VectoAuxiliariesTests/TestFiles/testCompressorMapWrongNumberOfColumns.acmp
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testPneumaticActuationsMap_DUPLICATEKEY.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testPneumaticActuationsMap_DUPLICATEKEY.apac
similarity index 100%
rename from VECTOAux/VectoAuxiliariesTests/TestFiles/testPneumaticActuationsMap_DUPLICATEKEY.csv
rename to VECTOAux/VectoAuxiliariesTests/TestFiles/testPneumaticActuationsMap_DUPLICATEKEY.apac
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testPneumaticActuationsMap_GOODMAP - Copy.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testPneumaticActuationsMap_GOODMAP - Copy.apac
similarity index 100%
rename from VECTOAux/VectoAuxiliariesTests/TestFiles/testPneumaticActuationsMap_GOODMAP - Copy.csv
rename to VECTOAux/VectoAuxiliariesTests/TestFiles/testPneumaticActuationsMap_GOODMAP - Copy.apac
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testPneumaticActuationsMap_GOODMAP.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testPneumaticActuationsMap_GOODMAP.apac
similarity index 100%
rename from VECTOAux/VectoAuxiliariesTests/TestFiles/testPneumaticActuationsMap_GOODMAP.csv
rename to VECTOAux/VectoAuxiliariesTests/TestFiles/testPneumaticActuationsMap_GOODMAP.apac
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testPneumaticActuationsMap_INVALIDCONSUMERNAME.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testPneumaticActuationsMap_INVALIDCONSUMERNAME.apac
similarity index 100%
rename from VECTOAux/VectoAuxiliariesTests/TestFiles/testPneumaticActuationsMap_INVALIDCONSUMERNAME.csv
rename to VECTOAux/VectoAuxiliariesTests/TestFiles/testPneumaticActuationsMap_INVALIDCONSUMERNAME.apac
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testPneumaticActuationsMap_INVALIDCYCLENAME.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testPneumaticActuationsMap_INVALIDCYCLENAME.apac
similarity index 100%
rename from VECTOAux/VectoAuxiliariesTests/TestFiles/testPneumaticActuationsMap_INVALIDCYCLENAME.csv
rename to VECTOAux/VectoAuxiliariesTests/TestFiles/testPneumaticActuationsMap_INVALIDCYCLENAME.apac
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
index 1421d4c399..80118ac0c6 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AlternatorMapTests.vb
@@ -7,11 +7,11 @@ Namespace UnitTests
<TestFixture()>
Public Class AlternatorMapTests
- Private Const _GOODMAP As String = "TestFiles\testAlternatorMap.csv"
- Private Const _INVALIDRPMMAP As String = "TestFiles\testAlternatorMapWithInvalidRpm.csv"
- Private Const _INVALIDAMPSMAP As String = "TestFiles\testAlternatorMapWithInvalidAmps.csv"
- Private Const _IVALIDEFFICIENCYMAP As String = "TestFiles\testAlternatorMapWithInvalidEfficiency.csv"
- Private Const _INVALIDPOWERMAP As String = "TestFiles\testAlternatorMapWithInvalidPower.csv"
+ Private Const _GOODMAP As String = "TestFiles\testAlternatorMap.aalt"
+ Private Const _INVALIDRPMMAP As String = "TestFiles\testAlternatorMapWithInvalidRpm.aalt"
+ Private Const _INVALIDAMPSMAP As String = "TestFiles\testAlternatorMapWithInvalidAmps.aalt"
+ Private Const _IVALIDEFFICIENCYMAP As String = "TestFiles\testAlternatorMapWithInvalidEfficiency.aalt"
+ Private Const _INVALIDPOWERMAP As String = "TestFiles\testAlternatorMapWithInvalidPower.aalt"
<Test()>
<TestCase(10,1500,0.6150f)> _
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
index 7576a22ae9..a11bc58a48 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/AveragePneumaticLoadDemandTests.vb
@@ -21,8 +21,8 @@ Namespace UnitTests
Private _cycleDurationMinutes As Single = 51.9
Private _totalAirDemand As Single
- Private _actuationsMapPath As String = "Testfiles\testPneumaticActuationsMap_GOODMAP.csv"
- Private _compressorMapPath As String = "Testfiles\testCompressorMap.csv"
+ Private _actuationsMapPath As String = "Testfiles\testPneumaticActuationsMap_GOODMAP.apac"
+ Private _compressorMapPath As String = "Testfiles\testCompressorMap.acmp"
Private _defaultInputConfig As IPneumaticUserInputsConfig
Private _Signals As ISignals = New Signals
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
index 5ab0069d53..74a1b28097 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/CompressorMapTests.vb
@@ -6,13 +6,13 @@ Namespace UnitTests
<TestFixture()>
Public Class CompressorMapTests
- Private Const GOODMAP As String = "TestFiles\testCompressorMap.csv"
- Private Const INVALIDPOWERCOMPRESSORONMAP As String = "TestFiles\testCompressorMapInvalidOnPower.csv"
- Private Const INVALIDPOWERCOMPRESSOROFFMAP As String = "TestFiles\testCompressorMapInvalidOffPower.csv"
- Private Const INVALIDFLOWRATEMAP As String = "TestFiles\testCompressorMapInvalidFlow.csv"
- Private Const INSSUFICIENTROWSMAP As String = "TestFiles\testCompressorMapNotEnoughRows.csv"
- Private Const INVALIDRPMMAP As String = "TestFiles\testCompressorMapInvalidRpm.csv"
- Private Const INVALIDNUMBEROFCOLUMNS As String = "TestFiles\testCompressorMapWrongNumberOfColumns.csv"
+ Private Const GOODMAP As String = "TestFiles\testCompressorMap.acmp"
+ Private Const INVALIDPOWERCOMPRESSORONMAP As String = "TestFiles\testCompressorMapInvalidOnPower.acmp"
+ Private Const INVALIDPOWERCOMPRESSOROFFMAP As String = "TestFiles\testCompressorMapInvalidOffPower.acmp"
+ Private Const INVALIDFLOWRATEMAP As String = "TestFiles\testCompressorMapInvalidFlow.acmp"
+ Private Const INSSUFICIENTROWSMAP As String = "TestFiles\testCompressorMapNotEnoughRows.acmp"
+ Private Const INVALIDRPMMAP As String = "TestFiles\testCompressorMapInvalidRpm.acmp"
+ Private Const INVALIDNUMBEROFCOLUMNS As String = "TestFiles\testCompressorMapWrongNumberOfColumns.acmp"
#Region "Helpers"
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
index ef815e4c32..ff41894689 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_5_SmartAlternatorSetEfficiencyTests.vb
@@ -25,7 +25,7 @@ Dim elecConsumers As New ElectricalConsumerList(26.3,0.096,True)
Dim hvacInputs As New HVACInputs(1,1)
'Dim hvacMap As New HVACMap("testFiles\TestHvacMap.csv")
'hvacMap.Initialise()
-Dim alternatoMap As New AlternatorMap("testFiles\testAlternatormap.csv")
+Dim alternatoMap As New AlternatorMap("testFiles\testAlternatormap.aalt")
alternatoMap.Initialise()
Dim signals = New Signals()
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
index 377583515b..a88ce45b23 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M0_NonSmart_AlternatorsSetEfficiencyTests.vb
@@ -12,9 +12,9 @@ Namespace UnitTests
<TestFixture()>
Public Class M0_NonSmart_AlternatorsSetEfficiencyTests
-Private Const cstrAlternatorsEfficiencyMapLocation As String = "tests\testAlternatorMap.csv"
+Private Const cstrAlternatorsEfficiencyMapLocation As String = "tests\testAlternatorMap.aalt"
Private Const cstrHVACMapLocation As String = "TestFiles\TestHvacMap.csv"
-Private Const cstrAlternatorMap As String = "TestFiles\testAlternatorMap.csv"
+Private Const cstrAlternatorMap As String = "TestFiles\testAlternatorMap.aalt"
Private elecConsumers As IElectricalConsumerList
Private hvacInputs As IHVACInputs
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
index 27f4cb787e..c474382f30 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M1_AverageHVACLoadDemandTests.vb
@@ -10,7 +10,7 @@ Namespace UnitTests
<TestFixture()>
Public Class M1_AverageHVACLoadDemandTests
- Private Const _GOODMAP As String = "TestFiles\testAlternatorMap.csv"
+ Private Const _GOODMAP As String = "TestFiles\testAlternatorMap.aalt"
Private signals As ISignals = New Signals With {.EngineSpeed=2000}
Private powernetVoltage As Single = 26.3
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
index 79bbe421c7..b4b4900029 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M2_AverageElectricalLoadTests.vb
@@ -27,7 +27,7 @@ Namespace UnitTests
Dim hvacInp As IHVACInputs = CType(New HVACInputs(1, 1), IHVACInputs)
Dim hvacmap As IHVACMap = CType(New HVACMap("testfiles\TestHvacMap.csv"), IHVACMap)
hvacmap.Initialise()
- Dim altMap As IAlternatorMap = CType(New AlternatorMap("testfiles\testAlternatorMap.csv"), IAlternatorMap)
+ Dim altMap As IAlternatorMap = CType(New AlternatorMap("testfiles\testAlternatorMap.aalt"), IAlternatorMap)
altMap.Initialise()
Dim m0 As New M0_NonSmart_AlternatorsSetEfficiency(consumers,hvacInp, altMap, 26.3,signals,ssmHVac)
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
index d0df61a764..aebcc6fb0e 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M5_SmartAlternatorSetGenerationTests.vb
@@ -13,7 +13,7 @@ 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 _altMap As String = "testFiles\testAlternatormap.aalt"
Private const _rpm as Integer = 2000
Private const _altGearPullyEfficiency As Single =0.8
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb
index f3420a7729..35fcbf6d5c 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/PneumaticActuationsMapTests.vb
@@ -8,12 +8,12 @@ Namespace Pneumatics
<TestFixture()>
Public Class PneumaticActuationsMapTests
-Public Const cstrPneumaticActuationsMapPath_GOODMAP As String = "TestFiles\testPneumaticActuationsMap_GOODMAP.csv"
-Public Const cstrPneumaticActuationsMapPath_INCORRECTCOLUMNS As String = "TestFiles\testPneumaticActuationsMap_INCORRECTCOLUMNS.csv"
-Public Const cstrPneumaticActuationsMapPath_INVALIDINTEGERVALUE As String = "TestFiles\testPneumaticActuationsMap_INVALIDINTEGERVALUE.csv"
-Public Const cstrPneumaticActuationsMapPath_DUPLICATEKEY As String = "TestFiles\testPneumaticActuationsMap_DUPLICATEKEY.csv"
-Public Const cstrPneumaticActuationsMapPath_INVALIDCONSUMERNAME As String = "TestFiles\testPneumaticActuationsMap_INVALIDCONSUMERNAME.csv"
-Public Const cstrPneumaticActuationsMapPath_INVALIDCYCLENAME As String = "TestFiles\testPneumaticActuationsMap_INVALIDCYCLENAME.csv"
+Public Const cstrPneumaticActuationsMapPath_GOODMAP As String = "TestFiles\testPneumaticActuationsMap_GOODMAP.apac"
+Public Const cstrPneumaticActuationsMapPath_INCORRECTCOLUMNS As String = "TestFiles\testPneumaticActuationsMap_INCORRECTCOLUMNS.apac"
+Public Const cstrPneumaticActuationsMapPath_INVALIDINTEGERVALUE As String = "TestFiles\testPneumaticActuationsMap_INVALIDINTEGERVALUE.apac"
+Public Const cstrPneumaticActuationsMapPath_DUPLICATEKEY As String = "TestFiles\testPneumaticActuationsMap_DUPLICATEKEY.apac"
+Public Const cstrPneumaticActuationsMapPath_INVALIDCONSUMERNAME As String = "TestFiles\testPneumaticActuationsMap_INVALIDCONSUMERNAME.apac"
+Public Const cstrPneumaticActuationsMapPath_INVALIDCYCLENAME As String = "TestFiles\testPneumaticActuationsMap_INVALIDCYCLENAME.apac"
diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
index c073e468a7..6aa4838bf0 100644
--- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
+++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
@@ -167,43 +167,43 @@
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
</None>
<None Include="packages.config" />
- <Content Include="TestFiles\testPneumaticActuationsMap_GOODMAP.csv">
+ <Content Include="TestFiles\testPneumaticActuationsMap_GOODMAP.apac">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="TestFiles\testAlternatorMapNotEnoughRows.csv">
+ <Content Include="TestFiles\testAlternatorMapNotEnoughRows.aalt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="TestFiles\testAlternatorMapReadOnly.csv">
+ <Content Include="TestFiles\testAlternatorMapReadOnly.aalt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="TestFiles\testAlternatorMapWithInvalidEfficiency.csv">
+ <Content Include="TestFiles\testAlternatorMapWithInvalidEfficiency.aalt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="TestFiles\testAlternatorMapWithInvalidRpm.csv">
+ <Content Include="TestFiles\testAlternatorMapWithInvalidRpm.aalt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="TestFiles\testAlternatorMapWrongNoOfColumns.csv">
+ <Content Include="TestFiles\testAlternatorMapWrongNoOfColumns.aalt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="TestFiles\testCompressorMap.csv">
+ <Content Include="TestFiles\testCompressorMap.acmp">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="TestFiles\testCompressorMapInvalidFlow.csv">
+ <Content Include="TestFiles\testCompressorMapInvalidFlow.acmp">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="TestFiles\testCompressorMapInvalidOffPower.csv">
+ <Content Include="TestFiles\testCompressorMapInvalidOffPower.acmp">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="TestFiles\testCompressorMapInvalidOnPower.csv">
+ <Content Include="TestFiles\testCompressorMapInvalidOnPower.acmp">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="TestFiles\testCompressorMapInvalidRpm.csv">
+ <Content Include="TestFiles\testCompressorMapInvalidRpm.acmp">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="TestFiles\testCompressorMapNotEnoughRows.csv">
+ <Content Include="TestFiles\testCompressorMapNotEnoughRows.acmp">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="TestFiles\testCompressorMapWrongNumberOfColumns.csv">
+ <Content Include="TestFiles\testCompressorMapWrongNumberOfColumns.acmp">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="TestFiles\TestHvacMap.csv">
@@ -234,25 +234,25 @@
<Content Include="TestFiles\TestHvacMap - MissingHeader.csv">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="TestFiles\testAlternatorMap.csv">
+ <None Include="TestFiles\testAlternatorMap.aalt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
+ </None>
<Content Include="TestFiles\cstrPneumaticActuationsMapPath_INCORRECTCOLUMNS.csv">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="TestFiles\testPneumaticActuationsMap_DUPLICATEKEY.csv">
+ <Content Include="TestFiles\testPneumaticActuationsMap_DUPLICATEKEY.apac">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="TestFiles\testPneumaticActuationsMap_INVALIDCYCLENAME.csv">
+ <Content Include="TestFiles\testPneumaticActuationsMap_INVALIDCYCLENAME.apac">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="TestFiles\testPneumaticActuationsMap_INVALIDCONSUMERNAME.csv">
+ <Content Include="TestFiles\testPneumaticActuationsMap_INVALIDCONSUMERNAME.apac">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="TestFiles\testPneumaticActuationsMap_GOODMAP - Copy.csv">
+ <Content Include="TestFiles\testPneumaticActuationsMap_GOODMAP - Copy.apac">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="TestFiles\testCompressorMap - Copy.csv">
+ <Content Include="TestFiles\testCompressorMap - Copy.acmp">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
--
GitLab