From 7c255df22c02a3af9aee78f2359dde8630904494 Mon Sep 17 00:00:00 2001
From: "Burns, Terry" <Terry.Burns@ricardo.com>
Date: Fri, 19 Dec 2014 15:44:37 +0000
Subject: [PATCH] BEFORE UPDATE OF JSONSOFT
git-tfs-id: [http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C1701
---
.../AuxiliaryTestHarness.vbproj | 1 +
AuxillaryTestHarness/NEWALT.AALT | 91 +++++++++++++++++++
VECTO/GUI/F_VECTO.vb | 2 +-
VECTO/VECTO.vbproj | 26 +-----
.../VectoAuxiliaries/UI/frmAuxiliaryConfig.vb | 6 +-
.../VectoAuxiliaries/VectoAuxiliaries.vbproj | 7 +-
6 files changed, 105 insertions(+), 28 deletions(-)
create mode 100644 AuxillaryTestHarness/NEWALT.AALT
diff --git a/AuxillaryTestHarness/AuxiliaryTestHarness.vbproj b/AuxillaryTestHarness/AuxiliaryTestHarness.vbproj
index 880739ed79..26f6fcd616 100644
--- a/AuxillaryTestHarness/AuxiliaryTestHarness.vbproj
+++ b/AuxillaryTestHarness/AuxiliaryTestHarness.vbproj
@@ -205,6 +205,7 @@
<Content Include="TAKAWAY.AHSM">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <None Include="NEWALT.AALT" />
<None Include="testAlternatorMap - Copy.aalt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
diff --git a/AuxillaryTestHarness/NEWALT.AALT b/AuxillaryTestHarness/NEWALT.AALT
new file mode 100644
index 0000000000..2d9926981d
--- /dev/null
+++ b/AuxillaryTestHarness/NEWALT.AALT
@@ -0,0 +1,91 @@
+[Amps], [Engine Speed], [Efficiency]
+10,500,0.6
+25,500,0.6
+50,500,0.6
+75,500,0.6
+100,500,0.6
+150,500,0.6
+200,500,0.6
+10,666.666666666667,0.6
+25,666.666666666667,0.6
+50,666.666666666667,0.6
+75,666.666666666667,0.6
+100,666.666666666667,0.6
+150,666.666666666667,0.6
+200,666.666666666667,0.6
+10,1333.33333333333,0.6
+25,1333.33333333333,0.6
+50,1333.33333333333,0.6
+75,1333.33333333333,0.6
+100,1333.33333333333,0.6
+150,1333.33333333333,0.6
+200,1333.33333333333,0.6
+10,2000,0.7
+25,2000,0.674137931034483
+50,2000,0.631034482758621
+75,2000,0.587931034482759
+100,2000,0.544827586206896
+150,2000,0.458620689655172
+200,2000,0.372413793103448
+10,2333.33333333333,0.7
+25,2333.33333333333,0.674137931034483
+50,2333.33333333333,0.631034482758621
+75,2333.33333333333,0.581896551724138
+100,2333.33333333333,0.517241379310345
+150,2333.33333333333,0.387931034482759
+[MODELSOURCE]
+
+USERNAME :Terry Burns
+TITLE :Dominos Pizza Simulation
+BUILD REF :0.1
+SIM DATE :16/12/2014 14:32:53
+COMMENTS :Some Comments
+
+*Alternator 1*
+
+ rpm
+amps 2000 4000 6000
+10 60 60 70
+50 60
+53 60
+63 60
+68 60
+125 60
+136 60
+
+*Alternator 2*
+
+ rpm
+amps 2000 4000 6000
+10 90 70 90
+50 90
+53 90
+63 70
+68 90
+125 70
+200 90
+
+*Alternator 3*
+
+ rpm
+amps 2000 4000 6000
+10 62 64 53
+50 85
+53 30
+63 74
+68 70
+125 68
+136 62
+
+*Alternator 4*
+
+ rpm
+amps 2000 4000 6000
+10 1 64 53
+50 90
+53 30
+63 74
+68 70
+125 68
+136 62
+
diff --git a/VECTO/GUI/F_VECTO.vb b/VECTO/GUI/F_VECTO.vb
index f46cac0c3b..1b51fe8f40 100644
--- a/VECTO/GUI/F_VECTO.vb
+++ b/VECTO/GUI/F_VECTO.vb
@@ -1300,7 +1300,7 @@ Private Sub btnBrowseAAUXFile_Click( sender As Object, e As EventArgs) Handles
Dim fbAux As New cFileBrowser(True, False)
- Dim ssmMap As New Hvac.HVACSteadyStateModel()
+ ' Dim ssmMap As New Hvac.HVACSteadyStateModel()
Dim message As String = String.Empty
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index 6f13fff835..973072a757 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -348,24 +348,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <Content Include="bin\Debug\Generic Vehicles\Declaration Mode\12t Delivery Truck\testAlternatorMap.aalt">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
- <Content Include="bin\Debug\Generic Vehicles\Declaration Mode\12t Delivery Truck\testCompressorMap.acmp">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
- <Content Include="bin\Debug\Generic Vehicles\Declaration Mode\12t Delivery Truck\testFuelGoodMap.vmap">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
- <Content Include="bin\Debug\Generic Vehicles\Declaration Mode\12t Delivery Truck\TAKAWAY.AHSM">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
- <Content Include="bin\Debug\bin\Debug\TAKAWAY.AHSM">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
- <Content Include="bin\Debug\bin\Debug\Generic Vehicles\Declaration Mode\12t Delivery Truck\TAKAWAY.AHSM">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
+ <Content Include="bin\Debug\bin\Debug\Generic Vehicles\Declaration Mode\12t Delivery Truck\TAKAWAY.AHSM" />
<Content Include="bin\Debug\bin\Debug\bin\Debug\Generic Vehicles\Declaration Mode\12t Delivery Truck\TAKAWAY.AHSM">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
@@ -460,15 +443,14 @@
<None Include="Resources\F_VECTO.png" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\VECTOAux\VectoAuxiliaries\VectoAuxiliaries.vbproj">
- <Project>{fdeee460-0b8a-4ef6-8d9e-72f203a50f65}</Project>
- <Name>VectoAuxiliaries</Name>
- </ProjectReference>
<ProjectReference Include="..\AdvancedAuxiliaryInterfaces\AdvancedAuxiliaryInterfaces.vbproj">
<Project>{b4b9bd2f-fd8f-4bb8-82fa-e2154d2c7fbd}</Project>
<Name>AdvancedAuxiliaryInterfaces</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="bin\Debug\Generic Vehicles\Declaration Mode\12t Delivery Truck\" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
index 948a4f5688..49da650b06 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmAuxiliaryConfig.vb
@@ -471,7 +471,7 @@ Public Function Validate_Pneumatics() As Boolean
Dim comp As CompressorMap
Try
- comp = New CompressorMap(txtCompressorMap.Text)
+ comp = New CompressorMap(FilePathUtils.ResolveFilePath( vectoPath,txtCompressorMap.Text))
comp.Initialise()
ErrorProvider.SetError(txtCompressorMap, String.Empty)
Catch ex As Exception
@@ -507,7 +507,7 @@ Public Function Validate_Pneumatics() As Boolean
Dim actuations As PneumaticActuationsMAP
Try
- actuations = New PneumaticActuationsMAP(txtActuationsMap.Text)
+ actuations = New PneumaticActuationsMAP(FilePathUtils.ResolveFilePath( vectoPath,txtActuationsMap.Text))
actuations.Initialise()
ErrorProvider.SetError(txtActuationsMap, String.Empty)
Catch ex As Exception
@@ -1202,7 +1202,7 @@ Private Sub btnSSMBSource_Click( sender As Object, e As EventArgs) Handles btnS
Try
- If Not ssmMap.SetValuesFromMap(txtSSMFilePath.Text, message) then
+ If Not ssmMap.SetValuesFromMap(FilePathUtils.ResolveFilePath(vectoPath,txtSSMFilePath.Text), message) then
txtHVACElectricalLoadPowerWatts.Text = string.empty
txtHVACMechanicalLoadPowerWatts.Text = string.empty
diff --git a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
index a1cafac3ae..b791a6c416 100644
--- a/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
+++ b/VECTOAux/VectoAuxiliaries/VectoAuxiliaries.vbproj
@@ -48,9 +48,9 @@
<OptionInfer>Off</OptionInfer>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
+ <HintPath>bin\Debug\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -216,6 +216,9 @@
<Name>AdvancedAuxiliaryInterfaces</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="ExternalAssemblies\" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
--
GitLab