diff --git a/Documentation/XML/VectoOutputDeclaration.pdf b/Documentation/XML/VectoOutputDeclaration.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..6a44615d68d8a896a679e267f9683393d3f4a3ce
Binary files /dev/null and b/Documentation/XML/VectoOutputDeclaration.pdf differ
diff --git a/Documentation/XML/VectoOutputDeclarationCOC.pdf b/Documentation/XML/VectoOutputDeclarationCustomer.pdf
similarity index 100%
rename from Documentation/XML/VectoOutputDeclarationCOC.pdf
rename to Documentation/XML/VectoOutputDeclarationCustomer.pdf
diff --git a/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh b/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh
index 5227ba879ee3b235a6d511298d39dec27cf8b68c..6179011253332280b3e7654152587e72e0478675 100644
--- a/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh
+++ b/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Class2_RigidTruck.vveh
@@ -1,7 +1,7 @@
{
"Header": {
- "CreatedBy": " ()",
- "Date": "2016-10-13T10:06:43.0936564Z",
+ "CreatedBy": "",
+ "Date": "2017-06-22T11:15:06.0747543Z",
"AppVersion": "3",
"FileVersion": 7
},
@@ -12,7 +12,6 @@
"CurbWeightExtra": 0.0,
"Loading": 0.0,
"MassMax": 11.99,
- "CdA": 4.83,
"rdyn": 0.0,
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
@@ -31,6 +30,8 @@
"LossMap": "",
"Cycle": ""
},
+ "TorqueLimits": {},
+ "IdlingSpeed": 600.0,
"AxleConfig": {
"Type": "4x2",
"Axles": [
@@ -40,7 +41,8 @@
"AxleWeightShare": 0.0,
"TwinTyres": false,
"RRCISO": 0.0065,
- "FzISO": 20850.0
+ "FzISO": 20850.0,
+ "Type": "VehicleNonDriven"
},
{
"Inertia": 6.5,
@@ -48,9 +50,11 @@
"AxleWeightShare": 0.0,
"TwinTyres": true,
"RRCISO": 0.0075,
- "FzISO": 20850.0
+ "FzISO": 20850.0,
+ "Type": "VehicleDriven"
}
]
- }
+ },
+ "CdA": 4.83
}
}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Engine_175kW_6.8l.veng b/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Engine_175kW_6.8l.veng
index 0f15f912ab82372c2d896b8af8f2b0e57b062d96..f5b2fd42395e000fc6a8fb8b100d2e9a31bddebd 100644
--- a/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Engine_175kW_6.8l.veng
+++ b/Generic Vehicles/Declaration Mode/Class2_RigidTruck_4x2/Engine_175kW_6.8l.veng
@@ -1,9 +1,9 @@
{
"Header": {
- "CreatedBy": " ()",
- "Date": "2016-10-13T10:06:50.6286564Z",
+ "CreatedBy": "",
+ "Date": "2017-06-22T11:14:49.3067543Z",
"AppVersion": "3",
- "FileVersion": 3
+ "FileVersion": 4
},
"Body": {
"SavedInDeclMode": true,
@@ -11,11 +11,18 @@
"Displacement": "6871",
"IdlingSpeed": 600.0,
"Inertia": 3.56517,
- "FullLoadCurve": "175kW.vfld",
- "FuelMap": "175kW.vmap",
"WHTC-Urban": 1.04,
"WHTC-Rural": 1.01,
- "WHTC-Motorway": 1.00,
- "ColdHotBalancingFactor": 1.0
+ "WHTC-Motorway": 1.0,
+ "WHTC-Engineering": 1.0,
+ "ColdHotBalancingFactor": 1.0,
+ "CFRegPer": 1.0,
+ "CFNCV": 1.0,
+ "RatedPower": 175000.0,
+ "RatedSpeed": 1950.0000000000002,
+ "MaxTorque": 1000.0,
+ "FuelType": 0,
+ "FullLoadCurve": "175kW.vfld",
+ "FuelMap": "175kW.vmap"
}
}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Class5_Tractor.vveh b/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Class5_Tractor.vveh
index 9853ba577c00dcdc3d168754d5111d8dcaa3b5af..69fe6f0b805c94258cbf487159a0ecb6c7703994 100644
--- a/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Class5_Tractor.vveh
+++ b/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Class5_Tractor.vveh
@@ -1,7 +1,7 @@
{
"Header": {
- "CreatedBy": " ()",
- "Date": "2016-10-13T10:08:01.8366564Z",
+ "CreatedBy": "",
+ "Date": "2017-06-22T11:14:19.0107543Z",
"AppVersion": "3",
"FileVersion": 7
},
@@ -12,7 +12,6 @@
"CurbWeightExtra": 0.0,
"Loading": 0.0,
"MassMax": 18.0,
- "CdA": 5.3,
"rdyn": 0.0,
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
@@ -31,6 +30,8 @@
"LossMap": "",
"Cycle": ""
},
+ "TorqueLimits": {},
+ "IdlingSpeed": 600.0,
"AxleConfig": {
"Type": "4x2",
"Axles": [
@@ -40,7 +41,8 @@
"AxleWeightShare": 0.0,
"TwinTyres": false,
"RRCISO": 0.0055,
- "FzISO": 33350.0
+ "FzISO": 33350.0,
+ "Type": "VehicleNonDriven"
},
{
"Inertia": 14.9,
@@ -48,9 +50,11 @@
"AxleWeightShare": 0.0,
"TwinTyres": true,
"RRCISO": 0.0065,
- "FzISO": 33350.0
+ "FzISO": 33350.0,
+ "Type": "VehicleDriven"
}
]
- }
+ },
+ "CdA": 5.3
}
}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng b/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng
index 4bdfc0cdfcdcc4fd2b19f656c1e37cad41fa648d..34912295216a6a4671cb3094b4f1d593ca74f6e0 100644
--- a/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng
+++ b/Generic Vehicles/Declaration Mode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng
@@ -1,9 +1,9 @@
{
"Header": {
- "CreatedBy": " ()",
- "Date": "2016-10-13T10:08:08.3476564Z",
+ "CreatedBy": "",
+ "Date": "2017-06-22T11:14:03.7167543Z",
"AppVersion": "3",
- "FileVersion": 3
+ "FileVersion": 4
},
"Body": {
"SavedInDeclMode": true,
@@ -11,11 +11,18 @@
"Displacement": "12740",
"IdlingSpeed": 600.0,
"Inertia": 5.1498,
- "FullLoadCurve": "325kW.vfld",
- "FuelMap": "325kW.vmap",
"WHTC-Urban": 1.04,
"WHTC-Rural": 1.01,
- "WHTC-Motorway": 1.00,
- "ColdHotBalancingFactor": 1.0
+ "WHTC-Motorway": 1.0,
+ "WHTC-Engineering": 1.0,
+ "ColdHotBalancingFactor": 1.0,
+ "CFRegPer": 1.0,
+ "CFNCV": 1.0,
+ "RatedPower": 325000.0,
+ "RatedSpeed": 1600.0,
+ "MaxTorque": 2400.0,
+ "FuelType": 0,
+ "FullLoadCurve": "325kW.vfld",
+ "FuelMap": "325kW.vmap"
}
}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh
index b72b915743e0e3b45da5379eb3ffcfc9fa7e0c86..d2a3b50e5b25192b95786e2a5f5f36c21ef45db0 100644
--- a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh
@@ -1,7 +1,7 @@
{
"Header": {
- "CreatedBy": " ()",
- "Date": "2017-05-19T08:36:54.5380903Z",
+ "CreatedBy": "",
+ "Date": "2017-06-22T11:16:11.6047543Z",
"AppVersion": "3",
"FileVersion": 7
},
@@ -12,7 +12,6 @@
"CurbWeightExtra": 0.0,
"Loading": 0.0,
"MassMax": 26.0,
- "CdA": 5.2,
"rdyn": 0.0,
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
@@ -32,6 +31,7 @@
"Cycle": ""
},
"TorqueLimits": {},
+ "IdlingSpeed": 600.0,
"AxleConfig": {
"Type": "6x2",
"Axles": [
@@ -41,7 +41,8 @@
"AxleWeightShare": 0.0,
"TwinTyres": false,
"RRCISO": 0.0055,
- "FzISO": 33350.0
+ "FzISO": 33350.0,
+ "Type": "VehicleNonDriven"
},
{
"Inertia": 14.9,
@@ -49,7 +50,8 @@
"AxleWeightShare": 0.0,
"TwinTyres": true,
"RRCISO": 0.0055,
- "FzISO": 33350.0
+ "FzISO": 33350.0,
+ "Type": "VehicleDriven"
},
{
"Inertia": 14.9,
@@ -57,9 +59,11 @@
"AxleWeightShare": 0.0,
"TwinTyres": false,
"RRCISO": 0.0055,
- "FzISO": 33350.0
+ "FzISO": 33350.0,
+ "Type": "VehicleNonDriven"
}
]
- }
+ },
+ "CdA": 5.2
}
}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng
index 9c995ff80fd7f9212a3f0e162b74a3f2fcd27894..268260fcd305c7db013a66502a1495d1d76d5ec7 100644
--- a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng
@@ -1,9 +1,9 @@
{
"Header": {
- "CreatedBy": " ()",
- "Date": "2017-05-19T08:13:02.2025457Z",
+ "CreatedBy": "",
+ "Date": "2017-06-22T11:15:58.5117543Z",
"AppVersion": "3",
- "FileVersion": 3
+ "FileVersion": 4
},
"Body": {
"SavedInDeclMode": true,
@@ -11,12 +11,18 @@
"Displacement": "7000",
"IdlingSpeed": 600.0,
"Inertia": 3.6,
- "FullLoadCurve": "324kW.vfld",
- "FuelMap": "350kW.vmap",
"WHTC-Urban": 1.0,
"WHTC-Rural": 1.0,
"WHTC-Motorway": 1.0,
"WHTC-Engineering": 1.0,
- "ColdHotBalancingFactor": 1.0
+ "ColdHotBalancingFactor": 1.0,
+ "CFRegPer": 1.0,
+ "CFNCV": 1.0,
+ "RatedPower": 324000.0,
+ "RatedSpeed": 1600.0,
+ "MaxTorque": 2300.0,
+ "FuelType": 0,
+ "FullLoadCurve": "324kW.vfld",
+ "FuelMap": "350kW.vmap"
}
}
\ No newline at end of file
diff --git a/HashingCmd/Program.cs b/HashingCmd/Program.cs
index eb75536b8d1c1a0b3278512386d9fb8ebb785f98..eb5bb14ebc1fc594b128d7193f244b0c6b8037c0 100644
--- a/HashingCmd/Program.cs
+++ b/HashingCmd/Program.cs
@@ -242,7 +242,6 @@ hashingcmd.exe
WriteLine("computing hashes");
var components = h.GetContainigComponents();
-
if (components.Count > 1) {
var grouped = components.GroupBy(s => s)
.Select(g => new { Entry = g.Key, Count = g.Count() });
@@ -290,7 +289,7 @@ hashingcmd.exe
private static void ShowVersionInformation()
{
- var hashingLib = AssemblyName.GetAssemblyName("VectoHashing.dll");
+ var hashingLib = Assembly.LoadFile(AppDomain.CurrentDomain.BaseDirectory + "VectoHashing.dll").GetName();
WriteLine(string.Format(@"HashingLibrary: {0}", hashingLib.Version));
}
}
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index dc9ff33ba68074bccdc34784f5282be84b57d7ec..484dc90a8a31292ecd88f02646c76c859a645499 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -362,7 +362,7 @@ Public Class VehicleForm
TbMassExtra.Text = vehicle.CurbMassExtra.ToGUIFormat()
TbLoad.Text = vehicle.Loading.ToGUIFormat()
TBrdyn.Text = (vehicle.DynamicTyreRadius.Value() * 1000).ToGUIFormat()
- tbVehIdlingSpeed.Text = vehicle.EngineIdleSpeed.AsRPM.ToGUIFormat()
+ tbVehIdlingSpeed.Text = If(vehicle.EngineIdleSpeed Is Nothing, "", vehicle.EngineIdleSpeed.AsRPM.ToGUIFormat())
CbCdMode.SelectedValue = airdrag.CrossWindCorrectionMode
TbCdFile.Text =
diff --git a/VECTO/OutputData/JSONFileWriter.vb b/VECTO/OutputData/JSONFileWriter.vb
index cd75ddf76eb4090ae86cb979ee68c3ce24f173c6..a5f76f078f9c783e6f8f7559e35e810e18bafb44 100644
--- a/VECTO/OutputData/JSONFileWriter.vb
+++ b/VECTO/OutputData/JSONFileWriter.vb
@@ -55,7 +55,7 @@ Public Class JSONFileWriter
body.Add("RatedPower", eng.RatedPowerDeclared.Value())
body.Add("RatedSpeed", eng.RatedSpeedDeclared.AsRPM)
body.Add("MaxTorque", eng.MaxTorqueDeclared.Value())
- body.Add("FuelType", eng.FuelType)
+ body.Add("FuelType", eng.FuelType.ToString())
body.Add("FullLoadCurve", GetRelativePath(eng.FullLoadCurve.Source, Path.GetDirectoryName(filename)))
diff --git a/VectoCommon/VectoCommon/Properties/AssemblyInfo.cs b/VectoCommon/VectoCommon/Properties/AssemblyInfo.cs
index 58941cfa6883f877aafd3c2f50b91119e931cfab..9d0dc7b2be74f2dde46cba93fc9225c2aab1dd10 100644
--- a/VectoCommon/VectoCommon/Properties/AssemblyInfo.cs
+++ b/VectoCommon/VectoCommon/Properties/AssemblyInfo.cs
@@ -62,5 +62,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+//[assembly: AssemblyVersion("1.0.0.0")]
+//[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/VectoCommon/VectoCommon/Properties/Version.cs b/VectoCommon/VectoCommon/Properties/Version.cs
new file mode 100644
index 0000000000000000000000000000000000000000..3d41901e5e4ad1d5df2a1e32967c4a9cd5e4970a
--- /dev/null
+++ b/VectoCommon/VectoCommon/Properties/Version.cs
@@ -0,0 +1,34 @@
+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2016 European Union
+*
+* Developed by Graz University of Technology,
+* Institute of Internal Combustion Engines and Thermodynamics,
+* Institute of Technical Informatics
+*
+* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
+* by the European Commission - subsequent versions of the EUPL (the "Licence");
+* You may not use VECTO except in compliance with the Licence.
+* You may obtain a copy of the Licence at:
+*
+* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+*
+* Unless required by applicable law or agreed to in writing, VECTO
+* distributed under the Licence is distributed on an "AS IS" basis,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the Licence for the specific language governing permissions and
+* limitations under the Licence.
+*
+* Authors:
+* Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
+* Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
+* Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
+* Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
+* Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
+* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
+*/
+
+using System.Reflection;
+[assembly: AssemblyVersion("3.1.2.903")]
+[assembly: AssemblyFileVersion("3.1.2.903")]
diff --git a/VectoCommon/VectoCommon/Properties/Version.tt b/VectoCommon/VectoCommon/Properties/Version.tt
new file mode 100644
index 0000000000000000000000000000000000000000..e5ca8e5e9e85e918432dd564d6360e86d5547ed5
--- /dev/null
+++ b/VectoCommon/VectoCommon/Properties/Version.tt
@@ -0,0 +1,39 @@
+/*
+* This file is part of VECTO.
+*
+* Copyright © 2012-2016 European Union
+*
+* Developed by Graz University of Technology,
+* Institute of Internal Combustion Engines and Thermodynamics,
+* Institute of Technical Informatics
+*
+* VECTO is licensed under the EUPL, Version 1.1 or - as soon they will be approved
+* by the European Commission - subsequent versions of the EUPL (the "Licence");
+* You may not use VECTO except in compliance with the Licence.
+* You may obtain a copy of the Licence at:
+*
+* https://joinup.ec.europa.eu/community/eupl/og_page/eupl
+*
+* Unless required by applicable law or agreed to in writing, VECTO
+* distributed under the Licence is distributed on an "AS IS" basis,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the Licence for the specific language governing permissions and
+* limitations under the Licence.
+*
+* Authors:
+* Stefan Hausberger, hausberger@ivt.tugraz.at, IVT, Graz University of Technology
+* Christian Kreiner, christian.kreiner@tugraz.at, ITI, Graz University of Technology
+* Michael Krisper, michael.krisper@tugraz.at, ITI, Graz University of Technology
+* Raphael Luz, luz@ivt.tugraz.at, IVT, Graz University of Technology
+* Markus Quaritsch, markus.quaritsch@tugraz.at, IVT, Graz University of Technology
+* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
+*/
+
+<#@ template language="C#" #>
+<#@ output extension=".cs"#>
+using System.Reflection;
+[assembly: AssemblyVersion("3.1.2.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("3.1.2.<#= this.RevisionNumber #>")]
+<#+
+ int RevisionNumber = (int)(DateTime.UtcNow - new DateTime(2015, 1, 1)).TotalDays;
+#>
\ No newline at end of file
diff --git a/VectoCommon/VectoCommon/VectoCommon.csproj b/VectoCommon/VectoCommon/VectoCommon.csproj
index 3eab0336e658a0e8906a55730cdc2f36223765c6..c994ad974c018a6524114452fafb12fd69ebc6d0 100644
--- a/VectoCommon/VectoCommon/VectoCommon.csproj
+++ b/VectoCommon/VectoCommon/VectoCommon.csproj
@@ -74,6 +74,11 @@
<Compile Include="OutputData\IOutputFileWriter.cs" />
<Compile Include="OutputData\IOutputPlugin.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Properties\Version.cs">
+ <DependentUpon>Version.tt</DependentUpon>
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ </Compile>
<Compile Include="Resources\XMLNames.Designer.cs">
<DependentUpon>XMLNames.resx</DependentUpon>
<AutoGen>True</AutoGen>
@@ -90,6 +95,10 @@
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
+ <None Include="Properties\Version.tt">
+ <Generator>TextTemplatingFileGenerator</Generator>
+ <LastGenOutput>Version.cs</LastGenOutput>
+ </None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\XMLNames.resx">
diff --git a/VectoCommon/VectoHashingTest/VectoHashTest.cs b/VectoCommon/VectoHashingTest/VectoHashTest.cs
index 530e7ec536e88686d82ba8962565675c22c07a4c..1d1ac4a21869adabd7f7172139939f176b953b81 100644
--- a/VectoCommon/VectoHashingTest/VectoHashTest.cs
+++ b/VectoCommon/VectoHashingTest/VectoHashTest.cs
@@ -32,13 +32,10 @@
using System;
using System.IO;
using System.Linq;
-using System.Security.Cryptography;
-using System.Security.Cryptography.Xml;
using System.Text;
using System.Xml;
using System.Xml.Linq;
using System.Xml.Schema;
-using System.Xml.XPath;
using NUnit.Framework;
using TUGraz.VectoCore.Utils;
using TUGraz.VectoHashing;
@@ -421,7 +418,6 @@ namespace VectoHashingTest
TestCase(VectoComponents.Angledrive, "ANGL-"),
TestCase(VectoComponents.Airdrag, "AD-"),
TestCase(VectoComponents.Tyre, "TYRE-"),
-
]
public void TestIdPrefix(VectoComponents component, string expectedPrefix)
{
diff --git a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
index 44a0b41d1f178cfc2d334bbf41b5a51adf634de6..b6a36b9a249c06ba2ff31a73aef4e734321566c5 100644
--- a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
+++ b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
@@ -1,209 +1,209 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{760C1C5B-A767-463E-BA85-F0BCFC23A550}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>VectoHashingTest</RootNamespace>
- <AssemblyName>VectoHashingTest</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
- <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
- <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
- <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
- <IsCodedUITest>False</IsCodedUITest>
- <TestProjectType>UnitTest</TestProjectType>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="nunit.framework">
- <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Security" />
- <Reference Include="System.Xml" />
- <Reference Include="System.Xml.Linq" />
- </ItemGroup>
- <Choose>
- <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
- <ItemGroup>
- <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
- </ItemGroup>
- </When>
- <Otherwise>
- <ItemGroup>
- <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
- </ItemGroup>
- </Otherwise>
- </Choose>
- <ItemGroup>
- <Compile Include="BasicHasingTests.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Utils\AssertHelper.cs" />
- <Compile Include="VectoHashTest.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="packages.config" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Testdata\XML\Invalid\duplicate-sig.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Invalid\invalid-comp.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Reference\vecto_engine-sample.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Reference\vecto_vehicle-sample_FULL.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\simple_document.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\ToHash\multiple_components.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\ToHash\vecto_engine-input.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\ToHash\vecto_engine_withhash-input.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\ToHash\vecto_engine_withid-input.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\ToHash\vecto_gearbox-input.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\ToHash\vecto_gearbox-input_nodata.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\ToHash\vecto_vehicle-sample_3axle1.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\ToHash\vecto_vehicle-sample_3axle2.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\ToHash\vecto_vehicle-sample.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Validation\vecto_engine_invalid.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Validation\vecto_engine_valid.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Validation\vecto_gearbox_invalid.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Validation\vecto_gearbox_valid.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Validation\vecto_vehicle_components_invalid.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Validation\vecto_vehicle_components_valid-engine_gbx.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Variations\vecto_engine-sample Encoding ISO 8859-15.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Variations\vecto_engine-sample Encoding UTF-16 BE BOM.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Variations\vecto_engine-sample Encoding UTF-16 LE.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Variations\vecto_engine-sample Encoding UTF-8 BOM.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Variations\vecto_engine-sample Encoding UTF-8.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Variations\vecto_engine-sample Encoding windows-1292.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Variations\vecto_engine-sample_Whitespaces.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Variations\vecto_vehicle-namespace_prefix.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Variations\vecto_vehicle-sample_FULL_Comments.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Variations\vecto_vehicle-sample_FULL_Entry_Order.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Variations\vecto_vehicle-sample_FULL_Newlines_Linux_LF.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Variations\vecto_vehicle-sample_FULL_Newlines_Mac_CR.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Testdata\XML\Variations\vecto_vehicle-sample_FULL_Newlines_Windows_CRLF.xml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\VectoCore\VectoCore\VectoCore.csproj">
- <Project>{cd36938a-add9-4c65-96da-b397cdeea90a}</Project>
- <Name>VectoCore</Name>
- </ProjectReference>
- <ProjectReference Include="..\VectoCommon\VectoCommon.csproj">
- <Project>{79a066ad-69a9-4223-90f6-6ed5d2d084f4}</Project>
- <Name>VectoCommon</Name>
- </ProjectReference>
- <ProjectReference Include="..\VectoHashing\VectoHashing.csproj">
- <Project>{B673E12F-D323-4C4C-8805-9915B2C72D3D}</Project>
- <Name>VectoHashing</Name>
- </ProjectReference>
- </ItemGroup>
- <Choose>
- <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
- <ItemGroup>
- <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <Private>False</Private>
- </Reference>
- <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <Private>False</Private>
- </Reference>
- <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <Private>False</Private>
- </Reference>
- <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <Private>False</Private>
- </Reference>
- </ItemGroup>
- </When>
- </Choose>
- <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{760C1C5B-A767-463E-BA85-F0BCFC23A550}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>VectoHashingTest</RootNamespace>
+ <AssemblyName>VectoHashingTest</AssemblyName>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+ <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+ <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+ <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+ <IsCodedUITest>False</IsCodedUITest>
+ <TestProjectType>UnitTest</TestProjectType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="nunit.framework">
+ <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Security" />
+ <Reference Include="System.Xml" />
+ <Reference Include="System.Xml.Linq" />
+ </ItemGroup>
+ <Choose>
+ <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
+ <ItemGroup>
+ <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+ </ItemGroup>
+ </When>
+ <Otherwise>
+ <ItemGroup>
+ <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
+ </ItemGroup>
+ </Otherwise>
+ </Choose>
+ <ItemGroup>
+ <Compile Include="BasicHasingTests.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Utils\AssertHelper.cs" />
+ <Compile Include="VectoHashTest.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="Testdata\XML\Invalid\duplicate-sig.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Invalid\invalid-comp.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Reference\vecto_engine-sample.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Reference\vecto_vehicle-sample_FULL.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\simple_document.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\ToHash\multiple_components.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\ToHash\vecto_engine-input.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\ToHash\vecto_engine_withhash-input.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\ToHash\vecto_engine_withid-input.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\ToHash\vecto_gearbox-input.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\ToHash\vecto_gearbox-input_nodata.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\ToHash\vecto_vehicle-sample_3axle1.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\ToHash\vecto_vehicle-sample_3axle2.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\ToHash\vecto_vehicle-sample.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Validation\vecto_engine_invalid.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Validation\vecto_engine_valid.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Validation\vecto_gearbox_invalid.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Validation\vecto_gearbox_valid.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Validation\vecto_vehicle_components_invalid.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Validation\vecto_vehicle_components_valid-engine_gbx.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Variations\vecto_engine-sample Encoding ISO 8859-15.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Variations\vecto_engine-sample Encoding UTF-16 BE BOM.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Variations\vecto_engine-sample Encoding UTF-16 LE.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Variations\vecto_engine-sample Encoding UTF-8 BOM.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Variations\vecto_engine-sample Encoding UTF-8.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Variations\vecto_engine-sample Encoding windows-1292.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Variations\vecto_engine-sample_Whitespaces.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Variations\vecto_vehicle-namespace_prefix.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Variations\vecto_vehicle-sample_FULL_Comments.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Variations\vecto_vehicle-sample_FULL_Entry_Order.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Variations\vecto_vehicle-sample_FULL_Newlines_Linux_LF.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Variations\vecto_vehicle-sample_FULL_Newlines_Mac_CR.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Testdata\XML\Variations\vecto_vehicle-sample_FULL_Newlines_Windows_CRLF.xml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\VectoCore\VectoCore\VectoCore.csproj">
+ <Project>{CD36938A-ADD9-4C65-96DA-B397CDEEA90A}</Project>
+ <Name>VectoCore</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\VectoCommon\VectoCommon.csproj">
+ <Project>{79a066ad-69a9-4223-90f6-6ed5d2d084f4}</Project>
+ <Name>VectoCommon</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\VectoHashing\VectoHashing.csproj">
+ <Project>{B673E12F-D323-4C4C-8805-9915B2C72D3D}</Project>
+ <Name>VectoHashing</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <Choose>
+ <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
+ <ItemGroup>
+ <Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <Private>False</Private>
+ </Reference>
+ </ItemGroup>
+ </When>
+ </Choose>
+ <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
- -->
+ -->
</Project>
\ No newline at end of file
diff --git a/VectoConsole/Program.cs b/VectoConsole/Program.cs
index 6158f89de9f3593bf640858810a54e65141982c7..93e6e4a3c0a8c10e8a08a32b27e9d9e2801ac7c1 100644
--- a/VectoConsole/Program.cs
+++ b/VectoConsole/Program.cs
@@ -337,9 +337,9 @@ Examples:
private static void ShowVersionInformation()
{
- var vectodll = AssemblyName.GetAssemblyName("VectoCore.dll");
WriteLine(string.Format(@"VectoConsole: {0}", Assembly.GetExecutingAssembly().GetName().Version));
- WriteLine(string.Format(@"VectoCore: {0}", vectodll.Version));
+ WriteLine(string.Format(@"VectoCore: {0}",
+ Assembly.LoadFrom(AppDomain.CurrentDomain.BaseDirectory + "VectoCore.dll").GetName().Version));
}
private static void PrintProgress(Dictionary<int, JobContainer.ProgressEntry> progessData,
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
index c7ca8e5ec71df0e7ff4005468f130b06b2854bdb..89f72c6389122bfdb62101c6d657c253b0106a4b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
@@ -153,7 +153,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
var inAngularVelocity = outAngularVelocity * effectiveRatio;
var torqueLossResult = torqueConverterLocked
? ModelData.Gears[gear].LossMap.GetTorqueLoss(outAngularVelocity, outTorque)
- : ModelData.Gears[Gear].TorqueConverterGearLossMap.GetTorqueLoss(outAngularVelocity, outTorque);
+ : ModelData.Gears[gear].TorqueConverterGearLossMap.GetTorqueLoss(outAngularVelocity, outTorque);
var inTorque = outTorque / effectiveRatio + torqueLossResult.Value;
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
index dc532e61dfa562d2bdf0faf00b9fa03141033313..b9791e6430dcd3c7483df8af49a453b9cb99608e 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
@@ -573,11 +573,29 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
Case<ResponseUnderload>(r => {
response = Driver.DrivingActionBrake(absTime, ds, DriverStrategy.BrakeTrigger.NextTargetSpeed,
gradient, r);
- response.Switch().Case<ResponseGearShift>(() => {
- DataBus.BrakePower = 0.SI<Watt>();
- response = Driver.DrivingActionBrake(absTime, ds, DriverStrategy.BrakeTrigger.NextTargetSpeed,
- gradient, r);
- });
+ response.Switch().
+ Case<ResponseGearShift>(() => {
+ DataBus.BrakePower = 0.SI<Watt>();
+ response = Driver.DrivingActionBrake(absTime, ds, DriverStrategy.BrakeTrigger.NextTargetSpeed,
+ gradient, r);
+ }).
+ Case<ResponseOverload>(() => {
+ DataBus.BrakePower = 0.SI<Watt>();
+ if (DataBus.GearboxType.AutomaticTransmission() || DataBus.ClutchClosed(absTime)) {
+ if (DataBus.VehicleSpeed.IsGreater(0)) {
+ response = Driver.DrivingActionAccelerate(absTime, ds, DriverStrategy.BrakeTrigger.NextTargetSpeed, gradient);
+ } else {
+ if (RetryDistanceExceeded) {
+ response = Driver.DrivingActionAccelerate(absTime, ds, targetVelocity, gradient);
+ } else {
+ RetryDistanceExceeded = true;
+ response = new ResponseDrivingCycleDistanceExceeded() { MaxDistance = ds / 2 };
+ }
+ }
+ } else {
+ response = Driver.DrivingActionRoll(absTime, ds, DriverStrategy.BrakeTrigger.NextTargetSpeed, gradient);
+ }
+ });
});
return response;
}
diff --git a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs
index 341fecb2cf7fa0f9ca99dd071dddb97fdc29b051..e509c204be80bf3270e5cec2317b3f8bb5ef9749 100644
--- a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs
@@ -369,7 +369,7 @@ namespace TUGraz.VectoCore.OutputData
public static SI FuelConsumptionFinalLiterPer100Kilometer(this IModalDataContainer data)
{
var fuelConsumptionFinal = data.FuelConsumptionFinal();
- if (fuelConsumptionFinal == null) {
+ if (fuelConsumptionFinal == null || data.FuelData.FuelDensity == null) {
return null;
}
@@ -538,12 +538,15 @@ namespace TUGraz.VectoCore.OutputData
retVal[i] = 0.SI<Scalar>();
}
- data.GetValues(x => {
- var gear = x.Field<uint>((int)ModalResultField.Gear);
- retVal[gear] += x.Field<Second>((int)ModalResultField.simulationInterval).Value();
- return gear; // not used
+ var gearData = data.GetValues(x => new {
+ Gear = x.Field<uint>((int)ModalResultField.Gear),
+ dt = x.Field<Second>((int)ModalResultField.simulationInterval)
});
+ foreach (var entry in gearData) {
+ retVal[entry.Gear] += entry.dt.Value();
+ }
+
var duration = Duration(data).Value();
for (uint i = 0; i <= gearCount; i++) {
retVal[i] = 100 * retVal[i] / duration;
diff --git a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
index 46c1d5b677ca1224925c046682e2e4212d371ee3..c5bcf423ce2dfebb0e529f1fb6eb1bf999da8d6c 100644
--- a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
@@ -462,13 +462,15 @@ namespace TUGraz.VectoCore.OutputData
if (fcfinal != null) {
row[FCFINAL_KM] = fcfinal.ConvertTo().Gramm.Per.Kilo.Meter;
}
- row[FCFINAL_LITERPER100KM] = modData.FuelConsumptionFinalLiterPer100Kilometer();
- if (vehicleLoading != null && !vehicleLoading.IsEqual(0)) {
- row[FCFINAL_LITERPER100TKM] = (modData.FuelConsumptionFinalLiterPer100Kilometer() ?? 0.SI()) /
+
+ var fcPer100lkm = modData.FuelConsumptionFinalLiterPer100Kilometer();
+ row[FCFINAL_LITERPER100KM] = fcPer100lkm;
+ if (vehicleLoading != null && !vehicleLoading.IsEqual(0) && fcPer100lkm != null) {
+ row[FCFINAL_LITERPER100TKM] = fcPer100lkm /
vehicleLoading.ConvertTo().Ton;
}
- if (cargoVolume > 0) {
- row[FCFINAL_LiterPer100M3KM] = (modData.FuelConsumptionFinalLiterPer100Kilometer() ?? 0.SI()) / cargoVolume;
+ if (cargoVolume > 0 && fcPer100lkm != null) {
+ row[FCFINAL_LiterPer100M3KM] = fcPer100lkm / cargoVolume;
}
var kilogramPerMeter = modData.CO2PerMeter();
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs
index 55eba7eecef958f9e78e599d7a7dbbf1299e0b3d..8a9a167e63c2f7ef351fd487486fb8f89db34243 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs
@@ -88,7 +88,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(tns + "GearsCount", modelData.GearboxData.Gears.Count),
new XElement(tns + "Retarder", modelData.Retarder.Type.IsDedicatedComponent()),
new XElement(tns + "AxleRatio", modelData.AxleGearData.AxleGear.Ratio.ToXMLFormat(3))
- );
+ );
InputDataIntegrity = new XElement(tns + "InputDataSignature",
modelData.InputDataHash == null ? CreateDummySig() : new XElement(modelData.InputDataHash));
}
@@ -99,7 +99,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(di + XMLNames.DI_Signature_Reference_DigestMethod,
new XAttribute(XMLNames.DI_Signature_Algorithm_Attr, "null")),
new XElement(di + XMLNames.DI_Signature_Reference_DigestValue, "NOT AVAILABLE")
- );
+ );
}
public void AddResult(
@@ -144,7 +144,7 @@ namespace TUGraz.VectoCore.OutputData.XML
private XElement GetApplicationInfo()
{
- var vectodll = AssemblyName.GetAssemblyName("VectoCore.dll");
+ var vectodll = Assembly.LoadFrom(AppDomain.CurrentDomain.BaseDirectory + "VectoCore.dll").GetName();
return new XElement(tns + "ApplicationInformation",
new XElement(tns + "SimulationToolVersion", vectodll.Version),
new XElement(tns + "Date", XmlConvert.ToString(DateTime.Now, XmlDateTimeSerializationMode.Utc)));
@@ -159,19 +159,19 @@ namespace TUGraz.VectoCore.OutputData.XML
var vehicle = new XElement(VehiclePart);
vehicle.Add(InputDataIntegrity);
retVal.Add(new XElement(tns + "VectoCustomerInformation",
- new XAttribute("schemaVersion", "0.4"),
- new XAttribute(XNamespace.Xmlns + "xsi", xsi.NamespaceName),
- new XAttribute("xmlns", tns),
- new XAttribute(XNamespace.Xmlns + "di", di),
- new XAttribute(xsi + "schemaLocation",
- string.Format("{0} {1}VectoCOC.xsd", tns, AbstractXMLWriter.SchemaLocationBaseUrl)),
- new XElement(tns + "Data",
- vehicle,
- new XElement(tns + "ResultDataSignature", resultSignature),
- results,
- GetApplicationInfo())
+ new XAttribute("schemaVersion", "0.4"),
+ new XAttribute(XNamespace.Xmlns + "xsi", xsi.NamespaceName),
+ new XAttribute("xmlns", tns),
+ new XAttribute(XNamespace.Xmlns + "di", di),
+ new XAttribute(xsi + "schemaLocation",
+ string.Format("{0} {1}VectoCOC.xsd", tns, AbstractXMLWriter.SchemaLocationBaseUrl)),
+ new XElement(tns + "Data",
+ vehicle,
+ new XElement(tns + "ResultDataSignature", resultSignature),
+ results,
+ GetApplicationInfo())
)
- );
+ );
var stream = new MemoryStream();
var writer = new StreamWriter(stream);
writer.Write(retVal);
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLFullReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLFullReport.cs
index b2e3b464639df9bd86f96b11523d549313d9c8be..57c01d7cbcbc920d98bb2684eeb0fe55bbf9e036 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLFullReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLFullReport.cs
@@ -61,7 +61,6 @@ namespace TUGraz.VectoCore.OutputData.XML
protected XNamespace di;
private bool allSuccess = true;
-
public XMLFullReport()
{
di = "http://www.w3.org/2000/09/xmldsig#";
@@ -91,8 +90,8 @@ namespace TUGraz.VectoCore.OutputData.XML
GetAirDragDescription(modelData.AirdragData),
GetAxleWheelsDescription(modelData.VehicleData),
GetAuxiliariesDescription(modelData.Aux)
- )
- );
+ )
+ );
InputDataIntegrity = new XElement(tns + "InputDataSignature",
modelData.InputDataHash == null ? CreateDummySig() : new XElement(modelData.InputDataHash));
}
@@ -103,7 +102,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(di + XMLNames.DI_Signature_Reference_DigestMethod,
new XAttribute(XMLNames.DI_Signature_Algorithm_Attr, "null")),
new XElement(di + XMLNames.DI_Signature_Reference_DigestValue, "NOT AVAILABLE")
- );
+ );
}
private XElement GetTorqueLimits(CombustionEngineData modelData)
@@ -134,7 +133,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(tns + XMLNames.Engine_Displacement,
engineData.Displacement.ConvertTo().Cubic.Centi.Meter.ToXMLFormat(0)),
new XElement(tns + XMLNames.Engine_FuelType, engineData.FuelType.ToXMLFormat())
- );
+ );
}
private XElement GetGearboxDescription(GearboxData gearboxData)
@@ -144,7 +143,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(tns + XMLNames.Gearbox_TransmissionType, gearboxData.Type.ToXMLFormat()),
new XElement(tns + "GearsCount", gearboxData.Gears.Count),
new XElement(tns + "TransmissionRatioFinalGear", gearboxData.Gears.Last().Value.Ratio.ToXMLFormat(3))
- );
+ );
}
private XElement GetTorqueConverterDescription(TorqueConverterData torqueConverterData)
@@ -187,7 +186,7 @@ namespace TUGraz.VectoCore.OutputData.XML
return new XElement(tns + XMLNames.Component_AirDrag,
new XElement(tns + "CertificationMethod", airdragData.CertificationMethod.ToXMLFormat()),
new XElement(tns + "CdxA", airdragData.DeclaredAirdragArea.ToXMLFormat(2))
- );
+ );
}
return new XElement(tns + XMLNames.Component_AirDrag,
new XElement(tns + XMLNames.Component_Model, airdragData.ModelName),
@@ -195,7 +194,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(tns + "CertificationNumber", airdragData.CertificationNumber),
new XElement(tns + XMLNames.DI_Signature_Reference_DigestValue, airdragData.DigestValueInput),
new XElement(tns + "CdxA", airdragData.DeclaredAirdragArea.ToXMLFormat(2))
- );
+ );
}
private XElement GetAxleWheelsDescription(VehicleData vehicleData)
@@ -303,7 +302,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(tns + "TotalVehicleMass", new XAttribute("unit", "kg"), result.TotalVehicleWeight.ToXMLFormat(0)),
new XElement(tns + "Payload", new XAttribute("unit", "kg"), result.Payload.ToXMLFormat(0)),
new XElement(tns + "FuelType", result.FuelType.ToXMLFormat())
- ),
+ ),
new XElement(tns + "VehiclePerformance",
new XElement(tns + "AverageSpeed", new XAttribute("unit", "km/h"), result.AverageSpeed.AsKmph.ToXMLFormat(1)),
new XElement(tns + "MinSpeed", new XAttribute("unit", "km/h"), result.MinSpeed.AsKmph.ToXMLFormat(1)),
@@ -312,7 +311,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(tns + "MaxAcceleration", new XAttribute("unit", "m/s²"), result.MaxAcceleration.ToXMLFormat(2)),
new XElement(tns + "FullLoadDrivingtimePercentage", result.FullLoadPercentage.ToXMLFormat(0)),
new XElement(tns + "GearshiftCount", result.GearshiftCount.ToXMLFormat(0))
- ),
+ ),
//FC
XMLDeclarationReport.GetResults(result, tns, true).Cast<object>().ToArray()
};
@@ -320,7 +319,7 @@ namespace TUGraz.VectoCore.OutputData.XML
private XElement GetApplicationInfo()
{
- var vectodll = AssemblyName.GetAssemblyName("VectoCore.dll");
+ var vectodll = Assembly.LoadFrom(AppDomain.CurrentDomain.BaseDirectory + "VectoCore.dll").GetName();
return new XElement(tns + "ApplicationInformation",
new XElement(tns + "SimulationToolVersion", vectodll.Version),
new XElement(tns + "Date", XmlConvert.ToString(DateTime.Now, XmlDateTimeSerializationMode.Utc)));
@@ -335,18 +334,18 @@ namespace TUGraz.VectoCore.OutputData.XML
var vehicle = new XElement(VehiclePart);
vehicle.Add(InputDataIntegrity);
retVal.Add(new XElement(tns + "VectoOutput",
- new XAttribute("schemaVersion", "0.4"),
- new XAttribute(XNamespace.Xmlns + "xsi", xsi.NamespaceName),
- new XAttribute("xmlns", tns),
- new XAttribute(XNamespace.Xmlns + "di", di),
- new XAttribute(xsi + "schemaLocation",
- string.Format("{0} {1}VectoOutput.xsd", tns, AbstractXMLWriter.SchemaLocationBaseUrl)),
- new XElement(tns + "Data",
- vehicle,
- results,
- GetApplicationInfo())
+ new XAttribute("schemaVersion", "0.4"),
+ new XAttribute(XNamespace.Xmlns + "xsi", xsi.NamespaceName),
+ new XAttribute("xmlns", tns),
+ new XAttribute(XNamespace.Xmlns + "di", di),
+ new XAttribute(xsi + "schemaLocation",
+ string.Format("{0} {1}VectoOutput.xsd", tns, AbstractXMLWriter.SchemaLocationBaseUrl)),
+ new XElement(tns + "Data",
+ vehicle,
+ results,
+ GetApplicationInfo())
)
- );
+ );
var stream = new MemoryStream();
var writer = new StreamWriter(stream);
writer.Write(retVal);
diff --git a/VectoCore/VectoCore/Resources/Declaration/FuelTypes.csv b/VectoCore/VectoCore/Resources/Declaration/FuelTypes.csv
index fe767888a223d32ed16598f1aab39013fbbf36fd..0a29844de4eae42127459e78865a5e3d4c6a6a24 100644
--- a/VectoCore/VectoCore/Resources/Declaration/FuelTypes.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/FuelTypes.csv
@@ -1,7 +1,7 @@
FuelType , FuelDensity [kg/m3] , CO2 per FuelWeight [kgCo2/kgFuel] , Lower Heating Value [kJ/kg]
-Diesel CI , 832 , 3.16 , 42700
-Ethanol CI , 794 , 1.91 , 29200
-Petrol PI , 745 , 3.17 , 41500
-Ethanol PI , 794 , 1.91 , 29200
+Diesel CI , 836 , 3.13 , 42700
+Ethanol CI , 820 , 1.83 , 25400
+Petrol PI , 750 , 3.04 , 41500
+Ethanol PI , 786 , 2.09 , 29200
LPG , , 3.02 , 46000
NG , , 2.54 , 45100
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoCOC.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.xsd
similarity index 100%
rename from VectoCore/VectoCore/Resources/XSD/VectoCOC.xsd
rename to VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.xsd
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutput.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd
similarity index 100%
rename from VectoCore/VectoCore/Resources/XSD/VectoOutput.xsd
rename to VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd
diff --git a/VectoCore/VectoCore/Utils/VectoCSVFile.cs b/VectoCore/VectoCore/Utils/VectoCSVFile.cs
index 9cd44bfe9fb2bb25ada0d64ce6107f5d7900674e..ac9d2bedf28120c57923c91ac20ab20bb6294098 100644
--- a/VectoCore/VectoCore/Utils/VectoCSVFile.cs
+++ b/VectoCore/VectoCore/Utils/VectoCSVFile.cs
@@ -210,7 +210,7 @@ namespace TUGraz.VectoCore.Utils
return;
}
if (addVersionHeader) {
- var vectodll = AssemblyName.GetAssemblyName("VectoCore.dll");
+ var vectodll = Assembly.LoadFrom(AppDomain.CurrentDomain.BaseDirectory + "VectoCore.dll").GetName();
writer.WriteLine("# VECTO {0} - {1}", vectodll.Version, DateTime.Now.ToString("dd.MM.yyyy HH:mm"));
}
var header = table.Columns.Cast<DataColumn>().Select(col => col.Caption ?? col.ColumnName);
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index fbd96c8c14ce1ae290b1965a68e50433b40d7a5f..aae00d06abb7382634365a52ac96303aa8ee38ce 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -401,7 +401,7 @@
<SubType>Designer</SubType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
- <EmbeddedResource Include="Resources\XSD\VectoOutput.xsd">
+ <EmbeddedResource Include="Resources\XSD\VectoOutputManufacturer.xsd">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Resources\XSD\xmldsig-core-schema.xsd">
@@ -413,6 +413,9 @@
<EmbeddedResource Include="Resources\XSD\VectoDeclarationDefinitions.1.0.xsd">
<SubType>Designer</SubType>
</EmbeddedResource>
+ <None Include="Resources\XSD\VectoOutputCustomer.xsd">
+ <SubType>Designer</SubType>
+ </None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Declaration\Report\4x2r.png" />
diff --git a/VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs b/VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs
index 18927a50f620a93d99293aec388903db13b2fd35..3e6fd32088f3bbce83f865e26737aa2fce8c3c89 100644
--- a/VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/FuelTypesTest.cs
@@ -43,16 +43,16 @@ namespace TUGraz.VectoCore.Tests.Integration
public class FuelTypesTest
{
[TestCase(FuelType.DieselCI,
- @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 0, 0.0006944, 9394.4751,
+ @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 0, 0.0006886, 9394.4751,
TestName = "Diesel LH Low"),
TestCase(FuelType.EthanolCI,
- @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 0, 0.0004197, 6424.3249,
+ @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 0, 0.00040262, 5588.282,
TestName = "Ethanol LH Low"),
TestCase(FuelType.DieselCI,
- @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1, 0.0008048, 10875.0171,
+ @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1, 0.0007971, 10875.0171,
TestName = "Diesel LH Ref"),
TestCase(FuelType.EthanolCI,
- @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1, 0.0004864, 7436.7798,
+ @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto", 1, 0.0004660, 6468.9797,
TestName = "Ethanol LH Ref"),]
public void TestFuelTypesCO2(FuelType fuelType, string jobName, int runIdx, double expectedCo2, double expectedMJ)
{