From 022d18657042db1d80710e809d4b9f5e7174221e Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Mon, 18 Jul 2016 17:04:26 +0200
Subject: [PATCH] added test with and without angle gear with loss map or
efficiency
---
.../Simulation/PowerTrainBuilderTest.cs | 55 +++++++++--
.../TestData/Components/24t Coach.vveh | 2 +-
.../TestData/Components/24t CoachNoAng.vveh | 55 +++++++++++
.../Components/24t Coach_Ang_Efficiency.vveh | 60 ++++++++++++
.../TestData/Components/24t Coach_NoAng.vveh | 55 +++++++++++
.../40t_Long_Haul_Truck AngleEfficiency.vveh | 52 ++++++++++
.../Components/40t_Long_Haul_Truck.vveh | 95 ++++++++++---------
.../Components/40t_Long_Haul_Truck_NoAng.vveh | 47 +++++++++
.../TestData/Jobs/24t CoachNoAng.vecto | 56 +++++++++++
.../Jobs/24t Coach_Ang_Efficiency.vecto | 56 +++++++++++
...Long_Haul_Truck with AngleEfficiency.vecto | 70 ++++++++++++++
.../Jobs/40t_Long_Haul_Truck_NoAng.vecto | 70 ++++++++++++++
12 files changed, 620 insertions(+), 53 deletions(-)
create mode 100644 VectoCore/VectoCoreTest/TestData/Components/24t CoachNoAng.vveh
create mode 100644 VectoCore/VectoCoreTest/TestData/Components/24t Coach_Ang_Efficiency.vveh
create mode 100644 VectoCore/VectoCoreTest/TestData/Components/24t Coach_NoAng.vveh
create mode 100644 VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck AngleEfficiency.vveh
create mode 100644 VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck_NoAng.vveh
create mode 100644 VectoCore/VectoCoreTest/TestData/Jobs/24t CoachNoAng.vecto
create mode 100644 VectoCore/VectoCoreTest/TestData/Jobs/24t Coach_Ang_Efficiency.vecto
create mode 100644 VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck with AngleEfficiency.vecto
create mode 100644 VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck_NoAng.vecto
diff --git a/VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs b/VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs
index bf763849d7..90f5b45776 100644
--- a/VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Simulation/PowerTrainBuilderTest.cs
@@ -30,7 +30,7 @@
*/
using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCore.InputData.FileIO.JSON;
@@ -40,21 +40,30 @@ using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Models.SimulationComponent.Impl;
using TUGraz.VectoCore.Tests.Utils;
+using Assert = Microsoft.VisualStudio.TestTools.UnitTesting.Assert;
namespace TUGraz.VectoCore.Tests.Models.Simulation
{
- [TestClass]
+ [TestFixture]
public class PowerTrainBuilderTest
{
public const string JobFile = @"TestData\Jobs\24t Coach.vecto";
+ public const string JobFileNoAngular = @"TestData\Jobs\24t CoachNoAng.vecto";
+ public const string JobFileAngEfficiency = @"TestData\Jobs\24t Coach_Ang_Efficiency.vecto";
- [TestMethod]
- public void BuildFullPowerTrainTest()
+ public const string JobFileDecl = @"TestData\Jobs\40t_Long_Haul_Truck.vecto";
+ public const string JobFileDeclNoAngular = @"TestData\Jobs\40t_Long_Haul_Truck_NoAng.vecto";
+ public const string JobFileDeclAngEfficiency = @"TestData\Jobs\40t_Long_Haul_Truck with AngleEfficiency.vecto";
+
+ [TestCase(JobFile, 12),
+ TestCase(JobFileNoAngular, 11),
+ TestCase(JobFileAngEfficiency, 12)]
+ public void BuildFullPowerTrain_Engineering(string inputFile, int componentCount)
{
- var dataProvider = JSONInputDataFactory.ReadJsonJob(JobFile);
+ var dataProvider = JSONInputDataFactory.ReadJsonJob(inputFile);
var engineeringProvider = dataProvider as IEngineeringInputDataProvider;
if (engineeringProvider == null) {
- throw new VectoException("Failed to cas to Engineering InputDataProvider");
+ throw new VectoException("Failed to cast to Engineering InputDataProvider");
}
var reader = new EngineeringModeVectoRunDataFactory(engineeringProvider);
var runData = reader.NextRun().First();
@@ -65,12 +74,44 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
var powerTrain = builder.Build(runData);
Assert.IsInstanceOfType(powerTrain, typeof(IVehicleContainer));
- Assert.AreEqual(12, powerTrain.SimulationComponents().Count);
+ Assert.AreEqual(componentCount, powerTrain.SimulationComponents().Count);
Assert.IsInstanceOfType(powerTrain.Engine, typeof(CombustionEngine));
Assert.IsInstanceOfType(powerTrain.Gearbox, typeof(Gearbox));
Assert.IsInstanceOfType(powerTrain.Cycle, typeof(ISimulationOutPort));
Assert.IsInstanceOfType(powerTrain.Vehicle, typeof(Vehicle));
}
+
+ [TestCase(JobFileDeclNoAngular, 11, false),
+ TestCase(JobFileDecl, 12, false),
+ TestCase(JobFileDeclAngEfficiency, 11, true)]
+ public void BuildFullPowerTrain_Declaration(string inputFile, int componentCount, bool shouldFail)
+ {
+ var dataProvider = JSONInputDataFactory.ReadJsonJob(inputFile);
+ var provider = dataProvider as IDeclarationInputDataProvider;
+ if (provider == null) {
+ throw new VectoException("Failed to cast to Declaration InputDataProvider");
+ }
+ var reader = new DeclarationModeVectoRunDataFactory(provider, null);
+
+ if (!shouldFail) {
+ var runData = reader.NextRun().First();
+
+ var writer = new MockModalDataContainer();
+ var builder = new PowertrainBuilder(writer);
+
+ var powerTrain = builder.Build(runData);
+
+ Assert.IsInstanceOfType(powerTrain, typeof(IVehicleContainer));
+ Assert.AreEqual(componentCount, powerTrain.SimulationComponents().Count);
+
+ Assert.IsInstanceOfType(powerTrain.Engine, typeof(CombustionEngine));
+ Assert.IsInstanceOfType(powerTrain.Gearbox, typeof(Gearbox));
+ Assert.IsInstanceOfType(powerTrain.Cycle, typeof(ISimulationOutPort));
+ Assert.IsInstanceOfType(powerTrain.Vehicle, typeof(Vehicle));
+ } else {
+ AssertHelper.Exception<VectoException>(() => { reader.NextRun().ToList(); });
+ }
+ }
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/24t Coach.vveh b/VectoCore/VectoCoreTest/TestData/Components/24t Coach.vveh
index c6d1b54abc..3f4d1f757e 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/24t Coach.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Components/24t Coach.vveh
@@ -25,7 +25,7 @@
"AngularGear": {
"Type" : "SeparateAngularGear",
"Ratio": 3.5,
- "LossMap": "AngularGear.vtlm"
+ "LossMap": "AngleGear.vtlm"
},
"AxleConfig": {
"Type": "6x2",
diff --git a/VectoCore/VectoCoreTest/TestData/Components/24t CoachNoAng.vveh b/VectoCore/VectoCoreTest/TestData/Components/24t CoachNoAng.vveh
new file mode 100644
index 0000000000..d620cbafdb
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/24t CoachNoAng.vveh
@@ -0,0 +1,55 @@
+{
+ "Header": {
+ "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
+ "Date": "29.07.2014 16:59:13",
+ "AppVersion": "2.0.4-beta",
+ "FileVersion": 7
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "Coach",
+ "CurbWeight": 15700.0,
+ "CurbWeightExtra": 0.0,
+ "Loading": 3300.0,
+ "MassMax": 24.0,
+ "CdA": 3.2634,
+ "rdyn": 520.0,
+ "Rim": "-",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "24t Coach.vcdv",
+ "Retarder": {
+ "Type": "Secondary",
+ "Ratio": 1.0,
+ "File": "Retarder.vrlm"
+ },
+ "AxleConfig": {
+ "Type": "6x2",
+ "Axles": [
+ {
+ "Inertia": 21.66667,
+ "Wheels": "-",
+ "AxleWeightShare": 0.4375,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 62538.75
+ },
+ {
+ "Inertia": 10.83333,
+ "Wheels": "-",
+ "AxleWeightShare": 0.375,
+ "TwinTyres": true,
+ "RRCISO": 0.0065,
+ "FzISO": 52532.55
+ },
+ {
+ "Inertia": 21.66667,
+ "Wheels": "-",
+ "AxleWeightShare": 0.1875,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 62538.75
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/24t Coach_Ang_Efficiency.vveh b/VectoCore/VectoCoreTest/TestData/Components/24t Coach_Ang_Efficiency.vveh
new file mode 100644
index 0000000000..9da3421752
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/24t Coach_Ang_Efficiency.vveh
@@ -0,0 +1,60 @@
+{
+ "Header": {
+ "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
+ "Date": "29.07.2014 16:59:13",
+ "AppVersion": "2.0.4-beta",
+ "FileVersion": 7
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "Coach",
+ "CurbWeight": 15700.0,
+ "CurbWeightExtra": 0.0,
+ "Loading": 3300.0,
+ "MassMax": 24.0,
+ "CdA": 3.2634,
+ "rdyn": 520.0,
+ "Rim": "-",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "24t Coach.vcdv",
+ "Retarder": {
+ "Type": "Secondary",
+ "Ratio": 1.0,
+ "File": "Retarder.vrlm"
+ },
+ "AngularGear": {
+ "Type" : "SeparateAngularGear",
+ "Ratio": 3.5,
+ "Efficiency": "0.95"
+ },
+ "AxleConfig": {
+ "Type": "6x2",
+ "Axles": [
+ {
+ "Inertia": 21.66667,
+ "Wheels": "-",
+ "AxleWeightShare": 0.4375,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 62538.75
+ },
+ {
+ "Inertia": 10.83333,
+ "Wheels": "-",
+ "AxleWeightShare": 0.375,
+ "TwinTyres": true,
+ "RRCISO": 0.0065,
+ "FzISO": 52532.55
+ },
+ {
+ "Inertia": 21.66667,
+ "Wheels": "-",
+ "AxleWeightShare": 0.1875,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 62538.75
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/24t Coach_NoAng.vveh b/VectoCore/VectoCoreTest/TestData/Components/24t Coach_NoAng.vveh
new file mode 100644
index 0000000000..d620cbafdb
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/24t Coach_NoAng.vveh
@@ -0,0 +1,55 @@
+{
+ "Header": {
+ "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
+ "Date": "29.07.2014 16:59:13",
+ "AppVersion": "2.0.4-beta",
+ "FileVersion": 7
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehCat": "Coach",
+ "CurbWeight": 15700.0,
+ "CurbWeightExtra": 0.0,
+ "Loading": 3300.0,
+ "MassMax": 24.0,
+ "CdA": 3.2634,
+ "rdyn": 520.0,
+ "Rim": "-",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "24t Coach.vcdv",
+ "Retarder": {
+ "Type": "Secondary",
+ "Ratio": 1.0,
+ "File": "Retarder.vrlm"
+ },
+ "AxleConfig": {
+ "Type": "6x2",
+ "Axles": [
+ {
+ "Inertia": 21.66667,
+ "Wheels": "-",
+ "AxleWeightShare": 0.4375,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 62538.75
+ },
+ {
+ "Inertia": 10.83333,
+ "Wheels": "-",
+ "AxleWeightShare": 0.375,
+ "TwinTyres": true,
+ "RRCISO": 0.0065,
+ "FzISO": 52532.55
+ },
+ {
+ "Inertia": 21.66667,
+ "Wheels": "-",
+ "AxleWeightShare": 0.1875,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 62538.75
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck AngleEfficiency.vveh b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck AngleEfficiency.vveh
new file mode 100644
index 0000000000..977e03d4ce
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck AngleEfficiency.vveh
@@ -0,0 +1,52 @@
+{
+ "Header": {
+ "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
+ "Date": "29.07.2014 16:59:03",
+ "AppVersion": "2.0.4-beta",
+ "FileVersion": 7
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "VehCat": "Tractor",
+ "CurbWeight": 7100.0,
+ "CurbWeightExtra": 0.0,
+ "Loading": 0.0,
+ "MassMax": 40.0,
+ "CdA": 6.2985,
+ "rdyn": 488.2675,
+ "Rim": "5° DC Rims",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "40t_Long_Haul_Truck.vcdv",
+ "Retarder": {
+ "Type": "Secondary",
+ "Ratio": 1.0,
+ "File": "Retarder.vrlm"
+ },
+ "AngularGear": {
+ "Type": "SeparateAngularGear",
+ "Ratio": 1.0,
+ "Efficiency": 0.95
+ },
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.5,
+ "TwinTyres": false,
+ "RRCISO": 0.00555,
+ "FzISO": 31300.0
+ },
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.5,
+ "TwinTyres": true,
+ "RRCISO": 0.00628,
+ "FzISO": 31300.0
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vveh b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vveh
index d4ba98040d..548a902502 100644
--- a/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vveh
+++ b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.vveh
@@ -1,47 +1,52 @@
{
- "Header": {
- "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
- "Date": "29.07.2014 16:59:03",
- "AppVersion": "2.0.4-beta",
- "FileVersion": 7
- },
- "Body": {
- "SavedInDeclMode": true,
- "VehCat": "Tractor",
- "CurbWeight": 7100.0,
- "CurbWeightExtra": 0.0,
- "Loading": 0.0,
- "MassMax": 40.0,
- "CdA": 6.2985,
- "rdyn": 488.2675,
- "Rim": "5° DC Rims",
- "CdCorrMode": "CdofVdecl",
- "CdCorrFile": "40t_Long_Haul_Truck.vcdv",
- "Retarder": {
- "Type": "Secondary",
- "Ratio": 1.0,
- "File": "Retarder.vrlm"
- },
- "AxleConfig": {
- "Type": "4x2",
- "Axles": [
- {
- "Inertia": 14.9,
- "Wheels": "315/70 R22.5",
- "AxleWeightShare": 0.5,
- "TwinTyres": false,
- "RRCISO": 0.00555,
- "FzISO": 31300.0
- },
- {
- "Inertia": 14.9,
- "Wheels": "315/70 R22.5",
- "AxleWeightShare": 0.5,
- "TwinTyres": true,
- "RRCISO": 0.00628,
- "FzISO": 31300.0
- }
- ]
- }
- }
+ "Header": {
+ "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
+ "Date": "29.07.2014 16:59:03",
+ "AppVersion": "2.0.4-beta",
+ "FileVersion": 7
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "VehCat": "Tractor",
+ "CurbWeight": 7100.0,
+ "CurbWeightExtra": 0.0,
+ "Loading": 0.0,
+ "MassMax": 40.0,
+ "CdA": 6.2985,
+ "rdyn": 488.2675,
+ "Rim": "5° DC Rims",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "40t_Long_Haul_Truck.vcdv",
+ "Retarder": {
+ "Type": "Secondary",
+ "Ratio": 1.0,
+ "File": "Retarder.vrlm"
+ },
+ "AngularGear": {
+ "Type": "SeparateAngularGear",
+ "Ratio": 1.0,
+ "LossMap": "AngleGear.vtlm"
+ },
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.5,
+ "TwinTyres": false,
+ "RRCISO": 0.00555,
+ "FzISO": 31300.0
+ },
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.5,
+ "TwinTyres": true,
+ "RRCISO": 0.00628,
+ "FzISO": 31300.0
+ }
+ ]
+ }
+ }
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck_NoAng.vveh b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck_NoAng.vveh
new file mode 100644
index 0000000000..d4ba98040d
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck_NoAng.vveh
@@ -0,0 +1,47 @@
+{
+ "Header": {
+ "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
+ "Date": "29.07.2014 16:59:03",
+ "AppVersion": "2.0.4-beta",
+ "FileVersion": 7
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "VehCat": "Tractor",
+ "CurbWeight": 7100.0,
+ "CurbWeightExtra": 0.0,
+ "Loading": 0.0,
+ "MassMax": 40.0,
+ "CdA": 6.2985,
+ "rdyn": 488.2675,
+ "Rim": "5° DC Rims",
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "40t_Long_Haul_Truck.vcdv",
+ "Retarder": {
+ "Type": "Secondary",
+ "Ratio": 1.0,
+ "File": "Retarder.vrlm"
+ },
+ "AxleConfig": {
+ "Type": "4x2",
+ "Axles": [
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.5,
+ "TwinTyres": false,
+ "RRCISO": 0.00555,
+ "FzISO": 31300.0
+ },
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.5,
+ "TwinTyres": true,
+ "RRCISO": 0.00628,
+ "FzISO": 31300.0
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Jobs/24t CoachNoAng.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/24t CoachNoAng.vecto
new file mode 100644
index 0000000000..62aec6ffdd
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Jobs/24t CoachNoAng.vecto
@@ -0,0 +1,56 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "3/4/2015 2:09:13 PM",
+ "AppVersion": "2.0.4-beta3",
+ "FileVersion": 2
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehicleFile": "../Components/24t CoachNoAng.vveh",
+ "EngineFile": "../Components/24t Coach.veng",
+ "GearboxFile": "../Components/24t Coach.vgbx",
+ "Cycles": [
+ "../Cycles/Coach_24t_xshort.vdri"
+ ],
+ "Aux": [
+ {
+ "ID": "ALT1",
+ "Type": "Alternator",
+ "Path": "../Components/24t_Coach_ALT.vaux",
+ "Technology": ""
+ },
+ {
+ "ID": "ALT2",
+ "Type": "Alternator",
+ "Path": "../Components/24t_Coach_ALT.vaux",
+ "Technology": ""
+ },
+ {
+ "ID": "ALT3",
+ "Type": "Alternator",
+ "Path": "../Components/24t_Coach_ALT.vaux",
+ "Technology": ""
+ }
+ ],
+ "VACC": "../Components/Coach.vacc",
+ "EngineOnlyMode": false,
+ "StartStop": {
+ "Enabled": false,
+ "MaxSpeed": 5.0,
+ "MinTime": 0.0,
+ "Delay": 0
+ },
+ "LAC": {
+ "Enabled": true,
+ "Dec": -0.5,
+ "MinSpeed": 50.0
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "OverSpeed",
+ "MinSpeed": 70.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Jobs/24t Coach_Ang_Efficiency.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/24t Coach_Ang_Efficiency.vecto
new file mode 100644
index 0000000000..4d272fda4e
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Jobs/24t Coach_Ang_Efficiency.vecto
@@ -0,0 +1,56 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "3/4/2015 2:09:13 PM",
+ "AppVersion": "2.0.4-beta3",
+ "FileVersion": 2
+ },
+ "Body": {
+ "SavedInDeclMode": false,
+ "VehicleFile": "../Components/24t Coach_Ang_Efficiency.vveh",
+ "EngineFile": "../Components/24t Coach.veng",
+ "GearboxFile": "../Components/24t Coach.vgbx",
+ "Cycles": [
+ "../Cycles/Coach_24t_xshort.vdri"
+ ],
+ "Aux": [
+ {
+ "ID": "ALT1",
+ "Type": "Alternator",
+ "Path": "../Components/24t_Coach_ALT.vaux",
+ "Technology": ""
+ },
+ {
+ "ID": "ALT2",
+ "Type": "Alternator",
+ "Path": "../Components/24t_Coach_ALT.vaux",
+ "Technology": ""
+ },
+ {
+ "ID": "ALT3",
+ "Type": "Alternator",
+ "Path": "../Components/24t_Coach_ALT.vaux",
+ "Technology": ""
+ }
+ ],
+ "VACC": "../Components/Coach.vacc",
+ "EngineOnlyMode": false,
+ "StartStop": {
+ "Enabled": false,
+ "MaxSpeed": 5.0,
+ "MinTime": 0.0,
+ "Delay": 0
+ },
+ "LAC": {
+ "Enabled": true,
+ "Dec": -0.5,
+ "MinSpeed": 50.0
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "OverSpeed",
+ "MinSpeed": 70.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck with AngleEfficiency.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck with AngleEfficiency.vecto
new file mode 100644
index 0000000000..6aa6d25d77
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck with AngleEfficiency.vecto
@@ -0,0 +1,70 @@
+{
+ "Header": {
+ "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
+ "Date": "29.07.2014 16:59:08",
+ "AppVersion": "2.0.4-beta",
+ "FileVersion": 2
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "VehicleFile": "../Components/40t_Long_Haul_Truck AngleEfficiency.vveh",
+ "EngineFile": "../Components/40t_Long_Haul_Truck.veng",
+ "GearboxFile": "../Components/40t_Long_Haul_Truck.vgbx",
+ "Cycles": [
+ "Long Haul",
+ "Regional Delivery"
+ ],
+ "Aux": [
+ {
+ "ID": "FAN",
+ "Type": "Fan",
+ "Path": "<NOFILE>",
+ "Technology": "Hydraulic driven - Constant displacement pump"
+ },
+ {
+ "ID": "STP",
+ "Type": "Steering pump",
+ "Path": "<NOFILE>",
+ "Technology": "Variable displacement"
+ },
+ {
+ "ID": "AC",
+ "Type": "HVAC",
+ "Path": "<NOFILE>",
+ "Technology": "Default"
+ },
+ {
+ "ID": "ES",
+ "Type": "Electric System",
+ "Path": "<NOFILE>",
+ "Technology": "Custom Technology List",
+ "TechList": []
+ },
+ {
+ "ID": "PS",
+ "Type": "Pneumatic System",
+ "Path": "<NOFILE>",
+ "Technology": "Default"
+ }
+ ],
+ "VACC": "<NOFILE>",
+ "EngineOnlyMode": false,
+ "StartStop": {
+ "Enabled": false,
+ "MaxSpeed": 5.0,
+ "MinTime": 5.0,
+ "Delay": 5
+ },
+ "LAC": {
+ "Enabled": true,
+ "Dec": -0.5,
+ "MinSpeed": 50.0
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "OverSpeed",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck_NoAng.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck_NoAng.vecto
new file mode 100644
index 0000000000..8354c89f71
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck_NoAng.vecto
@@ -0,0 +1,70 @@
+{
+ "Header": {
+ "CreatedBy": "Raphael Luz IVT TU-Graz (85407225-fc3f-48a8-acda-c84a05df6837)",
+ "Date": "29.07.2014 16:59:08",
+ "AppVersion": "2.0.4-beta",
+ "FileVersion": 2
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "VehicleFile": "../Components/40t_Long_Haul_Truck_NoAng.vveh",
+ "EngineFile": "../Components/40t_Long_Haul_Truck.veng",
+ "GearboxFile": "../Components/40t_Long_Haul_Truck.vgbx",
+ "Cycles": [
+ "Long Haul",
+ "Regional Delivery"
+ ],
+ "Aux": [
+ {
+ "ID": "FAN",
+ "Type": "Fan",
+ "Path": "<NOFILE>",
+ "Technology": "Hydraulic driven - Constant displacement pump"
+ },
+ {
+ "ID": "STP",
+ "Type": "Steering pump",
+ "Path": "<NOFILE>",
+ "Technology": "Variable displacement"
+ },
+ {
+ "ID": "AC",
+ "Type": "HVAC",
+ "Path": "<NOFILE>",
+ "Technology": "Default"
+ },
+ {
+ "ID": "ES",
+ "Type": "Electric System",
+ "Path": "<NOFILE>",
+ "Technology": "Custom Technology List",
+ "TechList": []
+ },
+ {
+ "ID": "PS",
+ "Type": "Pneumatic System",
+ "Path": "<NOFILE>",
+ "Technology": "Default"
+ }
+ ],
+ "VACC": "<NOFILE>",
+ "EngineOnlyMode": false,
+ "StartStop": {
+ "Enabled": false,
+ "MaxSpeed": 5.0,
+ "MinTime": 5.0,
+ "Delay": 5
+ },
+ "LAC": {
+ "Enabled": true,
+ "Dec": -0.5,
+ "MinSpeed": 50.0
+ },
+ "OverSpeedEcoRoll": {
+ "Mode": "OverSpeed",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ }
+ }
+}
\ No newline at end of file
--
GitLab