From b192fd09344577d639f813f4f806a816e4e72a36 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Wed, 10 Aug 2016 17:17:05 +0200
Subject: [PATCH] updated job files in generic vehicle and test data
---
.../40t_Long_Haul_Truck.vecto | 2 +-
.../40t_Long_Haul_Truck.vecto | 37 ++++++++++-----
.../24t Coach/24t Coach.vecto | 24 ++++++----
.../TestData/Jobs/12t Delivery Truck.vecto | 45 ++++++++++++-------
.../TestData/Jobs/24t Coach Efficiency.vecto | 24 ++++++----
.../TestData/Jobs/24t Coach.vecto | 24 ++++++----
.../TestData/Jobs/24t CoachNoAng.vecto | 24 ++++++----
.../Jobs/24t Coach_Ang_Efficiency.vecto | 24 ++++++----
...Long_Haul_Truck with AngleEfficiency.vecto | 37 ++++++++++-----
..._Long_Haul_Truck with AxleEfficiency.vecto | 37 ++++++++++-----
..._Long_Haul_Truck with GearEfficiency.vecto | 37 ++++++++++-----
.../TestData/Jobs/40t_Long_Haul_Truck.vecto | 37 ++++++++++-----
.../Jobs/40t_Long_Haul_Truck_NoAng.vecto | 37 ++++++++++-----
.../Jobs/Class4_40t_Long_Haul_Truck.vecto | 40 ++++++++++++-----
.../TestData/Jobs/EngineOnlyJob.vecto | 18 +++++---
.../TestData/Jobs/job-report.vecto | 44 ++++++++++++------
16 files changed, 338 insertions(+), 153 deletions(-)
diff --git a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vecto b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vecto
index e92ca1dcf1..8f3b412102 100644
--- a/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vecto
+++ b/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vecto
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "Michael Krisper, IVT, Graz University of Technology",
- "Date": "2016-08-10T14:14:07.6435917Z",
+ "Date": "2016-08-10T15:11:16.3665917Z",
"AppVersion": "2.2",
"FileVersion": 3
},
diff --git a/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vecto b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vecto
index 0316339b1e..3403a133c7 100644
--- a/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Declaration Mode/40t Long Haul Truck/40t_Long_Haul_Truck.vecto
@@ -1,9 +1,9 @@
{
"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
+ "CreatedBy": "Michael Krisper, IVT, Graz University of Technology",
+ "Date": "2016-08-10T15:12:03.1835917Z",
+ "AppVersion": "2.2",
+ "FileVersion": 3
},
"Body": {
"SavedInDeclMode": true,
@@ -14,37 +14,47 @@
"Long Haul",
"Regional Delivery"
],
+ "AuxiliaryAssembly": "CLASSIC",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
"Aux": [
{
"ID": "FAN",
"Type": "Fan",
"Path": "<NOFILE>",
- "Technology": "Hydraulic driven - Constant displacement pump"
+ "Technology": [
+ "Hydraulic driven - Constant displacement pump"
+ ]
},
{
"ID": "STP",
"Type": "Steering pump",
"Path": "<NOFILE>",
- "Technology": "Variable displacement"
+ "Technology": [
+ "Fixed displacement"
+ ]
},
{
"ID": "AC",
"Type": "HVAC",
"Path": "<NOFILE>",
- "Technology": "Default"
+ "Technology": []
},
{
"ID": "ES",
"Type": "Electric System",
"Path": "<NOFILE>",
- "Technology": "Custom Technology List",
- "TechList": []
+ "Technology": [
+ "Standard technology"
+ ]
},
{
"ID": "PS",
"Type": "Pneumatic System",
"Path": "<NOFILE>",
- "Technology": "Default"
+ "Technology": [
+ "Medium Supply 1-stage"
+ ]
}
],
"VACC": "<NOFILE>",
@@ -58,7 +68,12 @@
"LAC": {
"Enabled": true,
"Dec": -0.5,
- "MinSpeed": 50.0
+ "MinSpeed": 50.0,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
},
"OverSpeedEcoRoll": {
"Mode": "OverSpeed",
diff --git a/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vecto b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vecto
index d67b41a8d3..8a83d90310 100644
--- a/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Generic Vehicles/Engineering Mode/24t Coach/24t Coach.vecto
@@ -1,9 +1,9 @@
{
"Header": {
- "CreatedBy": " ()",
- "Date": "3/4/2015 2:09:13 PM",
- "AppVersion": "2.0.4-beta3",
- "FileVersion": 2
+ "CreatedBy": "Michael Krisper, IVT, Graz University of Technology",
+ "Date": "2016-08-10T15:12:16.5045917Z",
+ "AppVersion": "2.2",
+ "FileVersion": 3
},
"Body": {
"SavedInDeclMode": false,
@@ -13,24 +13,27 @@
"Cycles": [
"Coach.vdri"
],
+ "AuxiliaryAssembly": "CLASSIC",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
"Aux": [
{
"ID": "ALT1",
"Type": "Alternator",
"Path": "24t_Coach_ALT.vaux",
- "Technology": ""
+ "Technology": []
},
{
"ID": "ALT2",
"Type": "Alternator",
"Path": "24t_Coach_ALT.vaux",
- "Technology": ""
+ "Technology": []
},
{
"ID": "ALT3",
"Type": "Alternator",
"Path": "24t_Coach_ALT.vaux",
- "Technology": ""
+ "Technology": []
}
],
"VACC": "Coach.vacc",
@@ -44,7 +47,12 @@
"LAC": {
"Enabled": true,
"Dec": -0.5,
- "MinSpeed": 50.0
+ "MinSpeed": 50.0,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
},
"OverSpeedEcoRoll": {
"Mode": "OverSpeed",
diff --git a/VectoCore/VectoCoreTest/TestData/Jobs/12t Delivery Truck.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/12t Delivery Truck.vecto
index d9a0f98fd6..6d7a402edb 100644
--- a/VectoCore/VectoCoreTest/TestData/Jobs/12t Delivery Truck.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Jobs/12t Delivery Truck.vecto
@@ -1,9 +1,9 @@
{
"Header": {
- "CreatedBy": " ()",
- "Date": "3/4/2015 12:31:06 PM",
- "AppVersion": "2.0.4-beta3",
- "FileVersion": 2
+ "CreatedBy": "Michael Krisper, IVT, Graz University of Technology",
+ "Date": "2016-08-10T15:06:30.9725917Z",
+ "AppVersion": "2.2",
+ "FileVersion": 3
},
"Body": {
"SavedInDeclMode": true,
@@ -11,45 +11,55 @@
"EngineFile": "../Components/12t Delivery Truck.veng",
"GearboxFile": "../Components/12t Delivery Truck.vgbx",
"Cycles": [
- "LongHaul",
- "RegionalDelivery",
- "UrbanDelivery"
+ "Long Haul",
+ "Regional Delivery",
+ "Urban Delivery"
],
+ "AuxiliaryAssembly": "CLASSIC",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
"Aux": [
{
"ID": "FAN",
"Type": "Fan",
"Path": "<NOFILE>",
- "Technology": "Belt driven or driven via transm. - Discrete step clutch"
+ "Technology": [
+ "Belt driven or driven via transm. - Discrete step clutch"
+ ]
},
{
"ID": "STP",
"Type": "Steering pump",
"Path": "<NOFILE>",
- "Technology": "Variable displacement"
+ "Technology": [
+ "Variable displacement mech. controlled"
+ ]
},
{
"ID": "AC",
"Type": "HVAC",
"Path": "<NOFILE>",
- "Technology": "Default"
+ "Technology": []
},
{
"ID": "ES",
"Type": "Electric System",
"Path": "<NOFILE>",
- "Technology": "Custom Technology List",
- "TechList": []
+ "Technology": [
+ "Standard technology"
+ ]
},
{
"ID": "PS",
"Type": "Pneumatic System",
"Path": "<NOFILE>",
- "Technology": "Default"
+ "Technology": [
+ "Medium Supply 1-stage"
+ ]
}
],
"VACC": "<NOFILE>",
- "EngineOnlyMode": true,
+ "EngineOnlyMode": false,
"StartStop": {
"Enabled": false,
"MaxSpeed": 5.0,
@@ -59,7 +69,12 @@
"LAC": {
"Enabled": true,
"Dec": -0.5,
- "MinSpeed": 50.0
+ "MinSpeed": 50.0,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
},
"OverSpeedEcoRoll": {
"Mode": "OverSpeed",
diff --git a/VectoCore/VectoCoreTest/TestData/Jobs/24t Coach Efficiency.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/24t Coach Efficiency.vecto
index e111796812..59225e3f5e 100644
--- a/VectoCore/VectoCoreTest/TestData/Jobs/24t Coach Efficiency.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Jobs/24t Coach Efficiency.vecto
@@ -1,9 +1,9 @@
{
"Header": {
- "CreatedBy": " ()",
- "Date": "3/4/2015 2:09:13 PM",
- "AppVersion": "2.0.4-beta3",
- "FileVersion": 2
+ "CreatedBy": "Michael Krisper, IVT, Graz University of Technology",
+ "Date": "2016-08-10T15:06:40.2795917Z",
+ "AppVersion": "2.2",
+ "FileVersion": 3
},
"Body": {
"SavedInDeclMode": false,
@@ -13,24 +13,27 @@
"Cycles": [
"../Cycles/Coach_24t_xshort.vdri"
],
+ "AuxiliaryAssembly": "CLASSIC",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
"Aux": [
{
"ID": "ALT1",
"Type": "Alternator",
"Path": "../Components/24t_Coach_ALT.vaux",
- "Technology": ""
+ "Technology": []
},
{
"ID": "ALT2",
"Type": "Alternator",
"Path": "../Components/24t_Coach_ALT.vaux",
- "Technology": ""
+ "Technology": []
},
{
"ID": "ALT3",
"Type": "Alternator",
"Path": "../Components/24t_Coach_ALT.vaux",
- "Technology": ""
+ "Technology": []
}
],
"VACC": "../Components/Coach.vacc",
@@ -44,7 +47,12 @@
"LAC": {
"Enabled": true,
"Dec": -0.5,
- "MinSpeed": 50.0
+ "MinSpeed": 50.0,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
},
"OverSpeedEcoRoll": {
"Mode": "OverSpeed",
diff --git a/VectoCore/VectoCoreTest/TestData/Jobs/24t Coach.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/24t Coach.vecto
index 89fb603a87..e054aa8477 100644
--- a/VectoCore/VectoCoreTest/TestData/Jobs/24t Coach.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Jobs/24t Coach.vecto
@@ -1,9 +1,9 @@
{
"Header": {
- "CreatedBy": " ()",
- "Date": "3/4/2015 2:09:13 PM",
- "AppVersion": "2.0.4-beta3",
- "FileVersion": 2
+ "CreatedBy": "Michael Krisper, IVT, Graz University of Technology",
+ "Date": "2016-08-10T15:04:16.0605917Z",
+ "AppVersion": "2.2",
+ "FileVersion": 3
},
"Body": {
"SavedInDeclMode": false,
@@ -13,24 +13,27 @@
"Cycles": [
"../Cycles/Coach_24t_xshort.vdri"
],
+ "AuxiliaryAssembly": "CLASSIC",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
"Aux": [
{
"ID": "ALT1",
"Type": "Alternator",
"Path": "../Components/24t_Coach_ALT.vaux",
- "Technology": ""
+ "Technology": []
},
{
"ID": "ALT2",
"Type": "Alternator",
"Path": "../Components/24t_Coach_ALT.vaux",
- "Technology": ""
+ "Technology": []
},
{
"ID": "ALT3",
"Type": "Alternator",
"Path": "../Components/24t_Coach_ALT.vaux",
- "Technology": ""
+ "Technology": []
}
],
"VACC": "../Components/Coach.vacc",
@@ -44,7 +47,12 @@
"LAC": {
"Enabled": true,
"Dec": -0.5,
- "MinSpeed": 50.0
+ "MinSpeed": 50.0,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
},
"OverSpeedEcoRoll": {
"Mode": "OverSpeed",
diff --git a/VectoCore/VectoCoreTest/TestData/Jobs/24t CoachNoAng.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/24t CoachNoAng.vecto
index 62aec6ffdd..c782c02039 100644
--- a/VectoCore/VectoCoreTest/TestData/Jobs/24t CoachNoAng.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Jobs/24t CoachNoAng.vecto
@@ -1,9 +1,9 @@
{
"Header": {
- "CreatedBy": " ()",
- "Date": "3/4/2015 2:09:13 PM",
- "AppVersion": "2.0.4-beta3",
- "FileVersion": 2
+ "CreatedBy": "Michael Krisper, IVT, Graz University of Technology",
+ "Date": "2016-08-10T15:04:18.1755917Z",
+ "AppVersion": "2.2",
+ "FileVersion": 3
},
"Body": {
"SavedInDeclMode": false,
@@ -13,24 +13,27 @@
"Cycles": [
"../Cycles/Coach_24t_xshort.vdri"
],
+ "AuxiliaryAssembly": "CLASSIC",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
"Aux": [
{
"ID": "ALT1",
"Type": "Alternator",
"Path": "../Components/24t_Coach_ALT.vaux",
- "Technology": ""
+ "Technology": []
},
{
"ID": "ALT2",
"Type": "Alternator",
"Path": "../Components/24t_Coach_ALT.vaux",
- "Technology": ""
+ "Technology": []
},
{
"ID": "ALT3",
"Type": "Alternator",
"Path": "../Components/24t_Coach_ALT.vaux",
- "Technology": ""
+ "Technology": []
}
],
"VACC": "../Components/Coach.vacc",
@@ -44,7 +47,12 @@
"LAC": {
"Enabled": true,
"Dec": -0.5,
- "MinSpeed": 50.0
+ "MinSpeed": 50.0,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
},
"OverSpeedEcoRoll": {
"Mode": "OverSpeed",
diff --git a/VectoCore/VectoCoreTest/TestData/Jobs/24t Coach_Ang_Efficiency.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/24t Coach_Ang_Efficiency.vecto
index 4d272fda4e..f79ecec0b4 100644
--- a/VectoCore/VectoCoreTest/TestData/Jobs/24t Coach_Ang_Efficiency.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Jobs/24t Coach_Ang_Efficiency.vecto
@@ -1,9 +1,9 @@
{
"Header": {
- "CreatedBy": " ()",
- "Date": "3/4/2015 2:09:13 PM",
- "AppVersion": "2.0.4-beta3",
- "FileVersion": 2
+ "CreatedBy": "Michael Krisper, IVT, Graz University of Technology",
+ "Date": "2016-08-10T15:04:20.2155917Z",
+ "AppVersion": "2.2",
+ "FileVersion": 3
},
"Body": {
"SavedInDeclMode": false,
@@ -13,24 +13,27 @@
"Cycles": [
"../Cycles/Coach_24t_xshort.vdri"
],
+ "AuxiliaryAssembly": "CLASSIC",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
"Aux": [
{
"ID": "ALT1",
"Type": "Alternator",
"Path": "../Components/24t_Coach_ALT.vaux",
- "Technology": ""
+ "Technology": []
},
{
"ID": "ALT2",
"Type": "Alternator",
"Path": "../Components/24t_Coach_ALT.vaux",
- "Technology": ""
+ "Technology": []
},
{
"ID": "ALT3",
"Type": "Alternator",
"Path": "../Components/24t_Coach_ALT.vaux",
- "Technology": ""
+ "Technology": []
}
],
"VACC": "../Components/Coach.vacc",
@@ -44,7 +47,12 @@
"LAC": {
"Enabled": true,
"Dec": -0.5,
- "MinSpeed": 50.0
+ "MinSpeed": 50.0,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
},
"OverSpeedEcoRoll": {
"Mode": "OverSpeed",
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
index 6aa6d25d77..1023f12516 100644
--- a/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck with AngleEfficiency.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck with AngleEfficiency.vecto
@@ -1,9 +1,9 @@
{
"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
+ "CreatedBy": "Michael Krisper, IVT, Graz University of Technology",
+ "Date": "2016-08-10T15:04:37.7205917Z",
+ "AppVersion": "2.2",
+ "FileVersion": 3
},
"Body": {
"SavedInDeclMode": true,
@@ -14,37 +14,47 @@
"Long Haul",
"Regional Delivery"
],
+ "AuxiliaryAssembly": "CLASSIC",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
"Aux": [
{
"ID": "FAN",
"Type": "Fan",
"Path": "<NOFILE>",
- "Technology": "Hydraulic driven - Constant displacement pump"
+ "Technology": [
+ "Hydraulic driven - Constant displacement pump"
+ ]
},
{
"ID": "STP",
"Type": "Steering pump",
"Path": "<NOFILE>",
- "Technology": "Variable displacement"
+ "Technology": [
+ "Fixed displacement"
+ ]
},
{
"ID": "AC",
"Type": "HVAC",
"Path": "<NOFILE>",
- "Technology": "Default"
+ "Technology": []
},
{
"ID": "ES",
"Type": "Electric System",
"Path": "<NOFILE>",
- "Technology": "Custom Technology List",
- "TechList": []
+ "Technology": [
+ "Standard technology"
+ ]
},
{
"ID": "PS",
"Type": "Pneumatic System",
"Path": "<NOFILE>",
- "Technology": "Default"
+ "Technology": [
+ "Medium Supply 1-stage"
+ ]
}
],
"VACC": "<NOFILE>",
@@ -58,7 +68,12 @@
"LAC": {
"Enabled": true,
"Dec": -0.5,
- "MinSpeed": 50.0
+ "MinSpeed": 50.0,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
},
"OverSpeedEcoRoll": {
"Mode": "OverSpeed",
diff --git a/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck with AxleEfficiency.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck with AxleEfficiency.vecto
index a876baae3d..03a57f8b9b 100644
--- a/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck with AxleEfficiency.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck with AxleEfficiency.vecto
@@ -1,9 +1,9 @@
{
"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
+ "CreatedBy": "Michael Krisper, IVT, Graz University of Technology",
+ "Date": "2016-08-10T15:04:50.8645917Z",
+ "AppVersion": "2.2",
+ "FileVersion": 3
},
"Body": {
"SavedInDeclMode": true,
@@ -14,37 +14,47 @@
"Long Haul",
"Regional Delivery"
],
+ "AuxiliaryAssembly": "CLASSIC",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
"Aux": [
{
"ID": "FAN",
"Type": "Fan",
"Path": "<NOFILE>",
- "Technology": "Hydraulic driven - Constant displacement pump"
+ "Technology": [
+ "Hydraulic driven - Constant displacement pump"
+ ]
},
{
"ID": "STP",
"Type": "Steering pump",
"Path": "<NOFILE>",
- "Technology": "Variable displacement"
+ "Technology": [
+ "Variable displacement mech. controlled"
+ ]
},
{
"ID": "AC",
"Type": "HVAC",
"Path": "<NOFILE>",
- "Technology": "Default"
+ "Technology": []
},
{
"ID": "ES",
"Type": "Electric System",
"Path": "<NOFILE>",
- "Technology": "Custom Technology List",
- "TechList": []
+ "Technology": [
+ "Standard technology"
+ ]
},
{
"ID": "PS",
"Type": "Pneumatic System",
"Path": "<NOFILE>",
- "Technology": "Default"
+ "Technology": [
+ "Medium Supply 1-stage"
+ ]
}
],
"VACC": "<NOFILE>",
@@ -58,7 +68,12 @@
"LAC": {
"Enabled": true,
"Dec": -0.5,
- "MinSpeed": 50.0
+ "MinSpeed": 50.0,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
},
"OverSpeedEcoRoll": {
"Mode": "OverSpeed",
diff --git a/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck with GearEfficiency.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck with GearEfficiency.vecto
index 2beb8d1c3b..26097e60f9 100644
--- a/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck with GearEfficiency.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck with GearEfficiency.vecto
@@ -1,9 +1,9 @@
{
"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
+ "CreatedBy": "Michael Krisper, IVT, Graz University of Technology",
+ "Date": "2016-08-10T15:05:00.1525917Z",
+ "AppVersion": "2.2",
+ "FileVersion": 3
},
"Body": {
"SavedInDeclMode": true,
@@ -14,37 +14,47 @@
"Long Haul",
"Regional Delivery"
],
+ "AuxiliaryAssembly": "CLASSIC",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
"Aux": [
{
"ID": "FAN",
"Type": "Fan",
"Path": "<NOFILE>",
- "Technology": "Hydraulic driven - Constant displacement pump"
+ "Technology": [
+ "Hydraulic driven - Constant displacement pump"
+ ]
},
{
"ID": "STP",
"Type": "Steering pump",
"Path": "<NOFILE>",
- "Technology": "Variable displacement"
+ "Technology": [
+ "Variable displacement mech. controlled"
+ ]
},
{
"ID": "AC",
"Type": "HVAC",
"Path": "<NOFILE>",
- "Technology": "Default"
+ "Technology": []
},
{
"ID": "ES",
"Type": "Electric System",
"Path": "<NOFILE>",
- "Technology": "Custom Technology List",
- "TechList": []
+ "Technology": [
+ "Standard technology"
+ ]
},
{
"ID": "PS",
"Type": "Pneumatic System",
"Path": "<NOFILE>",
- "Technology": "Default"
+ "Technology": [
+ "Medium Supply 1-stage"
+ ]
}
],
"VACC": "<NOFILE>",
@@ -58,7 +68,12 @@
"LAC": {
"Enabled": true,
"Dec": -0.5,
- "MinSpeed": 50.0
+ "MinSpeed": 50.0,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
},
"OverSpeedEcoRoll": {
"Mode": "OverSpeed",
diff --git a/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck.vecto
index 5a54b3b87e..d1471166cf 100644
--- a/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck.vecto
@@ -1,9 +1,9 @@
{
"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
+ "CreatedBy": "Michael Krisper, IVT, Graz University of Technology",
+ "Date": "2016-08-10T15:05:10.9915917Z",
+ "AppVersion": "2.2",
+ "FileVersion": 3
},
"Body": {
"SavedInDeclMode": true,
@@ -14,37 +14,47 @@
"Long Haul",
"Regional Delivery"
],
+ "AuxiliaryAssembly": "CLASSIC",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
"Aux": [
{
"ID": "FAN",
"Type": "Fan",
"Path": "<NOFILE>",
- "Technology": "Hydraulic driven - Constant displacement pump"
+ "Technology": [
+ "Hydraulic driven - Constant displacement pump"
+ ]
},
{
"ID": "STP",
"Type": "Steering pump",
"Path": "<NOFILE>",
- "Technology": "Variable displacement"
+ "Technology": [
+ "Fixed displacement"
+ ]
},
{
"ID": "AC",
"Type": "HVAC",
"Path": "<NOFILE>",
- "Technology": "Default"
+ "Technology": []
},
{
"ID": "ES",
"Type": "Electric System",
"Path": "<NOFILE>",
- "Technology": "Custom Technology List",
- "TechList": []
+ "Technology": [
+ "Standard technology"
+ ]
},
{
"ID": "PS",
"Type": "Pneumatic System",
"Path": "<NOFILE>",
- "Technology": "Default"
+ "Technology": [
+ "Medium Supply 1-stage"
+ ]
}
],
"VACC": "<NOFILE>",
@@ -58,7 +68,12 @@
"LAC": {
"Enabled": true,
"Dec": -0.5,
- "MinSpeed": 50.0
+ "MinSpeed": 50.0,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
},
"OverSpeedEcoRoll": {
"Mode": "OverSpeed",
diff --git a/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck_NoAng.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck_NoAng.vecto
index 8354c89f71..3030fe5d1c 100644
--- a/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck_NoAng.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Jobs/40t_Long_Haul_Truck_NoAng.vecto
@@ -1,9 +1,9 @@
{
"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
+ "CreatedBy": "Michael Krisper, IVT, Graz University of Technology",
+ "Date": "2016-08-10T15:05:27.0005917Z",
+ "AppVersion": "2.2",
+ "FileVersion": 3
},
"Body": {
"SavedInDeclMode": true,
@@ -14,37 +14,47 @@
"Long Haul",
"Regional Delivery"
],
+ "AuxiliaryAssembly": "CLASSIC",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
"Aux": [
{
"ID": "FAN",
"Type": "Fan",
"Path": "<NOFILE>",
- "Technology": "Hydraulic driven - Constant displacement pump"
+ "Technology": [
+ "Hydraulic driven - Constant displacement pump"
+ ]
},
{
"ID": "STP",
"Type": "Steering pump",
"Path": "<NOFILE>",
- "Technology": "Variable displacement"
+ "Technology": [
+ "Variable displacement mech. controlled"
+ ]
},
{
"ID": "AC",
"Type": "HVAC",
"Path": "<NOFILE>",
- "Technology": "Default"
+ "Technology": []
},
{
"ID": "ES",
"Type": "Electric System",
"Path": "<NOFILE>",
- "Technology": "Custom Technology List",
- "TechList": []
+ "Technology": [
+ "Standard technology"
+ ]
},
{
"ID": "PS",
"Type": "Pneumatic System",
"Path": "<NOFILE>",
- "Technology": "Default"
+ "Technology": [
+ "Medium Supply 1-stage"
+ ]
}
],
"VACC": "<NOFILE>",
@@ -58,7 +68,12 @@
"LAC": {
"Enabled": true,
"Dec": -0.5,
- "MinSpeed": 50.0
+ "MinSpeed": 50.0,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
},
"OverSpeedEcoRoll": {
"Mode": "OverSpeed",
diff --git a/VectoCore/VectoCoreTest/TestData/Jobs/Class4_40t_Long_Haul_Truck.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/Class4_40t_Long_Haul_Truck.vecto
index 323213d04d..da6d51a445 100644
--- a/VectoCore/VectoCoreTest/TestData/Jobs/Class4_40t_Long_Haul_Truck.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Jobs/Class4_40t_Long_Haul_Truck.vecto
@@ -1,9 +1,9 @@
{
"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
+ "CreatedBy": "Michael Krisper, IVT, Graz University of Technology",
+ "Date": "2016-08-10T15:07:46.8475917Z",
+ "AppVersion": "2.2",
+ "FileVersion": 3
},
"Body": {
"SavedInDeclMode": true,
@@ -12,39 +12,50 @@
"GearboxFile": "../Components/40t_Long_Haul_Truck.vgbx",
"Cycles": [
"Long Haul",
- "Regional Delivery"
+ "Regional Delivery",
+ "Municipal Utility"
],
+ "AuxiliaryAssembly": "CLASSIC",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
"Aux": [
{
"ID": "FAN",
"Type": "Fan",
"Path": "<NOFILE>",
- "Technology": "Hydraulic driven - Constant displacement pump"
+ "Technology": [
+ "Hydraulic driven - Constant displacement pump"
+ ]
},
{
"ID": "STP",
"Type": "Steering pump",
"Path": "<NOFILE>",
- "Technology": "Variable displacement"
+ "Technology": [
+ "Variable displacement mech. controlled"
+ ]
},
{
"ID": "AC",
"Type": "HVAC",
"Path": "<NOFILE>",
- "Technology": "Default"
+ "Technology": []
},
{
"ID": "ES",
"Type": "Electric System",
"Path": "<NOFILE>",
- "Technology": "Custom Technology List",
- "TechList": []
+ "Technology": [
+ "Standard technology"
+ ]
},
{
"ID": "PS",
"Type": "Pneumatic System",
"Path": "<NOFILE>",
- "Technology": "Default"
+ "Technology": [
+ "Medium Supply 1-stage"
+ ]
}
],
"VACC": "<NOFILE>",
@@ -58,7 +69,12 @@
"LAC": {
"Enabled": true,
"Dec": -0.5,
- "MinSpeed": 50.0
+ "MinSpeed": 50.0,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
},
"OverSpeedEcoRoll": {
"Mode": "OverSpeed",
diff --git a/VectoCore/VectoCoreTest/TestData/Jobs/EngineOnlyJob.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/EngineOnlyJob.vecto
index e94f494932..f5f85574ca 100644
--- a/VectoCore/VectoCoreTest/TestData/Jobs/EngineOnlyJob.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Jobs/EngineOnlyJob.vecto
@@ -1,9 +1,9 @@
{
"Header": {
- "CreatedBy": " ()",
- "Date": "7/3/2015 11:09:04 AM",
- "AppVersion": "2.0.4-beta3",
- "FileVersion": 2
+ "CreatedBy": "Michael Krisper, IVT, Graz University of Technology",
+ "Date": "2016-08-10T15:05:37.0945917Z",
+ "AppVersion": "2.2",
+ "FileVersion": 3
},
"Body": {
"SavedInDeclMode": false,
@@ -13,6 +13,9 @@
"Cycles": [
"../Cycles/Coach Engine Only short.vdri"
],
+ "AuxiliaryAssembly": "CLASSIC",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
"VACC": "<NOFILE>",
"EngineOnlyMode": true,
"StartStop": {
@@ -24,7 +27,12 @@
"LAC": {
"Enabled": true,
"Dec": -0.5,
- "MinSpeed": 50.0
+ "MinSpeed": 50.0,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
},
"OverSpeedEcoRoll": {
"Mode": "Off",
diff --git a/VectoCore/VectoCoreTest/TestData/Jobs/job-report.vecto b/VectoCore/VectoCoreTest/TestData/Jobs/job-report.vecto
index 1a7f49b08a..c7938bc502 100644
--- a/VectoCore/VectoCoreTest/TestData/Jobs/job-report.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Jobs/job-report.vecto
@@ -1,50 +1,61 @@
{
"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
+ "CreatedBy": "Michael Krisper, IVT, Graz University of Technology",
+ "Date": "2016-08-10T15:05:48.7605917Z",
+ "AppVersion": "2.2",
+ "FileVersion": 3
},
"Body": {
"SavedInDeclMode": true,
"VehicleFile": "../Components/12t Delivery Truck.vveh",
"EngineFile": "../Components/12t Delivery Truck.veng",
- "GearboxFile": "../Components/12t Delivery Truck.vgbx",
- "Cycles": [
+ "GearboxFile": "../Components/12t Delivery Truck.vgbx",
+ "Cycles": [
"Long Haul",
- "Regional Delivery"
+ "Regional Delivery",
+ "Urban Delivery"
],
+ "AuxiliaryAssembly": "CLASSIC",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
"Aux": [
{
"ID": "FAN",
"Type": "Fan",
"Path": "<NOFILE>",
- "Technology": "Hydraulic driven - Constant displacement pump"
+ "Technology": [
+ "Hydraulic driven - Constant displacement pump"
+ ]
},
{
"ID": "STP",
"Type": "Steering pump",
"Path": "<NOFILE>",
- "Technology": "Variable displacement"
+ "Technology": [
+ "Variable displacement mech. controlled"
+ ]
},
{
"ID": "AC",
"Type": "HVAC",
"Path": "<NOFILE>",
- "Technology": "Default"
+ "Technology": []
},
{
"ID": "ES",
"Type": "Electric System",
"Path": "<NOFILE>",
- "Technology": "Custom Technology List",
- "TechList": []
+ "Technology": [
+ "Standard technology"
+ ]
},
{
"ID": "PS",
"Type": "Pneumatic System",
"Path": "<NOFILE>",
- "Technology": "Default"
+ "Technology": [
+ "Medium Supply 1-stage"
+ ]
}
],
"VACC": "<NOFILE>",
@@ -58,7 +69,12 @@
"LAC": {
"Enabled": true,
"Dec": -0.5,
- "MinSpeed": 50.0
+ "MinSpeed": 50.0,
+ "PreviewDistanceFactor": 10.0,
+ "DF_offset": 2.5,
+ "DF_scaling": 1.5,
+ "DF_targetSpeedLookup": "",
+ "Df_velocityDropLookup": ""
},
"OverSpeedEcoRoll": {
"Mode": "OverSpeed",
--
GitLab