diff --git a/.gitignore b/.gitignore
index 3be324427c6e5a9c2cb683018163a30a0442bd6a..76c46bc44dfd264fcc5767a35f0aaa33be70fbe3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -195,3 +195,5 @@ Generic Vehicles/**/*.vsum
Generic Vehicles/**/*.pdf
VectoCore/VectoCoreTest/TestData/XML/XSD/
VectoCommon/VectoHashingTest/Testdata/XML/XSD/
+VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/**.vmod
+VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/**.vsum
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/324kW.vfld b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/324kW.vfld
new file mode 100644
index 0000000000000000000000000000000000000000..d305e26d47414e8d519363447a258f5106b038c6
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/324kW.vfld
@@ -0,0 +1,11 @@
+engine speed [1/min],full load torque [Nm],motoring torque [Nm],PT1 [s]
+600,1258,-150,0.24
+800,1758,-155,0.47
+1000,2140,-165,0.58
+1200,2146,-179,0.53
+1400,2109,-203,0.46
+1600,1903,-235,0.349999999
+1800,1719,-264,0.2
+2000,1259,-301,0.11
+2100,1079,-320,0.11
+2200,0,-339,0.11
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/350kW.vmap b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/350kW.vmap
new file mode 100644
index 0000000000000000000000000000000000000000..4ae21e4b8e35fadfbc04b5a17e06365cb6128c4f
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/350kW.vmap
@@ -0,0 +1,107 @@
+engine speed [rpm],torque [Nm],fuel consumption [g/h]
+600,-150,0
+600,0,1459
+600,200,3358
+600,400,5498
+600,600,8101
+600,800,10014
+600,1000,12071
+600,1200,14400
+600,1282,15350
+800,-155,0
+800,0,1879
+800,200,4286
+800,400,7350
+800,600,10059
+800,800,13086
+800,1000,16015
+800,1200,19239
+800,1400,22426
+800,1600,25600
+800,1791,28905
+1000,-165,0
+1000,0,2865
+1000,200,5963
+1000,400,9198
+1000,600,12354
+1000,800,15965
+1000,1000,19864
+1000,1200,23530
+1000,1400,27202
+1000,1600,31165
+1000,1800,35103
+1000,2000,39360
+1000,2200,44120
+1000,2300,46836
+1200,-179,0
+1200,0,3307
+1200,200,6897
+1200,400,10651
+1200,600,14645
+1200,800,19115
+1200,1000,23677
+1200,1200,28180
+1200,1400,32431
+1200,1600,37000
+1200,1800,41691
+1200,2000,46915
+1200,2200,51783
+1200,2300,54932
+1400,-203,0
+1400,0,4306
+1400,200,8143
+1400,400,12723
+1400,600,17523
+1400,800,22288
+1400,1000,27093
+1400,1200,32536
+1400,1400,37746
+1400,1600,43194
+1400,1800,49453
+1400,2000,55750
+1400,2200,61072
+1400,2300,64377
+1600,-235,0
+1600,0,5209
+1600,200,9669
+1600,400,14838
+1600,600,20127
+1600,800,25894
+1600,1000,31631
+1600,1200,37248
+1600,1400,43450
+1600,1600,49752
+1600,1800,57020
+1600,2000,63914
+1600,2079,66520
+1800,-264,0
+1800,0,6409
+1800,200,11777
+1800,400,17320
+1800,600,23394
+1800,800,30501
+1800,1000,36378
+1800,1200,43079
+1800,1400,50250
+1800,1600,57436
+1800,1800,65157
+1800,1857,67574
+2000,-301,0
+2000,0,9127
+2000,200,14822
+2000,400,20655
+2000,600,27076
+2000,800,34188
+2000,1000,42837
+2000,1200,51018
+2000,1352,56618
+2100,-320,0
+2100,0,10470
+2100,200,16332
+2100,400,22396
+2100,600,28914
+2100,800,35717
+2100,1000,45643
+2100,1100,50653
+2200,-339,0
+2200,0,13444.59908
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/AMT_12.vgbx b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/AMT_12.vgbx
new file mode 100644
index 0000000000000000000000000000000000000000..9b717385f7785d878458cf77a0a1ca325643402c
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/AMT_12.vgbx
@@ -0,0 +1,117 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2017-05-19T08:19:13.4575457Z",
+ "AppVersion": "3",
+ "FileVersion": 6
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "ModelName": "tractor_12gear_example",
+ "Inertia": 0.0,
+ "TracInt": 1.0,
+ "Gears": [
+ {
+ "Ratio": 2.64,
+ "LossMap": "Axle_4x2.vtlm"
+ },
+ {
+ "Ratio": 14.93,
+ "LossMap": "Gear_1.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 11.64,
+ "LossMap": "Gear_2.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 9.02,
+ "LossMap": "Gear_3.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 7.04,
+ "LossMap": "Gear_4.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 5.64,
+ "LossMap": "Gear_5.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 4.4,
+ "LossMap": "Gear_6.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 3.39,
+ "LossMap": "Gear_7.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 2.65,
+ "LossMap": "Gear_8.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 2.05,
+ "LossMap": "Gear_9.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 1.6,
+ "LossMap": "Gear_10.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 1.28,
+ "LossMap": "Gear_11.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 1.0,
+ "LossMap": "Gear_12.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ }
+ ],
+ "TqReserve": 20.0,
+ "ShiftTime": 1.5,
+ "StartTqReserve": 20.0,
+ "StartSpeed": 1.3,
+ "StartAcc": 0.6,
+ "GearboxType": "AMT",
+ "TorqueConverter": {
+ "Enabled": false
+ },
+ "DownshiftAfterUpshiftDelay": 10.0,
+ "UpshiftAfterDownshiftDelay": 10.0,
+ "UpshiftMinAcceleration": 0.1,
+ "PowershiftShiftTime": 0.8
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Axle_4x2.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Axle_4x2.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..e11cbf7cdde175e06ab8f6a0b79d46b84b3e0c1a
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Axle_4x2.vtlm
@@ -0,0 +1,317 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5478,220
+0,-176,28
+0,0,8
+0,116,14
+0,220,17
+0,326,21
+0,432,24
+0,641,31
+0,853,38
+0,1274,53
+0,1696,67
+0,2117,82
+0,2538,96
+0,2959,110
+0,3376,119
+0,3785,123
+0,4200,130
+0,6309,204
+0,8409,268
+0,10507,332
+0,12606,396
+0,16804,523
+0,21002,651
+0,25199,778
+0,29397,905
+0,33594,1032
+0,37792,1160
+0,41990,1288
+0,46187,1415
+0,50385,1542
+143,-5482,216
+143,-174,28
+143,0,9
+143,116,14
+143,222,17
+143,326,21
+143,432,24
+143,641,31
+143,853,38
+143,1273,52
+143,1694,66
+143,2115,80
+143,2536,94
+143,2957,108
+143,3372,116
+143,3786,123
+143,4200,130
+143,6323,218
+143,8427,287
+143,10532,356
+143,12635,425
+143,16843,563
+143,21052,701
+143,25260,839
+143,29467,977
+143,33676,1115
+143,37884,1253
+143,42092,1391
+143,46300,1529
+143,50509,1667
+285,-5496,202
+285,-172,32
+285,0,10
+285,118,16
+285,223,19
+285,327,22
+285,432,24
+285,641,31
+285,851,37
+285,1271,50
+285,1690,63
+285,2110,75
+285,2530,88
+285,2950,101
+285,3369,113
+285,3780,117
+285,4195,124
+285,6305,200
+285,8402,262
+285,10499,324
+285,12596,386
+285,16791,510
+285,20987,636
+285,25181,760
+285,29376,884
+285,33570,1009
+285,37765,1133
+285,41960,1259
+285,46154,1383
+285,50350,1507
+428,-5501,200
+428,-167,35
+428,0,12
+428,119,17
+428,224,21
+428,328,23
+428,433,26
+428,643,31
+428,851,37
+428,1270,49
+428,1689,61
+428,2109,74
+428,2529,87
+428,2949,100
+428,3365,109
+428,3778,115
+428,4191,121
+428,6296,191
+428,8390,251
+428,10485,310
+428,12579,369
+428,16767,486
+428,20955,604
+428,25143,723
+428,29332,841
+428,33521,958
+428,37708,1076
+428,41897,1195
+428,46084,1313
+428,50273,1430
+570,-5512,188
+570,-167,37
+570,0,13
+570,121,19
+570,224,21
+570,328,23
+570,433,26
+570,641,31
+570,850,36
+570,1268,46
+570,1685,58
+570,2104,70
+570,2523,81
+570,2943,94
+570,3363,107
+570,3776,113
+570,4189,118
+570,6281,175
+570,8369,230
+570,10459,283
+570,12547,336
+570,16724,443
+570,20901,550
+570,25078,658
+570,29255,764
+570,33432,871
+570,37611,979
+570,41788,1086
+570,45965,1192
+570,50142,1299
+713,-5517,181
+713,-165,39
+713,0,14
+713,122,20
+713,225,22
+713,329,24
+713,433,27
+713,641,30
+713,850,36
+713,1267,45
+713,1684,56
+713,2102,67
+713,2521,79
+713,2939,90
+713,3358,102
+713,3775,111
+713,4188,118
+713,6272,166
+713,8357,217
+713,10442,267
+713,12527,317
+713,16697,416
+713,20867,517
+713,25039,617
+713,29209,717
+713,33379,818
+713,37549,918
+713,41719,1017
+713,45890,1117
+713,50060,1218
+855,-5524,174
+855,-162,42
+855,0,15
+855,122,21
+855,226,22
+855,329,24
+855,434,27
+855,641,31
+855,849,35
+855,1266,45
+855,1683,55
+855,2100,65
+855,2518,77
+855,2937,87
+855,3355,99
+855,3775,111
+855,4188,117
+855,6264,158
+855,8346,205
+855,10427,252
+855,12509,299
+855,16674,393
+855,20838,487
+855,25003,581
+855,29167,675
+855,33330,769
+855,37495,863
+855,41659,957
+855,45823,1051
+855,49988,1145
+998,-5526,172
+998,-160,44
+998,0,16
+998,123,22
+998,227,23
+998,331,26
+998,435,28
+998,641,31
+998,850,36
+998,1266,45
+998,1682,55
+998,2100,64
+998,2517,74
+998,2935,86
+998,3354,97
+998,3772,109
+998,4185,115
+998,6258,153
+998,8338,197
+998,10418,242
+998,12498,288
+998,16658,377
+998,20817,466
+998,24977,556
+998,29137,645
+998,33297,735
+998,37456,825
+998,41616,914
+998,45776,1003
+998,49936,1093
+1140,-5529,169
+1140,-158,46
+1140,0,18
+1140,125,23
+1140,229,24
+1140,332,27
+1140,436,29
+1140,643,32
+1140,851,37
+1140,1267,45
+1140,1683,55
+1140,2100,64
+1140,2516,74
+1140,2934,85
+1140,3352,96
+1140,3771,108
+1140,4183,114
+1283,-5529,169
+1283,-155,49
+1283,0,19
+1283,126,24
+1283,230,26
+1283,333,28
+1283,437,30
+1283,644,34
+1283,853,38
+1283,1267,46
+1283,1683,55
+1283,2098,64
+1283,2516,74
+1283,2934,85
+1283,3351,95
+1283,3764,101
+1425,-5531,167
+1425,-153,51
+1425,0,20
+1425,128,26
+1425,231,27
+1425,336,30
+1425,436,29
+1425,646,36
+1425,853,38
+1425,1268,46
+1425,1683,55
+1425,2098,63
+1425,2516,73
+1425,2932,84
+1425,3345,89
+1568,-5538,160
+1568,-148,56
+1568,0,21
+1568,129,28
+1568,232,29
+1568,336,31
+1568,440,32
+1568,647,37
+1568,854,41
+1568,1269,48
+1568,1684,57
+1568,2101,65
+1568,2517,74
+1568,2929,80
+1853,-5540,158
+1853,-144,60
+1853,0,24
+1853,132,30
+1853,234,31
+1853,340,34
+1853,442,35
+1853,650,38
+1853,856,42
+1853,1269,49
+1853,1684,57
+1853,2098,64
+1853,2515,73
+1853,2928,79
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..b72b915743e0e3b45da5379eb3ffcfc9fa7e0c86
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh
@@ -0,0 +1,65 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2017-05-19T08:36:54.5380903Z",
+ "AppVersion": "3",
+ "FileVersion": 7
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "VehCat": "RigidTruck",
+ "CurbWeight": 9300.0,
+ "CurbWeightExtra": 0.0,
+ "Loading": 0.0,
+ "MassMax": 26.0,
+ "CdA": 5.2,
+ "rdyn": 0.0,
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "Retarder": {
+ "Type": "secondary",
+ "Ratio": 1.0,
+ "File": "Retarder.vrlm"
+ },
+ "Angledrive": {
+ "Type": "None",
+ "Ratio": "NaN",
+ "LossMap": ""
+ },
+ "PTO": {
+ "Type": "drive shaft and/or more than 2 gear wheels - multi-disc clutch, oil pump",
+ "LossMap": "",
+ "Cycle": ""
+ },
+ "TorqueLimits": {},
+ "AxleConfig": {
+ "Type": "6x2",
+ "Axles": [
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.0,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 33350.0
+ },
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.0,
+ "TwinTyres": true,
+ "RRCISO": 0.0055,
+ "FzISO": 33350.0
+ },
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.0,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 33350.0
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL.vecto b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..ef46306882fd865abf8d0c8fbc6723b65969c582
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL.vecto
@@ -0,0 +1,61 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2017-05-19T08:36:57.2458195Z",
+ "AppVersion": "3",
+ "FileVersion": 3
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "EngineOnlyMode": false,
+ "VehicleFile": "Class9_RigidTruck.vveh",
+ "EngineFile": "Engine_324kW_12.7l.veng",
+ "GearboxFile": "AMT_12.vgbx",
+ "AuxiliaryAssembly": "Classic",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
+ "Aux": [
+ {
+ "ID": "FAN",
+ "Type": "Fan",
+ "Technology": [
+ "Crankshaft mounted - On/off clutch"
+ ]
+ },
+ {
+ "ID": "STP",
+ "Type": "Steering pump",
+ "Technology": [
+ "Fixed displacement with elec. control"
+ ]
+ },
+ {
+ "ID": "AC",
+ "Type": "HVAC",
+ "Technology": [
+ "Default"
+ ]
+ },
+ {
+ "ID": "ES",
+ "Type": "Electric System",
+ "Technology": [
+ "Standard technology"
+ ]
+ },
+ {
+ "ID": "PS",
+ "Type": "Pneumatic System",
+ "Technology": [
+ "Medium Supply 2-stage + ESS + AMS"
+ ]
+ }
+ ],
+ "OverSpeedEcoRoll": {
+ "Mode": "Overspeed",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ }
+ }
+}
\ 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
new file mode 100644
index 0000000000000000000000000000000000000000..9c995ff80fd7f9212a3f0e162b74a3f2fcd27894
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng
@@ -0,0 +1,22 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2017-05-19T08:13:02.2025457Z",
+ "AppVersion": "3",
+ "FileVersion": 3
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "ModelName": "324kW 7l Engine",
+ "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
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_1.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_1.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_1.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_10.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_10.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_10.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_11.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_11.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_11.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_12.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_12.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..4dfffd693b9b66d912044ed77371b0b6150c491c
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_12.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-2457,23
+0,-117,12
+0,0,5
+0,59,6
+0,293,7
+0,527,8
+0,761,9
+0,995,11
+0,1229,12
+0,1463,13
+0,1697,14
+0,1931,15
+0,2165,16
+0,2399,18
+0,2633,19
+0,2867,20
+100,-2457,26
+100,-117,14
+100,0,6
+100,59,7
+100,293,8
+100,527,9
+100,761,11
+100,995,12
+100,1229,13
+100,1463,14
+100,1697,15
+100,1931,16
+100,2165,18
+100,2399,19
+100,2633,20
+100,2867,21
+300,-2457,28
+300,-117,16
+300,0,7
+300,59,8
+300,293,9
+300,527,11
+300,761,12
+300,995,13
+300,1229,14
+300,1463,15
+300,1697,16
+300,1931,18
+300,2165,19
+300,2399,20
+300,2633,21
+300,2867,22
+500,-2457,30
+500,-117,19
+500,0,8
+500,59,9
+500,293,11
+500,527,12
+500,761,13
+500,995,14
+500,1229,15
+500,1463,16
+500,1697,18
+500,1931,19
+500,2165,20
+500,2399,21
+500,2633,22
+500,2867,23
+700,-2457,33
+700,-117,21
+700,0,9
+700,59,11
+700,293,12
+700,527,13
+700,761,14
+700,995,15
+700,1229,16
+700,1463,18
+700,1697,19
+700,1931,20
+700,2165,21
+700,2399,22
+700,2633,23
+700,2867,25
+900,-2457,35
+900,-117,23
+900,0,10
+900,59,12
+900,293,13
+900,527,14
+900,761,15
+900,995,16
+900,1229,18
+900,1463,19
+900,1697,20
+900,1931,21
+900,2165,22
+900,2399,23
+900,2633,25
+900,2867,26
+1100,-2457,37
+1100,-117,26
+1100,0,11
+1100,59,13
+1100,293,14
+1100,527,15
+1100,761,16
+1100,995,18
+1100,1229,19
+1100,1463,20
+1100,1697,21
+1100,1931,22
+1100,2165,23
+1100,2399,25
+1100,2633,26
+1100,2867,27
+1300,-2457,40
+1300,-117,28
+1300,0,12
+1300,59,14
+1300,293,15
+1300,527,16
+1300,761,18
+1300,995,19
+1300,1229,20
+1300,1463,21
+1300,1697,22
+1300,1931,23
+1300,2165,25
+1300,2399,26
+1300,2633,27
+1300,2867,28
+1500,-2457,42
+1500,-117,30
+1500,0,13
+1500,59,15
+1500,293,16
+1500,527,18
+1500,761,19
+1500,995,20
+1500,1229,21
+1500,1463,22
+1500,1697,23
+1500,1931,25
+1500,2165,26
+1500,2399,27
+1500,2633,28
+1500,2867,29
+1700,-2457,44
+1700,-117,33
+1700,0,14
+1700,59,16
+1700,293,18
+1700,527,19
+1700,761,20
+1700,995,21
+1700,1229,22
+1700,1463,23
+1700,1697,25
+1700,1931,26
+1700,2165,27
+1700,2399,28
+1700,2633,29
+1700,2867,30
+1900,-2457,47
+1900,-117,35
+1900,0,15
+1900,59,18
+1900,293,19
+1900,527,20
+1900,761,21
+1900,995,22
+1900,1229,23
+1900,1463,25
+1900,1697,26
+1900,1931,27
+1900,2165,28
+1900,2399,29
+1900,2633,30
+1900,2867,32
+2100,-2457,49
+2100,-117,37
+2100,0,16
+2100,59,19
+2100,293,20
+2100,527,21
+2100,761,22
+2100,995,23
+2100,1229,25
+2100,1463,26
+2100,1697,27
+2100,1931,28
+2100,2165,29
+2100,2399,30
+2100,2633,32
+2100,2867,33
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_2.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_2.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_2.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_3.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_3.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_3.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_4.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_4.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_4.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_5.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_5.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_5.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_6.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_6.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_6.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_7.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_7.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_7.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_8.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_8.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_8.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_9.vtlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_9.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Gear_9.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Retarder.vrlm b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Retarder.vrlm
new file mode 100644
index 0000000000000000000000000000000000000000..eb575b99973291e5414c4826da086c1f03a7f179
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/Class9_RigidTruck_6x2/Retarder.vrlm
@@ -0,0 +1,32 @@
+Retarder Speed [1/min],Torque Loss [Nm]
+0,10
+100,10
+200,10.1
+300,10.2
+400,10.3
+500,10.5
+600,10.7
+700,11
+800,11.3
+900,11.6
+1000,12
+1100,12.4
+1200,12.9
+1300,13.4
+1400,13.9
+1500,14.5
+1600,15.1
+1700,15.8
+1800,16.5
+1900,17.2
+2000,18
+2100,18.8
+2200,19.7
+2300,20.6
+2400,21.5
+2500,22.5
+2600,23.5
+2700,24.6
+2800,25.7
+2900,26.8
+3000,28
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index dce33f47382f31ab676918b028ae12c505d7eb13..728f98164416644cb2b2280a43973783bf12491b 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -64,7 +64,8 @@ Public Class VehicleForm
ButAxlRem.Enabled = Not Cfg.DeclMode
CbCdMode.Enabled = Not Cfg.DeclMode
PnWheelDiam.Enabled = Not Cfg.DeclMode
- gbPTO.Enabled = Not Cfg.DeclMode
+ 'gbPTO.Enabled = Not Cfg.DeclMode
+ pnPTO.Enabled = Not Cfg.DeclMode
CbCdMode.ValueMember = "Value"
CbCdMode.DisplayMember = "Label"
@@ -394,8 +395,9 @@ Public Class VehicleForm
TBcdA.Text = airdrag.AirDragArea.ToGUIFormat()
cbPTOType.SelectedValue = pto.PTOTransmissionType
- tbPTOLossMap.Text = If(pto.PTOLossMap Is Nothing, "", GetRelativePath(pto.PTOLossMap.Source, basePath))
- tbPTOCycle.Text = If(pto.PTOCycle Is Nothing, "", GetRelativePath(pto.PTOCycle.Source, basePath))
+ tbPTOLossMap.Text =
+ If(Cfg.DeclMode OrElse pto.PTOLossMap Is Nothing, "", GetRelativePath(pto.PTOLossMap.Source, basePath))
+ tbPTOCycle.Text = If(Cfg.DeclMode OrElse pto.PTOCycle Is Nothing, "", GetRelativePath(pto.PTOCycle.Source, basePath))
cbAngledriveType.SelectedValue = angledrive.Type
tbAngledriveRatio.Text = angledrive.Ratio.ToGUIFormat()
diff --git a/VECTO/Input Files/Gearbox.vb b/VECTO/Input Files/Gearbox.vb
index c6fc9e65899bfccfd886fdd5a2f0853cafd3a8fa..bbf178e3eaeda357416784a185081bbebaa7355a 100644
--- a/VECTO/Input Files/Gearbox.vb
+++ b/VECTO/Input Files/Gearbox.vb
@@ -270,7 +270,7 @@ Public Class Gearbox
fullLoadCurves(0).EngineData = retVal
For i As Integer = 0 To gears.Count - 1
fullLoadCurves(CType(i + 1, UInteger)) = AbstractSimulationDataAdapter.IntersectFullLoadCurves(fullLoadCurves(0),
- gears(i).MaxTorque)
+ gears(i).MaxTorque)
Next
retVal.FullLoadCurves = fullLoadCurves
Return retVal
@@ -355,7 +355,8 @@ Public Class Gearbox
Dim i As Integer
For i = 1 To GearRatios.Count - 1
Dim gearDict As New TransmissionInputData With {
- .Ratio = GearRatios(i)
+ .Ratio = GearRatios(i),
+ .Gear = i
}
If File.Exists(GearshiftFiles(i).FullPath) Then
gearDict.ShiftPolygon = VectoCSVFile.Read(GearshiftFiles(i).FullPath)
diff --git a/VECTO/Input Files/VectoJob.vb b/VECTO/Input Files/VectoJob.vb
index 7515a9d9c03eded0030e15985902315bf5d80612..8a65f4a7911f720ceca9cddf6fe6c53162730fae 100644
--- a/VECTO/Input Files/VectoJob.vb
+++ b/VECTO/Input Files/VectoJob.vb
@@ -577,6 +577,14 @@ Public Class VectoJob
End Get
End Property
+ Public ReadOnly Property IDeclarationInputDataProvider_PTOTransmissionInputData As IPTOTransmissionInputData _
+ Implements IDeclarationInputDataProvider.PTOTransmissionInputData
+ Get
+ If Not File.Exists(_vehicleFile.FullPath) Then Return Nothing
+ Return New JSONComponentInputData(_vehicleFile.FullPath).PTOTransmissionInputData
+ End Get
+ End Property
+
Public ReadOnly Property PTOTransmissionInputData As IPTOTransmissionInputData _
Implements IEngineeringInputDataProvider.PTOTransmissionInputData
Get
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index 01b05bcd155dd0312b5d21734487671535768c2c..f9acea20f6c4f731f67b5efdab791f4d72b4386a 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -26,7 +26,7 @@ Imports TUGraz.VectoCore.Utils
<CustomValidation(GetType(Vehicle), "ValidateVehicle")>
Public Class Vehicle
- Implements IVehicleEngineeringInputData, IVehicleDeclarationInputData, IRetarderInputData, IPTOTransmissionInputData,
+ Implements IVehicleEngineeringInputData, IVehicleDeclarationInputData, IRetarderInputData, IPTOTransmissionInputData,
IAngledriveInputData, IAirdragEngineeringInputData
Private _filePath As String
@@ -82,7 +82,7 @@ Public Class Vehicle
AngledriveLossMapFile = New SubPath()
Axles = New List(Of AxleInputData)
- torqueLimitsList = new List(Of ITorqueLimitInputData)
+ torqueLimitsList = New List(Of ITorqueLimitInputData)
PtoLossMap = New SubPath()
PtoCycle = New SubPath()
SetDefault()
@@ -110,9 +110,10 @@ Public Class Vehicle
Dim segment As Segment = DeclarationData.Segments.Lookup(vehicle.VehicleCategory, vehicle.AxleConfiguration,
vehicle.GrossVehicleMassRating, vehicle.CurbMassChassis)
vehicleData = doa.CreateVehicleData(vehicle, vehicle, segment.Missions.First(),
- segment.Missions.First().Loadings.First().Value, segment.VehicleHeight)
+ segment.Missions.First().Loadings.First().Value, segment.VehicleHeight, segment.MunicipalBodyWeight)
retarderData = doa.CreateRetarderData(vehicle)
angledriveData = doa.CreateAngledriveData(vehicle, False)
+ ptoData = doa.CreatePTOTransmissionData(vehicle)
Else
Dim doa As EngineeringDataAdapter = New EngineeringDataAdapter()
vehicleData = doa.CreateVehicleData(vehicle, vehicle)
@@ -461,6 +462,9 @@ Public Class Vehicle
Public ReadOnly Property IPTOTransmissionInputData_PTOLossMap As TableData _
Implements IPTOTransmissionInputData.PTOLossMap
Get
+ If String.IsNullOrWhiteSpace(PtoCycle.FullPath) Then
+ Return Nothing
+ End If
Return VectoCSVFile.Read(PtoLossMap.FullPath)
End Get
End Property
diff --git a/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs b/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
index 47c7f1b46cb12e5a95457f12f823832b3d32e6ef..93db0d939de9b974e7a1dad972bdd139189e93ea 100644
--- a/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
+++ b/VectoCommon/VectoCommon/InputData/IInputDataProvider.cs
@@ -56,6 +56,8 @@ namespace TUGraz.VectoCommon.InputData
IRetarderInputData RetarderInputData { get; }
IDriverDeclarationInputData DriverInputData { get; }
+
+ IPTOTransmissionInputData PTOTransmissionInputData { get; }
}
public interface IEngineeringInputDataProvider : IInputDataProvider
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationInputDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationInputDataProvider.cs
index 59a2c83d5ba2ed3db2809a30779f1b895e020327..072528514ec44a12fc6344eae6e1e1ad726d9b93 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationInputDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationInputDataProvider.cs
@@ -46,6 +46,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
RetarderInputData = new XMLDeclarationRetarderDataProvider(this);
XMLDriverData = new XMLDeclarationDriverDataProvider(this);
XMLAuxiliaryData = new XMLDeclarationAuxiliaryDataProvider(this);
+ PTOTransmissionInputData = _vehicleInputData.GetPTOData();
}
private static void ValidationCallBack(object sender, ValidationEventArgs args)
@@ -99,5 +100,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
{
get { return XMLDriverData; }
}
+
+ public IPTOTransmissionInputData PTOTransmissionInputData { get; private set; }
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationVehicleDataProvider.cs
index bda058167df7a4fdc82839be0dcf6991e71650b7..fc6c70de91bf915f84b1c28c6e76e7f98df69c34 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationVehicleDataProvider.cs
@@ -1,17 +1,19 @@
using System;
using System.Collections.Generic;
+using System.Linq;
using System.Xml;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.Impl;
+using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Resources;
namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
{
public class XMLDeclarationVehicleDataProvider : AbstractDeclarationXMLComponentDataProvider,
- IVehicleDeclarationInputData
+ IVehicleDeclarationInputData, IPTOTransmissionInputData
{
public XMLDeclarationVehicleDataProvider(XMLDeclarationInputDataProvider xmlInputDataProvider)
: base(xmlInputDataProvider)
@@ -139,5 +141,36 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration
{
get { return GetElementValue(XMLNames.Vehicle_AngledriveType).ParseEnum<AngledriveType>(); }
}
+
+ public IPTOTransmissionInputData GetPTOData()
+ {
+ return this;
+ }
+
+ public string PTOTransmissionType
+ {
+ get {
+ var shaftGearWheels = GetElementValue(Helper.Query(XMLNames.Vehicle_PTO, XMLNames.Vehicle_PTO_ShaftsGearWheels));
+ if ("none".Equals(shaftGearWheels, StringComparison.InvariantCultureIgnoreCase)) {
+ return "None";
+ }
+ var otherElements = GetElementValue(Helper.Query(XMLNames.Vehicle_PTO, XMLNames.Vehicle_PTO_OtherElements));
+ var ptoTech = string.Format("{0} - {1}", shaftGearWheels, otherElements);
+ if (DeclarationData.PTOTransmission.GetTechnologies().Contains(ptoTech)) {
+ return ptoTech;
+ }
+ throw new VectoException("PTO Technology {0} invalid!", ptoTech);
+ }
+ }
+
+ public TableData PTOLossMap
+ {
+ get { return null; }
+ }
+
+ public TableData PTOCycle
+ {
+ get { return null; }
+ }
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/Reader/ComponentData/PTOIdleLossMapReader.cs b/VectoCore/VectoCore/InputData/Reader/ComponentData/PTOIdleLossMapReader.cs
index 904ee5472fadd67adb08f144c1c372daa0cc6a1d..e03cbb248e78366b9312d48370ca1de1db879d08 100644
--- a/VectoCore/VectoCore/InputData/Reader/ComponentData/PTOIdleLossMapReader.cs
+++ b/VectoCore/VectoCore/InputData/Reader/ComponentData/PTOIdleLossMapReader.cs
@@ -31,10 +31,12 @@
using System;
using System.Data;
+using System.IO;
using System.Linq;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
+using TUGraz.VectoCore.Models.SimulationComponent;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Utils;
@@ -56,6 +58,15 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData
}
}
+ public static PTOLossMap ReadFromStream(Stream stream)
+ {
+ try {
+ return Create(VectoCSVFile.ReadStream(stream));
+ } catch (Exception ex) {
+ throw new VectoException("ERROR while loading PTO Idle LossMap: " + ex.Message);
+ }
+ }
+
/// <summary>
/// Create the pto idle loss map from an appropriate datatable. (2 columns: Engine Speed, PTO Torque)
/// </summary>
@@ -97,5 +108,13 @@ namespace TUGraz.VectoCore.InputData.Reader.ComponentData
/// </summary>
public const string PTOTorque = "PTO Torque";
}
+
+ public static PTOLossMap GetZeroLossMap()
+ {
+ return new PTOLossMap(new[] {
+ new PTOLossMap.Entry { EngineSpeed = 0.RPMtoRad(), PTOTorque = 0.SI<NewtonMeter>() },
+ new PTOLossMap.Entry { EngineSpeed = 10000.RPMtoRad(), PTOTorque = 0.SI<NewtonMeter>() },
+ });
+ }
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
index 624be13dca14cc5e8c02c44f690d338af5a00099..7612d7fc152c27e7dd5c378e00a53d010bd584a5 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
@@ -81,8 +81,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
}
internal VehicleData CreateVehicleData(IVehicleDeclarationInputData data, IAirdragDeclarationInputData airdragData,
- Mission mission, Kilogram loading,
- Meter vehicleHeight)
+ Mission mission, Kilogram loading, Meter vehicleHeight, Kilogram municipalBodyWeight)
{
if (!data.SavedInDeclarationMode) {
WarnDeclarationMode("VehicleData");
@@ -90,7 +89,10 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
var retVal = SetCommonVehicleData(data);
retVal.TrailerGrossVehicleWeight = mission.Trailer.Sum(t => t.TrailerGrossVehicleWeight).DefaultIfNull(0);
- retVal.BodyAndTrailerWeight = mission.BodyCurbWeight + mission.Trailer.Sum(t => t.TrailerCurbWeight).DefaultIfNull(0);
+
+ retVal.BodyAndTrailerWeight = (mission.MissionType == MissionType.MunicipalUtility
+ ? municipalBodyWeight
+ : mission.BodyCurbWeight) + mission.Trailer.Sum(t => t.TrailerCurbWeight).DefaultIfNull(0);
retVal.CurbWeight += retVal.BodyAndTrailerWeight;
retVal.Loading = loading;
@@ -400,5 +402,17 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
points[0].EffectiveCrossSectionArea = points[1].EffectiveCrossSectionArea;
return points;
}
+
+ public PTOData CreatePTOTransmissionData(IPTOTransmissionInputData pto)
+ {
+ if (pto.PTOTransmissionType != "None") {
+ return new PTOData {
+ TransmissionType = pto.PTOTransmissionType,
+ LossMap = PTOIdleLossMapReader.GetZeroLossMap(),
+ };
+ }
+
+ return null;
+ }
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
index a20bddd1deb083f162ab7f3ea26a065617412347..3fa0f6d57117556da39965436ab9a12e885a0772 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
@@ -34,13 +34,14 @@ using System.Linq;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
-using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.Reader.ComponentData;
using TUGraz.VectoCore.InputData.Reader.DataObjectAdapter;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.OutputData;
+using TUGraz.VectoCore.Utils;
+
namespace TUGraz.VectoCore.InputData.Reader.Impl
{
@@ -71,21 +72,22 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
driverdata.AccelerationCurve = AccelerationCurveReader.ReadFromStream(segment.AccelerationFile);
var tempVehicle = dao.CreateVehicleData(InputDataProvider.VehicleInputData, InputDataProvider.AirdragInputData,
- segment.Missions.First(),
- segment.Missions.First().Loadings.First().Value, segment.VehicleHeight);
- var engineData = dao.CreateEngineData(InputDataProvider.EngineInputData, InputDataProvider.GearboxInputData, InputDataProvider.VehicleInputData.TorqueLimits);
+ segment.Missions.First(), segment.Missions.First().Loadings.First().Value, segment.VehicleHeight, segment.MunicipalBodyWeight);
+ var engineData = dao.CreateEngineData(InputDataProvider.EngineInputData, InputDataProvider.GearboxInputData,
+ InputDataProvider.VehicleInputData.TorqueLimits);
var axlegearData = dao.CreateAxleGearData(InputDataProvider.AxleGearInputData, false);
var angledriveData = dao.CreateAngledriveData(InputDataProvider.AngledriveInputData, false);
var gearboxData = dao.CreateGearboxData(InputDataProvider.GearboxInputData, engineData, axlegearData.AxleGear.Ratio,
tempVehicle.DynamicTyreRadius, false);
var retarderData = dao.CreateRetarderData(InputDataProvider.RetarderInputData);
+ var ptoTransmissionData = dao.CreatePTOTransmissionData(InputDataProvider.PTOTransmissionInputData);
+ var municipalPtoTransmissionData = CreateDefaultPTOData();
if (Report != null) {
var powertrainConfig = new VectoRunData() {
VehicleData =
dao.CreateVehicleData(InputDataProvider.VehicleInputData, InputDataProvider.AirdragInputData,
- segment.Missions.First(),
- segment.Missions.First().Loadings.First().Value, segment.VehicleHeight),
+ segment.Missions.First(), segment.Missions.First().Loadings.First().Value, segment.VehicleHeight, segment.MunicipalBodyWeight),
EngineData = engineData,
GearboxData = gearboxData,
AxleGearData = axlegearData,
@@ -114,8 +116,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
Loading = loading.Key,
VehicleData =
dao.CreateVehicleData(InputDataProvider.VehicleInputData, InputDataProvider.AirdragInputData, mission,
- loading.Value,
- segment.VehicleHeight),
+ loading.Value, segment.VehicleHeight, segment.MunicipalBodyWeight),
EngineData = engineData.Copy(),
GearboxData = gearboxData,
AxleGearData = axlegearData,
@@ -130,6 +131,9 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
ModFileSuffix = loading.Key.ToString(),
Report = Report,
Mission = mission,
+ PTO = mission.MissionType == MissionType.MunicipalUtility
+ ? municipalPtoTransmissionData
+ : ptoTransmissionData
};
simulationRunData.EngineData.WHTCCorrectionFactor = DeclarationData.WHTCCorrection.Lookup(
mission.MissionType.GetNonEMSMissionType(), engineData.WHTCRural, engineData.WHTCUrban, engineData.WHTCMotorway) *
@@ -141,6 +145,17 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
}
}
+ private PTOData CreateDefaultPTOData()
+ {
+ return new PTOData() {
+ TransmissionType = DeclarationData.PTO.DefaultPTOTechnology,
+ LossMap = PTOIdleLossMapReader.ReadFromStream(RessourceHelper.ReadStream(DeclarationData.PTO.DefaultPTOIdleLosses)),
+ PTOCycle =
+ DrivingCycleDataReader.ReadFromStream(RessourceHelper.ReadStream(DeclarationData.PTO.DefaultPTOActivationCycle),
+ CycleType.PTO, "PTO", false)
+ };
+ }
+
internal Segment GetVehicleClassification(VehicleCategory category, AxleConfiguration axles, Kilogram grossMassRating,
Kilogram curbWeight)
{
diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
index ed5ffc59656b51f8490c2eeea577c6b25dbef616..3c1bd0a69e27d71ae1c0a6e630f1693cf2dd9203 100644
--- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
@@ -407,5 +407,17 @@ namespace TUGraz.VectoCore.Models.Declaration
return characteristicTorque.Where(x => x.SpeedRatio >= ratio).ToArray();
}
}
+
+ public static class PTO
+ {
+ public const string DefaultPTOTechnology =
+ "only the drive shaft of the PTO - shift claw, synchronizer, sliding gearwheel";
+
+ public const string DefaultPTOIdleLosses =
+ DeclarationDataResourcePrefix + ".MissionCycles.MunicipalUtility_PTO_generic.vptol";
+
+ public const string DefaultPTOActivationCycle =
+ DeclarationDataResourcePrefix + ".MissionCycles.MunicipalUtility_PTO_generic.vptoc";
+ }
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/Declaration/Segment.cs b/VectoCore/VectoCore/Models/Declaration/Segment.cs
index 1b84124604aaaa4a3bf989286cbb473d36d03cd5..24f5a92ce7dcec053b65ab2cdbb1e3f9735f2a63 100644
--- a/VectoCore/VectoCore/Models/Declaration/Segment.cs
+++ b/VectoCore/VectoCore/Models/Declaration/Segment.cs
@@ -58,5 +58,7 @@ namespace TUGraz.VectoCore.Models.Declaration
public MeterPerSecond DesignSpeed { get; internal set; }
public SquareMeter CdAConstruction { get; internal set; }
+
+ public Kilogram MunicipalBodyWeight { get; internal set; }
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Models/Declaration/Segments.cs b/VectoCore/VectoCore/Models/Declaration/Segments.cs
index 1d0e33997470656adc0bd6dff83f3a120a480582..17cf2d02f1dbc8001ffa97a8ee6559faac832145 100644
--- a/VectoCore/VectoCore/Models/Declaration/Segments.cs
+++ b/VectoCore/VectoCore/Models/Declaration/Segments.cs
@@ -92,10 +92,12 @@ namespace TUGraz.VectoCore.Models.Declaration
VehicleHeight = LookupHeight(vehicleCategory, axleConfiguration, grossVehicleMassRating),
DesignSpeed = row.ParseDouble("designspeed").KMPHtoMeterPerSecond(),
GrossVehicleMassRating = grossVehicleMassRating,
- CdAConstruction =
- string.IsNullOrEmpty(row["cdxa_construction"].ToString())
- ? null
- : row.ParseDouble("cdxa_construction").SI<SquareMeter>()
+ CdAConstruction = string.IsNullOrEmpty(row["cdxa_construction"].ToString())
+ ? null
+ : row.ParseDouble("cdxa_construction").SI<SquareMeter>(),
+ MunicipalBodyWeight = string.IsNullOrEmpty(row["bodyweight_municipalutility"].ToString())
+ ? null
+ : row.ParseDouble("bodyweight_municipalutility").SI<Kilogram>()
};
return segment;
@@ -229,7 +231,8 @@ namespace TUGraz.VectoCore.Models.Declaration
return missions.ToArray();
}
- private static Kilogram GetLoading(string payloadStr, Kilogram grossVehicleWeight, IEnumerable<MissionTrailer> trailers, bool lowLoading)
+ private static Kilogram GetLoading(string payloadStr, Kilogram grossVehicleWeight,
+ IEnumerable<MissionTrailer> trailers, bool lowLoading)
{
var refLoadValue = payloadStr.ToDouble(double.NaN);
if (double.IsNaN(refLoadValue)) {
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
index fc29667638a997a256ba58a29d2cbd03f1df8a99..bf281f6531892de6fb763603ffcb0bd7761d32de 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
@@ -223,7 +223,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
{
var controller = engine.IdleController;
- if (pto != null) {
+ if (pto != null && pto.PTOCycle != null) {
var ptoController = new PTOCycleController(pto.PTOCycle);
controller = new IdleControllerSwitcher(engine.IdleController, ptoController);
}
diff --git a/VectoCore/VectoCore/Resources/Declaration/MissionCycles/MunicipalUtility.vdri b/VectoCore/VectoCore/Resources/Declaration/MissionCycles/MunicipalUtility.vdri
index 2e91ef450a9e7b15249bd2e273274f7111174eca..748884a6e7bbbfccfcd55c601e8ceb0e010ea4ee 100644
--- a/VectoCore/VectoCore/Resources/Declaration/MissionCycles/MunicipalUtility.vdri
+++ b/VectoCore/VectoCore/Resources/Declaration/MissionCycles/MunicipalUtility.vdri
@@ -1,504 +1,545 @@
-<s>,<v>,<grad>,<stop>
-0,0,0,2
-1,51.2,0,0
-11,51.2,0.2,0
-16,51.2,0.4,0
-21,51.2,0.6,0
-26,51.2,0.8,0
-31,51.2,1,0
-41,51.2,1.2,0
-46,51.2,1.3,0
-156,51.2,1.5,0
-161,51.2,1.6,0
-560,65.5,1.6,0
-741,65.5,1.5,0
-746,65.5,1.4,0
-751,65.5,1.3,0
-756,65.5,1,0
-761,65.5,0.5,0
-766,65.5,0,0
-796,65.5,-0.5,0
-811,65.5,-1,0
-841,65.5,-1.4,0
-856,65.5,-1.6,0
-876,65.5,-1.8,0
-906,65.5,-2,0
-1046,65.5,-1.7,0
-1056,65.5,-1.2,0
-1076,65.5,-0.8,0
-1081,65.5,-0.6,0
-1086,65.5,-0.4,0
-1091,65.5,-0.2,0
-1096,65.5,0,0
-1126,65.5,0.3,0
-1131,65.5,0.6,0
-1136,65.5,0.9,0
-1140,21,0.9,0
-1141,21,1.2,0
-1146,57.8,1.2,0
-1181,57.8,1.3,0
-1201,57.8,1.5,0
-1206,57.8,1.7,0
-1211,57.8,1.9,0
-1381,57.8,1.8,0
-1406,57.8,1.7,0
-1456,57.8,1.6,0
-1461,57.8,1.5,0
-1466,57.8,1.4,0
-1471,57.8,1.3,0
-1476,57.8,1.2,0
-1481,57.8,1.1,0
-1506,57.8,0.9,0
-1511,57.8,0.7,0
-1516,57.8,0.5,0
-1521,57.8,0.3,0
-1526,57.8,0.1,0
-1531,57.8,-0.1,0
-1551,57.8,-0.2,0
-1561,57.8,-0.3,0
-1566,57.8,-0.4,0
-1571,57.8,-0.5,0
-1576,57.8,-0.6,0
-1581,57.8,-0.7,0
-1586,57.8,-0.8,0
-1621,57.8,-1,0
-1751,57.8,-0.8,0
-1761,57.8,-0.5,0
-1766,57.8,-0.2,0
-1771,57.8,0,0
-1786,57.8,0.2,0
-1791,57.8,0.4,0
-1796,57.8,0.6,0
-1801,57.8,0.8,0
-1806,57.8,1,0
-1811,57.8,1.2,0
-1816,57.8,1.4,0
-1821,57.8,1.6,0
-1826,57.8,1.8,0
-1842,41.5,1.8,0
-1853,46.5,1.8,0
-1946,46.5,1.7,0
-1951,46.5,1.6,0
-1956,46.5,1.5,0
-1961,46.5,1.4,0
-1966,46.5,1.3,0
-1971,46.5,1.2,0
-1976,46.5,1.1,0
-1981,46.5,1,0
-1986,46.5,0.9,0
-1991,46.5,0.8,0
-1996,46.5,0.7,0
-1998,27.2,0.7,0
-2001,27.2,0.6,0
-2005,37.8,0.6,0
-2006,37.8,0.4,0
-2011,37.8,0.2,0
-2016,37.8,0,0
-2021,37.8,-0.2,0
-2026,37.8,-0.4,0
-2031,37.8,-0.6,0
-2036,37.8,-0.8,0
-2041,37.8,-1,0
-2046,37.8,-1.2,0
-2051,37.8,-1.4,0
-2056,37.8,-1.6,0
-2061,37.8,-1.8,0
-2066,37.8,-2,0
-2206,0,-2,3
-2207,23,-2,0
-2271,23,-1.8,0
-2276,23,-1.6,0
-2281,23,-1.3,0
-2282,22.9,-1.3,0
-2286,22.9,-1,0
-2288,23,-1,0
-2291,23,-0.7,0
-2296,23,-0.4,0
-2301,23,-0.2,0
-2306,23,0,0
-2321,23,0.1,0
-2346,15.4,0.1,0
-2350,38.8,0.1,0
-2376,38.8,0.2,0
-2587,0,0.2,5
-2588,19.4,0.2,0
-2616,19.4,0.1,0
-2641,10.7,0.1,0
-2644,22.3,0.1,0
-2661,22.3,0,0
-2681,22.3,-0.1,0
-2716,22.3,-0.2,0
-2731,0,-0.2,73
-2732,15,-0.2,0
-2768,0,-0.2,90
-2769,15.3,-0.2,0
-2798,0,-0.2,79
-2799,10.6,-0.2,0
-2821,0,-0.2,54
-2822,10,-0.2,0
-2840,0,-0.2,49
-2841,10.9,-0.2,0
-2860,0,-0.2,97
-2861,10,-0.2,0
-2875,0,-0.2,37
-2876,10.8,-0.2,0
-2890,0,-0.2,190
-2891,10,-0.2,0
-2902,0,-0.2,23
-2903,10,-0.2,0
-2913,0,-0.2,27
-2914,10,-0.2,0
-2923,0,-0.2,30
-2924,10,-0.2,0
-2938,0,-0.2,34
-2939,10,-0.2,0
-2941,10,-0.3,0
-2947,0,-0.3,15
-2948,10,-0.3,0
-2957,0,-0.3,16
-2958,10,-0.3,0
-2968,0,-0.3,17
-2969,10,-0.3,0
-2979,0,-0.3,19
-2980,10,-0.3,0
-2986,0,-0.3,21
-2987,10,-0.3,0
-2997,0,-0.3,149
-2998,12.2,-0.3,0
-3025,0,-0.3,57
-3026,10.8,-0.3,0
-3053,0,-0.3,67
-3054,10,-0.3,0
-3056,10,-0.2,0
-3078,0,-0.2,61
-3079,12.1,-0.2,0
-3118,0,-0.2,133
-3119,10,-0.2,0
-3137,10.5,-0.2,0
-3159,0,-0.2,44
-3160,10,-0.2,0
-3179,12.5,-0.2,0
-3216,0,-0.2,115
-3217,14.8,-0.2,0
-3231,14.8,0,0
-3265,10,0,0
-3267,12.8,0,0
-3301,0,0,40
-3302,10,0,0
-3316,12.4,0,0
-3349,20.8,0,0
-3426,20.8,-0.2,0
-3431,10,-0.2,0
-3433,16.3,-0.2,0
-3441,16.3,-0.4,0
-3456,16.3,-0.6,0
-3476,0,-0.6,38
-3477,19.4,-0.6,0
-3511,19.4,-0.7,0
-3516,19.4,-0.8,0
-3529,10.7,-0.8,0
-3533,22.3,-0.8,0
-3611,22.3,-0.7,0
-3616,22.3,-0.6,0
-3620,0,-0.5,73
-3621,15,-0.5,0
-3626,15,-0.4,0
-3631,15,-0.3,0
-3636,15,-0.2,0
-3641,15,-0.1,0
-3646,15,0,0
-3651,15,0.1,0
-3656,0,0.1,90
-3657,15.3,0.1,0
-3681,15.3,0.2,0
-3686,0,0.2,79
-3687,10.6,0.2,0
-3691,10.6,0.3,0
-3696,10.6,0.4,0
-3701,10.6,0.5,0
-3706,10.6,0.6,0
-3709,0,0.6,54
-3710,10,0.6,0
-3711,10,0.7,0
-3728,0,0.7,49
-3729,10.9,0.7,0
-3749,0,0.7,97
-3750,10,0.7,0
-3763,0,0.7,37
-3764,10.8,0.7,0
-3778,0,0.7,190
-3779,10,0.7,0
-3791,0,0.7,23
-3792,10,0.7,0
-3801,10,0.5,0
-3802,0,0.5,27
-3803,10,0.5,0
-3806,10,0.3,0
-3811,0,0.1,30
-3812,10,0.1,0
-3816,10,0,0
-3827,0,0,34
-3828,10,0,0
-3835,0,0,15
-3836,10,0,0
-3845,0,0,16
-3846,10,0,0
-3857,0,0,17
-3858,10,0,0
-3867,0,0,19
-3868,10,0,0
-3874,0,0,21
-3875,10,0,0
-3886,0,0,149
-3887,12.2,0,0
-3914,0,0,57
-3915,10.8,0,0
-3942,0,0,67
-3943,10,0,0
-3966,0,0,61
-3967,12.1,0,0
-3971,12.1,0.2,0
-4001,12.1,0.3,0
-4006,0,0.3,133
-4007,10,0.3,0
-4026,10.5,0.3,0
-4047,0,0.3,44
-4048,10,0.3,0
-4067,12.5,0.3,0
-4086,12.5,0.4,0
-4104,0,0.4,115
-4105,14.8,0.4,0
-4153,10,0.4,0
-4155,12.8,0.4,0
-4181,12.8,0.5,0
-4189,0,0.5,40
-4190,10,0.5,0
-4204,12.4,0.5,0
-4237,20.8,0.5,0
-4261,20.8,0.4,0
-4266,20.8,0.3,0
-4271,20.8,0.2,0
-4276,20.8,0.1,0
-4281,20.8,0,0
-4319,10,0,0
-4322,16.3,0,0
-4351,16.3,-0.1,0
-4356,16.3,-0.2,0
-4361,16.3,-0.3,0
-4364,0,-0.3,38
-4365,16,-0.3,0
-4366,16,-0.4,0
-4371,16,-0.5,0
-4376,16,-0.6,0
-4381,16,-0.7,0
-4386,16,-0.8,0
-4415,10,-0.8,0
-4417,36.2,-0.8,0
-4536,36.2,-0.9,0
-4541,36.2,-1,0
-4546,36.2,-1.1,0
-4551,36.2,-1.2,0
-4556,36.2,-1.3,0
-4613,14.4,-1.3,0
-4617,33.9,-1.3,0
-4621,33.9,-1.5,0
-4626,33.9,-1.7,0
-4696,33.9,-1.9,0
-4846,33.9,-1.7,0
-4851,33.9,-1.5,0
-4855,14.7,-1.5,0
-4856,14.7,-1.3,0
-4859,23.1,-1.3,0
-4861,23.1,-1.1,0
-4866,23.1,-0.9,0
-4871,23.1,-0.7,0
-4876,23.1,-0.5,0
-4881,23.1,-0.3,0
-4886,23.1,-0.1,0
-4891,23.1,0,0
-4932,0,0,14
-4933,64.8,0,0
-5016,64.8,0.1,0
-5021,64.8,0.2,0
-5026,64.8,0.3,0
-5031,64.8,0.4,0
-5036,64.8,0.5,0
-5116,64.8,0.7,0
-5131,64.8,0.9,0
-5181,64.8,1.1,0
-5186,64.8,1.3,0
-5191,64.8,1.5,0
-5211,64.8,1.6,0
-5426,64.8,1.5,0
-5431,64.8,1.4,0
-5436,64.8,1.3,0
-5441,64.8,1.2,0
-5446,64.8,1.1,0
-5451,64.8,1,0
-5456,64.8,0.9,0
-5461,64.8,0.8,0
-5466,64.8,0.7,0
-5471,64.8,0.6,0
-5476,64.8,0.5,0
-5481,64.8,0.4,0
-5666,64.8,0.5,0
-5667,10,0.5,0
-5668,27.2,0.5,0
-5671,27.2,0.6,0
-5676,27.2,0.7,0
-5681,27.2,0.8,0
-5725,25.6,0.8,0
-5733,58.8,0.8,0
-5786,58.8,0.9,0
-5821,58.8,0.2,0
-5826,58.8,0,0
-5831,58.8,-0.2,0
-5836,58.8,-0.4,0
-5861,58.8,-0.5,0
-5966,58.8,-0.4,0
-5971,58.8,-0.3,0
-5976,58.8,-0.2,0
-5981,58.8,-0.1,0
-5986,58.8,0,0
-5991,58.8,0.1,0
-6036,58.8,0.3,0
-6041,58.8,0.5,0
-6046,58.8,0.7,0
-6051,58.8,0.8,0
-6131,58.8,1,0
-6161,58.8,1.2,0
-6171,58.2,1.2,0
-6187,68.3,1.2,0
-6196,68.3,1.4,0
-6201,68.3,1.6,0
-6206,68.3,1.8,0
-6236,68.3,2,0
-6251,68.3,2.2,0
-6291,68.3,2.4,0
-6306,68.3,2.6,0
-6366,68.3,2.4,0
-6371,68.3,2.2,0
-6376,68.3,2,0
-6381,68.3,1.8,0
-6386,68.3,1.6,0
-6391,68.3,1.4,0
-6396,68.3,1.2,0
-6401,68.3,1,0
-6446,68.3,0.8,0
-6451,68.3,0.6,0
-6456,68.3,0.4,0
-6461,68.3,0.2,0
-6466,68.3,0.1,0
-6471,68.3,0,0
-6506,68.3,0.2,0
-6546,68.3,0,0
-6566,68.3,-0.1,0
-6586,68.3,-0.2,0
-6611,68.3,-0.3,0
-6631,68.3,-0.35,0
-6636,68.3,-0.4,0
-6641,68.3,-0.45,0
-6646,68.3,-0.5,0
-6651,68.3,-0.55,0
-6656,68.3,-0.6,0
-6661,68.3,-0.65,0
-6666,68.3,-0.7,0
-6676,68.3,-0.8,0
-6696,68.3,-0.9,0
-6746,68.3,-1,0
-6751,68.3,-1.1,0
-6756,68.3,-1.2,0
-6761,68.3,-1.3,0
-6766,0,-1.4,15
-6767,85.8,-1.4,0
-6771,85.8,-1.5,0
-6776,85.8,-1.6,0
-6781,85.8,-1.7,0
-6786,85.8,-1.8,0
-6791,85.8,-1.9,0
-7321,85.8,-1.8,0
-7376,85.8,-1.7,0
-7381,85.8,-1.6,0
-7386,85.8,-1.5,0
-7391,85.8,-1.4,0
-7396,85.8,-1.3,0
-7401,85.8,-1.2,0
-7406,85.8,-1.1,0
-7411,85.8,-1,0
-7416,85.8,-0.9,0
-7421,85.8,-0.8,0
-7426,85.8,-0.7,0
-7431,85.8,-0.6,0
-7436,85.8,-0.5,0
-7496,85.8,-0.4,0
-7531,85.8,-0.3,0
-7566,85.8,-0.1,0
-7661,85.8,0,0
-7846,85.8,0.1,0
-7931,85.8,0.2,0
-7968,80.2,0.2,0
-7990,85.8,0.2,0
-8106,85.8,0.3,0
-8161,85.8,0.4,0
-8246,85.8,0.5,0
-8276,85.8,0.6,0
-8436,85.8,0.5,0
-8451,85.8,0.4,0
-8476,85.8,0.3,0
-8486,85.8,0.25,0
-8491,85.8,0.2,0
-8496,85.8,0.15,0
-8501,85.8,0.1,0
-8506,85.8,0.05,0
-8531,85.8,0,0
-8696,85.8,-0.05,0
-8736,85.8,-0.1,0
-8751,85.8,-0.15,0
-8776,85.8,-0.2,0
-8781,85.8,-0.25,0
-8786,85.8,-0.3,0
-8791,85.8,-0.35,0
-8796,85.8,-0.4,0
-8971,85.8,-0.5,0
-9021,85.8,-0.55,0
-9051,85.8,-0.6,0
-9276,85.8,-0.5,0
-9301,85.8,-0.45,0
-9306,85.8,-0.4,0
-9396,85.8,-0.3,0
-9452,79.2,-0.3,0
-9466,79.2,-0.25,0
-9474,82,-0.25,0
-9636,82,-0.3,0
-9641,82,-0.35,0
-9646,82,-0.4,0
-9716,82,-0.35,0
-9741,82,-0.3,0
-9746,82,-0.25,0
-9751,82,-0.2,0
-9756,82,-0.15,0
-9761,82,-0.1,0
-9766,82,-0.05,0
-9771,82,0,0
-9776,82,0.05,0
-9796,82,0.1,0
-9801,82,0.15,0
-9806,82,0.2,0
-9811,82,0.25,0
-9816,82,0.3,0
-9821,82,0.35,0
-9826,82,0.4,0
-9861,82,0.35,0
-9866,82,0.3,0
-9871,82,0.25,0
-9876,82,0.2,0
-9881,82,0.15,0
-9886,82,0.1,0
-9891,82,0.05,0
-9896,82,0,0
-9911,82,-0.1,0
-9916,82,-0.2,0
-9921,82,-0.3,0
-9926,82,-0.35,0
-9941,82,-0.3,0
-9962,0,-0.3,3
\ No newline at end of file
+<s>,<v>,<grad>,<stop> ,<PTO>
+0,0,0,2,0
+1,51.2,0,0,0
+11,51.2,0.2,0,0
+16,51.2,0.4,0,0
+21,51.2,0.6,0,0
+26,51.2,0.8,0,0
+31,51.2,1,0,0
+41,51.2,1.2,0,0
+46,51.2,1.3,0,0
+156,51.2,1.5,0,0
+161,51.2,1.6,0,0
+560,65.5,1.6,0,0
+741,65.5,1.5,0,0
+746,65.5,1.4,0,0
+751,65.5,1.3,0,0
+756,65.5,1,0,0
+761,65.5,0.5,0,0
+766,65.5,0,0,0
+796,65.5,-0.5,0,0
+811,65.5,-1,0,0
+841,65.5,-1.4,0,0
+856,65.5,-1.6,0,0
+876,65.5,-1.8,0,0
+906,65.5,-2,0,0
+1046,65.5,-1.7,0,0
+1056,65.5,-1.2,0,0
+1076,65.5,-0.8,0,0
+1081,65.5,-0.6,0,0
+1086,65.5,-0.4,0,0
+1091,65.5,-0.2,0,0
+1096,65.5,0,0,0
+1126,65.5,0.3,0,0
+1131,65.5,0.6,0,0
+1136,65.5,0.9,0,0
+1140,21,0.9,0,0
+1141,21,1.2,0,0
+1146,57.8,1.2,0,0
+1181,57.8,1.3,0,0
+1201,57.8,1.5,0,0
+1206,57.8,1.7,0,0
+1211,57.8,1.9,0,0
+1381,57.8,1.8,0,0
+1406,57.8,1.7,0,0
+1456,57.8,1.6,0,0
+1461,57.8,1.5,0,0
+1466,57.8,1.4,0,0
+1471,57.8,1.3,0,0
+1476,57.8,1.2,0,0
+1481,57.8,1.1,0,0
+1506,57.8,0.9,0,0
+1511,57.8,0.7,0,0
+1516,57.8,0.5,0,0
+1521,57.8,0.3,0,0
+1526,57.8,0.1,0,0
+1531,57.8,-0.1,0,0
+1551,57.8,-0.2,0,0
+1561,57.8,-0.3,0,0
+1566,57.8,-0.4,0,0
+1571,57.8,-0.5,0,0
+1576,57.8,-0.6,0,0
+1581,57.8,-0.7,0,0
+1586,57.8,-0.8,0,0
+1621,57.8,-1,0,0
+1751,57.8,-0.8,0,0
+1761,57.8,-0.5,0,0
+1766,57.8,-0.2,0,0
+1771,57.8,0,0,0
+1786,57.8,0.2,0,0
+1791,57.8,0.4,0,0
+1796,57.8,0.6,0,0
+1801,57.8,0.8,0,0
+1806,57.8,1,0,0
+1811,57.8,1.2,0,0
+1816,57.8,1.4,0,0
+1821,57.8,1.6,0,0
+1826,57.8,1.8,0,0
+1842,41.5,1.8,0,0
+1853,46.5,1.8,0,0
+1946,46.5,1.7,0,0
+1951,46.5,1.6,0,0
+1956,46.5,1.5,0,0
+1961,46.5,1.4,0,0
+1966,46.5,1.3,0,0
+1971,46.5,1.2,0,0
+1976,46.5,1.1,0,0
+1981,46.5,1,0,0
+1986,46.5,0.9,0,0
+1991,46.5,0.8,0,0
+1996,46.5,0.7,0,0
+1998,27.2,0.7,0,0
+2001,27.2,0.6,0,0
+2005,37.8,0.6,0,0
+2006,37.8,0.4,0,0
+2011,37.8,0.2,0,0
+2016,37.8,0,0,0
+2021,37.8,-0.2,0,0
+2026,37.8,-0.4,0,0
+2031,37.8,-0.6,0,0
+2036,37.8,-0.8,0,0
+2041,37.8,-1,0,0
+2046,37.8,-1.2,0,0
+2051,37.8,-1.4,0,0
+2056,37.8,-1.6,0,0
+2061,37.8,-1.8,0,0
+2066,37.8,-2,0,0
+2206,0,-2,3,0
+2207,23,-2,0,0
+2271,23,-1.8,0,0
+2276,23,-1.6,0,0
+2281,23,-1.3,0,0
+2282,22.9,-1.3,0,0
+2286,22.9,-1,0,0
+2288,23,-1,0,0
+2291,23,-0.7,0,0
+2296,23,-0.4,0,0
+2301,23,-0.2,0,0
+2306,23,0,0,0
+2321,23,0.1,0,0
+2346,15.4,0.1,0,0
+2350,38.8,0.1,0,0
+2376,38.8,0.2,0,0
+2587,0,0.2,5,0
+2588,9,0,0,0
+2607,0,0,2,1
+2608,12,0,0,0
+2647,0,0,2,1
+2648,10,0,0,0
+2667,0,0,2,1
+2668,13,0,0,0
+2707,0,0,2,1
+2708,11,0,0,0
+2727,0,0,2,1
+2728,14,0,0,0
+2767,0,0,2,1
+2768,9,0,0,0
+2787,0,0,2,1
+2788,12,0,0,0
+2827,0,0,2,1
+2828,10,0,0,0
+2847,0,0,2,1
+2848,13,0,0,0
+2887,0,0,2,1
+2888,11,0,0,0
+2907,0,0,2,1
+2908,14,0,0,0
+2947,0,0,2,1
+2948,9,0,0,0
+2967,0,0,2,1
+2968,12,0,0,0
+3007,0,0,2,1
+3008,10,0,0,0
+3027,0,0,2,1
+3028,13,0,0,0
+3067,0,0,2,1
+3068,11,0,0,0
+3087,0,0,2,1
+3088,14,0,0,0
+3127,0,0,2,1
+3128,9,0,0,0
+3147,0,0,2,1
+3148,12,0,0,0
+3187,0,0,2,1
+3188,10,0,0,0
+3207,0,0,2,1
+3208,13,0,0,0
+3247,0,0,2,1
+3248,11,0,0,0
+3267,0,0,2,1
+3268,14,0,0,0
+3307,0,0,2,1
+3308,9,0,0,0
+3327,0,0,2,1
+3328,12,0,0,0
+3367,0,0,2,1
+3368,10,0,0,0
+3387,0,0,2,1
+3388,13,0,0,0
+3427,0,0,2,1
+3428,11,0,0,0
+3447,0,0,2,1
+3448,14,0,0,0
+3487,0,0,2,1
+3488,9,0,0,0
+3507,0,0,2,1
+3508,12,0,0,0
+3547,0,0,2,1
+3548,10,0,0,0
+3567,0,0,2,1
+3568,13,0,0,0
+3607,0,0,2,1
+3608,11,0,0,0
+3627,0,0,2,1
+3628,14,0,0,0
+3667,0,0,2,1
+3668,9,0,0,0
+3687,0,0,2,1
+3688,12,0,0,0
+3727,0,0,2,1
+3728,10,0,0,0
+3747,0,0,2,1
+3748,13,0,0,0
+3787,0,0,2,1
+3788,11,0,0,0
+3807,0,0,2,1
+3808,14,0,0,0
+3847,0,0,2,1
+3848,9,0,0,0
+3867,0,0,2,1
+3868,12,0,0,0
+3907,0,0,2,1
+3908,10,0,0,0
+3927,0,0,2,1
+3928,13,0,0,0
+3967,0,0,2,1
+3968,11,0,0,0
+3987,0,0,2,1
+3988,14,0,0,0
+4027,0,0,2,1
+4028,9,0,0,0
+4047,0,0,2,1
+4048,12,0,0,0
+4087,0,0,2,1
+4088,10,0,0,0
+4107,0,0,2,1
+4108,13,0,0,0
+4147,0,0,2,1
+4148,11,0,0,0
+4167,0,0,2,1
+4168,14,0,0,0
+4207,0,0,2,1
+4208,9,0,0,0
+4227,0,0,2,1
+4228,12,0,0,0
+4267,0,0,2,1
+4268,10,0,0,0
+4287,0,0,2,1
+4288,13,0,0,0
+4327,0,0,2,1
+4328,11,0,0,0
+4347,0,0,2,1
+4348,14,0,0,0
+4387,0,0,2,1
+4388,9,0,0,0
+4407,0,0,2,1
+4408,12,0,0,0
+4447,0,0,2,1
+4448,10,0,0,0
+4467,0,0,2,1
+4468,13,0,0,0
+4507,0,0,2,1
+4508,11,0,0,0
+4527,0,0,2,1
+4528,14,0,0,0
+4567,0,0,2,1
+4568,9,0,0,0
+4587,0,0,2,1
+4588,12,0,0,0
+4627,0,0,2,1
+4628,10,0,0,0
+4647,0,0,2,1
+4648,13,0,0,0
+4687,0,0,2,1
+4688,11,0,0,0
+4707,0,0,2,1
+4708,14,0,0,0
+4747,0,0,2,1
+4748,9,0,0,0
+4767,0,0,2,1
+4768,12,0,0,0
+4807,0,0,2,1
+4808,10,0,0,0
+4827,0,0,2,1
+4828,13,0,0,0
+4867,0,0,2,1
+4868,11,0,0,0
+4887,0,0,2,1
+4888,14,0,0,0
+4927,0,0,2,1
+4928,9,0,0,0
+4947,0,0,2,1
+4948,12,0,0,0
+4987,0,0,2,1
+4988,10,0,0,0
+5007,0,0,2,1
+5008,13,0,0,0
+5047,0,0,2,1
+5048,11,0,0,0
+5067,0,0,2,1
+5068,14,0,0,0
+5107,0,0,2,1
+5108,9,0,0,0
+5127,0,0,2,1
+5128,12,0,0,0
+5167,0,0,2,1
+5168,10,0,0,0
+5187,0,0,2,1
+5188,13,0,0,0
+5227,0,0,2,1
+5228,11,0,0,0
+5247,0,0,2,1
+5248,14,0,0,0
+5287,0,0,2,1
+5288,9,0,0,0
+5307,0,0,2,1
+5308,12,0,0,0
+5347,0,0,2,1
+5348,10,0,0,0
+5367,0,0,2,1
+5368,13,0,0,0
+5407,0,0,2,1
+5408,11,0,0,0
+5427,0,0,2,1
+5428,14,0,0,0
+5467,0,0,2,1
+5468,10,0.5,0,0
+5482,12.4,0.5,0,0
+5515,20.8,0.5,0,0
+5539,20.8,0.4,0,0
+5544,20.8,0.3,0,0
+5549,20.8,0.2,0,0
+5554,20.8,0.1,0,0
+5559,20.8,0,0,0
+5597,10,0,0,0
+5600,16.3,0,0,0
+5629,16.3,-0.1,0,0
+5634,16.3,-0.2,0,0
+5639,16.3,-0.3,0,0
+5642,0,-0.3,38,0
+5643,16,-0.3,0,0
+5644,16,-0.4,0,0
+5649,16,-0.5,0,0
+5654,16,-0.6,0,0
+5659,16,-0.7,0,0
+5664,16,-0.8,0,0
+5693,10,-0.8,0,0
+5695,36.2,-0.8,0,0
+5814,36.2,-0.9,0,0
+5819,36.2,-1,0,0
+5824,36.2,-1.1,0,0
+5829,36.2,-1.2,0,0
+5834,36.2,-1.3,0,0
+5891,14.4,-1.3,0,0
+5895,33.9,-1.3,0,0
+5899,33.9,-1.5,0,0
+5904,33.9,-1.7,0,0
+5974,33.9,-1.9,0,0
+6124,33.9,-1.7,0,0
+6129,33.9,-1.5,0,0
+6133,14.7,-1.5,0,0
+6134,14.7,-1.3,0,0
+6137,23.1,-1.3,0,0
+6139,23.1,-1.1,0,0
+6144,23.1,-0.9,0,0
+6149,23.1,-0.7,0,0
+6154,23.1,-0.5,0,0
+6159,23.1,-0.3,0,0
+6164,23.1,-0.1,0,0
+6169,23.1,0,0,0
+6210,0,0,14,0
+6211,64.8,0,0,0
+6294,64.8,0.1,0,0
+6299,64.8,0.2,0,0
+6304,64.8,0.3,0,0
+6309,64.8,0.4,0,0
+6314,64.8,0.5,0,0
+6394,64.8,0.7,0,0
+6409,64.8,0.9,0,0
+6459,64.8,1.1,0,0
+6464,64.8,1.3,0,0
+6469,64.8,1.5,0,0
+6489,64.8,1.6,0,0
+6704,64.8,1.5,0,0
+6709,64.8,1.4,0,0
+6714,64.8,1.3,0,0
+6719,64.8,1.2,0,0
+6724,64.8,1.1,0,0
+6729,64.8,1,0,0
+6734,64.8,0.9,0,0
+6739,64.8,0.8,0,0
+6744,64.8,0.7,0,0
+6749,64.8,0.6,0,0
+6754,64.8,0.5,0,0
+6759,64.8,0.4,0,0
+6944,64.8,0.5,0,0
+6945,10,0.5,0,0
+6946,27.2,0.5,0,0
+6949,27.2,0.6,0,0
+6954,27.2,0.7,0,0
+6959,27.2,0.8,0,0
+7003,25.6,0.8,0,0
+7011,58.8,0.8,0,0
+7064,58.8,0.9,0,0
+7099,58.8,0.2,0,0
+7104,58.8,0,0,0
+7109,58.8,-0.2,0,0
+7114,58.8,-0.4,0,0
+7139,58.8,-0.5,0,0
+7244,58.8,-0.4,0,0
+7249,58.8,-0.3,0,0
+7254,58.8,-0.2,0,0
+7259,58.8,-0.1,0,0
+7264,58.8,0,0,0
+7269,58.8,0.1,0,0
+7314,58.8,0.3,0,0
+7319,58.8,0.5,0,0
+7324,58.8,0.7,0,0
+7329,58.8,0.8,0,0
+7409,58.8,1,0,0
+7439,58.8,1.2,0,0
+7449,58.2,1.2,0,0
+7465,68.3,1.2,0,0
+7474,68.3,1.4,0,0
+7479,68.3,1.6,0,0
+7484,68.3,1.8,0,0
+7514,68.3,2,0,0
+7529,68.3,2.2,0,0
+7569,68.3,2.4,0,0
+7584,68.3,2.6,0,0
+7644,68.3,2.4,0,0
+7649,68.3,2.2,0,0
+7654,68.3,2,0,0
+7659,68.3,1.8,0,0
+7664,68.3,1.6,0,0
+7669,68.3,1.4,0,0
+7674,68.3,1.2,0,0
+7679,68.3,1,0,0
+7724,68.3,0.8,0,0
+7729,68.3,0.6,0,0
+7734,68.3,0.4,0,0
+7739,68.3,0.2,0,0
+7744,68.3,0.1,0,0
+7749,68.3,0,0,0
+7784,68.3,0.2,0,0
+7824,68.3,0,0,0
+7844,68.3,-0.1,0,0
+7864,68.3,-0.2,0,0
+7889,68.3,-0.3,0,0
+7909,68.3,-0.35,0,0
+7914,68.3,-0.4,0,0
+7919,68.3,-0.45,0,0
+7924,68.3,-0.5,0,0
+7929,68.3,-0.55,0,0
+7934,68.3,-0.6,0,0
+7939,68.3,-0.65,0,0
+7944,68.3,-0.7,0,0
+7954,68.3,-0.8,0,0
+7974,68.3,-0.9,0,0
+8024,68.3,-1,0,0
+8029,68.3,-1.1,0,0
+8034,68.3,-1.2,0,0
+8039,68.3,-1.3,0,0
+8044,0,-1.4,15,0
+8045,85.8,-1.4,0,0
+8049,85.8,-1.5,0,0
+8054,85.8,-1.6,0,0
+8059,85.8,-1.7,0,0
+8064,85.8,-1.8,0,0
+8069,85.8,-1.9,0,0
+8599,85.8,-1.8,0,0
+8654,85.8,-1.7,0,0
+8659,85.8,-1.6,0,0
+8664,85.8,-1.5,0,0
+8669,85.8,-1.4,0,0
+8674,85.8,-1.3,0,0
+8679,85.8,-1.2,0,0
+8684,85.8,-1.1,0,0
+8689,85.8,-1,0,0
+8694,85.8,-0.9,0,0
+8699,85.8,-0.8,0,0
+8704,85.8,-0.7,0,0
+8709,85.8,-0.6,0,0
+8714,85.8,-0.5,0,0
+8774,85.8,-0.4,0,0
+8809,85.8,-0.3,0,0
+8844,85.8,-0.1,0,0
+8939,85.8,0,0,0
+9124,85.8,0.1,0,0
+9209,85.8,0.2,0,0
+9246,80.2,0.2,0,0
+9268,85.8,0.2,0,0
+9384,85.8,0.3,0,0
+9439,85.8,0.4,0,0
+9524,85.8,0.5,0,0
+9554,85.8,0.6,0,0
+9714,85.8,0.5,0,0
+9729,85.8,0.4,0,0
+9754,85.8,0.3,0,0
+9764,85.8,0.25,0,0
+9769,85.8,0.2,0,0
+9774,85.8,0.15,0,0
+9779,85.8,0.1,0,0
+9784,85.8,0.05,0,0
+9809,85.8,0,0,0
+9974,85.8,-0.05,0,0
+10014,85.8,-0.1,0,0
+10029,85.8,-0.15,0,0
+10054,85.8,-0.2,0,0
+10059,85.8,-0.25,0,0
+10064,85.8,-0.3,0,0
+10069,85.8,-0.35,0,0
+10074,85.8,-0.4,0,0
+10249,85.8,-0.5,0,0
+10299,85.8,-0.55,0,0
+10329,85.8,-0.6,0,0
+10554,85.8,-0.5,0,0
+10579,85.8,-0.45,0,0
+10584,85.8,-0.4,0,0
+10674,85.8,-0.3,0,0
+10730,79.2,-0.3,0,0
+10744,79.2,-0.25,0,0
+10752,82,-0.25,0,0
+10914,82,-0.3,0,0
+10919,82,-0.35,0,0
+10924,82,-0.4,0,0
+10994,82,-0.35,0,0
+11019,82,-0.3,0,0
+11024,82,-0.25,0,0
+11029,82,-0.2,0,0
+11034,82,-0.15,0,0
+11039,82,-0.1,0,0
+11044,82,-0.05,0,0
+11049,82,0,0,0
+11054,82,0.05,0,0
+11074,82,0.1,0,0
+11079,82,0.15,0,0
+11084,82,0.2,0,0
+11089,82,0.25,0,0
+11094,82,0.3,0,0
+11099,82,0.35,0,0
+11104,82,0.4,0,0
+11139,82,0.35,0,0
+11144,82,0.3,0,0
+11149,82,0.25,0,0
+11154,82,0.2,0,0
+11159,82,0.15,0,0
+11164,82,0.1,0,0
+11169,82,0.05,0,0
+11174,82,0,0,0
+11189,82,-0.1,0,0
+11194,82,-0.2,0,0
+11199,82,-0.3,0,0
+11204,82,-0.35,0,0
+11219,82,-0.3,0,0
+11240,0,-0.3,3,0
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Resources/Declaration/MissionCycles/MunicipalUtility_PTO_generic.vptoc b/VectoCore/VectoCore/Resources/Declaration/MissionCycles/MunicipalUtility_PTO_generic.vptoc
new file mode 100644
index 0000000000000000000000000000000000000000..68fafbca36495667518bc1950e8875bc466bd1de
--- /dev/null
+++ b/VectoCore/VectoCore/Resources/Declaration/MissionCycles/MunicipalUtility_PTO_generic.vptoc
@@ -0,0 +1,25 @@
+ <t>,<Engine speed>,<PTO Torque>
+0,990,65
+1,990,65
+2,990,65
+3,990,65
+4,990,65
+5,990,260
+6,990,260
+7,990,260
+8,990,260
+9,990,200
+10,990,200
+11,990,200
+12,990,200
+13,990,200
+14,990,200
+15,990,200
+16,990,200
+17,990,200
+18,990,200
+19,990,200
+20,990,200
+21,990,200
+22,990,200
+23,990,200
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Resources/Declaration/MissionCycles/MunicipalUtility_PTO_generic.vptol b/VectoCore/VectoCore/Resources/Declaration/MissionCycles/MunicipalUtility_PTO_generic.vptol
new file mode 100644
index 0000000000000000000000000000000000000000..c4293fdd39cb0678b91e0b0aa193f42712aad6dc
--- /dev/null
+++ b/VectoCore/VectoCore/Resources/Declaration/MissionCycles/MunicipalUtility_PTO_generic.vptol
@@ -0,0 +1,25 @@
+<Engine speed> [rpm], <PTO Torque> [Nm]
+400,5.4
+600,8.0
+800,11.4
+1000,15.5
+1200,20.2
+1400,25.7
+1600,31.8
+1800,38.6
+2000,46.2
+2200,54.4
+2400,63.3
+2600,72.9
+2800,83.2
+3000,94.2
+3200,105.9
+3400,118.3
+3600,131.4
+3800,145.2
+4000,159.6
+4200,174.8
+4400,190.7
+4600,207.2
+4800,224.5
+5000,242.4
diff --git a/VectoCore/VectoCore/Resources/Declaration/SegmentTable.csv b/VectoCore/VectoCore/Resources/Declaration/SegmentTable.csv
index 7705976756e55cc24d14bbb7ebd8d5489f52d3f5..e8dba5ade939beb38d99ab44623644ae99b2a903 100644
--- a/VectoCore/VectoCore/Resources/Declaration/SegmentTable.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/SegmentTable.csv
@@ -1,29 +1,29 @@
-Valid,Vehicle Category,Axle Conf.,GVW_Min,GVW_Max,HDV class,Height,DesignSpeed,Body,Trailer,EMS ,.vacc file,Cross Wind Correction - Long haul,Cross Wind Correction - EMS,Cross Wind Correction - Other,Truck Axles - Long haul,Truck Axles - Other,Trailer Axles - Long haul,Trailer Axles - Other,Truck Axles - Long haul EMS,Truck Axles - Other EMS,Trailer Axles - Long haul EMS,Trailer Axles - Other EMS,Long haul ,Long haul EMS ,Regional delivery ,Regional delivery EMS,Urban delivery ,Municipal utility,Construction,Heavy Urban,Urban,Suburban,Interurban,Coach,CdxA_Construction
+Valid,Vehicle Category,Axle Conf.,GVW_Min,GVW_Max,HDV class,Height,DesignSpeed,Body,Trailer,EMS ,.vacc file,Cross Wind Correction - Long haul,Cross Wind Correction - EMS,Cross Wind Correction - Other,Truck Axles - Long haul,Truck Axles - Other,Trailer Axles - Long haul,Trailer Axles - Other,Truck Axles - Long haul EMS,Truck Axles - Other EMS,Trailer Axles - Long haul EMS,Trailer Axles - Other EMS,Long haul ,Long haul EMS ,Regional delivery ,Regional delivery EMS,Urban delivery ,Municipal utility,Construction,Heavy Urban,Urban,Suburban,Interurban,Coach,CdxA_Construction,BodyWeight_MunicipalUtility
## 0 ,RigidTruck ,4x2 ,0 ,7.5 ,0 ,4.0 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- , ,pc10(R)/pc50(R) , ,pc10(R)/pc50(R) ,- ,- ,- ,- ,- ,- ,- , ,
-1 ,RigidTruck ,4x2 ,7.5 ,10 ,1 ,3.6 ,85 ,B1 , , ,Truck.vacc, , ,RigidSolo , ,45/55 , , , , , , ,- ,- ,pc10(R)/pc50(R) ,- ,pc10(R)/pc50(R) ,- ,- ,- ,- ,- ,- ,- ,
-1 ,Tractor ,4x2 ,7.5 ,10 ,1 ,3.6 ,85 ,B1 , , ,Truck.vacc, , ,RigidSolo , ,45/55 , , , , , , ,- ,- ,pc10(R)/pc50(R) ,- ,pc10(R)/pc50(R) ,- ,- ,- ,- ,- ,- ,- ,
-1 ,RigidTruck ,4x2 ,10 ,12 ,2 ,3.75 ,85 ,B2 ,T1 , ,Truck.vacc,RigidTrailer , ,RigidSolo ,22.5/32.5 ,45/55 ,45 , , , , , ,pc10(R)/pc75(R) ,- ,pc10(R)/pc50(R) ,- ,pc10(R)/pc50(R) ,- ,- ,- ,- ,- ,- ,- ,
-1 ,Tractor ,4x2 ,10 ,12 ,2 ,3.75 ,85 ,B2 ,T1 , ,Truck.vacc,RigidTrailer , ,RigidSolo ,22.5/32.5 ,45/55 ,45 , , , , , ,pc10(R)/pc75(R) ,- ,pc10(R)/pc50(R) ,- ,pc10(R)/pc50(R) ,- ,- ,- ,- ,- ,- ,- ,
-1 ,RigidTruck ,4x2 ,12 ,16 ,3 ,3.9 ,85 ,B3 , , ,Truck.vacc, , ,RigidSolo , ,40/60 , , , , , , ,- ,- ,pc10(R)/pc50(R) ,- ,pc10(R)/pc50(R) ,- ,- ,- ,- ,- ,- ,- ,
-1 ,Tractor ,4x2 ,12 ,16 ,3 ,3.9 ,85 ,B3 , , ,Truck.vacc, , ,RigidSolo , ,40/60 , , , , , , ,- ,- ,pc10(R)/pc50(R) ,- ,pc10(R)/pc50(R) ,- ,- ,- ,- ,- ,- ,- ,
-1 ,RigidTruck ,4x2 ,16 ,99 ,4 ,4.0 ,85 ,B4 ,T2 , ,Truck.vacc,RigidTrailer , ,RigidSolo ,20/30 ,45/55 ,50 , , , , , ,1900/14000 ,- ,900/4400 ,- ,- ,600/3000 ,- ,- ,- ,- ,- ,- ,
-1 ,Tractor ,4x2 ,16 ,99 ,5 ,4.0 ,85 , ,ST1 ,ST1+T2,Truck.vacc,TractorSemitrailer ,RigidTrailer ,TractorSemitrailer ,20/25 ,25/25 ,55 ,50 ,15/20 ,17.5/25 ,40/25 ,35/22.5 ,2600/19300 ,3500/26500 ,2600/12900 ,3500/17500 ,- ,- ,- ,- ,- ,- ,- ,- ,
-0 ,RigidTruck ,4x4 ,7.5 ,16 ,6 ,3.75 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,- ,- ,- ,??? ,??? ,- ,- ,- ,- ,- ,
-0 ,RigidTruck ,4x4 ,16 ,99 ,7 ,4.0 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- ,
-0 ,Tractor ,4x4 ,16 ,99 ,8 ,4.0 ,85 , , , ,Truck.vacc, , ,TractorSemitrailer , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- ,
-1 ,RigidTruck ,6x2 ,0 ,99 ,9 ,4.0 ,85 ,B5 ,T2 ,D+ST1 ,Truck.vacc,RigidTrailer ,RigidTrailer ,RigidSolo ,20/30/15 ,35/40/25 ,35 , ,15/20/10 ,17.5/20/10 ,22.5/32.5 ,22.5/30 ,2600/19300 ,3500/26500 ,1400/7100 ,3500/17500 ,- ,1200/6000 ,- ,- ,- ,- ,- ,- ,
-1 ,Tractor ,6x2 ,0 ,99 ,10 ,4.0 ,85 , ,ST1 ,ST1+T2,Truck.vacc,TractorSemitrailer ,RigidTrailer ,TractorSemitrailer ,15/10/20 ,20/10/20 ,55 ,50 ,12.5/15/10 ,15/15/10 ,37.5/25 ,35/25 ,2600/19300 ,3500/26500 ,2600/12900 ,3500/17500 ,- ,- ,- ,- ,- ,- ,- ,- ,
-1 ,RigidTruck ,6x4 ,0 ,99 ,11 ,4.0 ,85 ,B5 ,T2 ,D+ST1 ,Truck.vacc,RigidTrailer ,RigidTrailer ,RigidSolo ,20/22.5/22.5 ,35/35/30 ,35 , ,15/20/10 ,17.5/20/10 ,22.5/32.5 ,22.5/30 ,2600/19300 ,3500/26500 ,1400/7100 ,3500/17500 ,- ,1200/6000 ,1400/7100 ,- ,- ,- ,- ,- ,8.5
-1 ,Tractor ,6x4 ,0 ,99 ,12 ,4.0 ,85 , ,ST1 ,ST1+T2,Truck.vacc,TractorSemitrailer ,RigidTrailer ,TractorSemitrailer ,15/15/15 ,20/15/15 ,55 ,50 ,12.5/15/10 ,15/15/10 ,37.5/25 ,35/25 ,2600/19300 ,3500/26500 ,2600/12900 ,3500/17500 ,- ,- ,2600/12900 ,- ,- ,- ,- ,- ,8.8
-0 ,RigidTruck ,6x6 ,0 ,99 ,13 ,3.6 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- ,
-0 ,Tractor ,6x6 ,0 ,99 ,14 ,3.6 ,85 , , , ,Truck.vacc, , ,TractorSemitrailer , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- ,
-0 ,RigidTruck ,8x2 ,0 ,99 ,15 ,3.6 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,??? ,- ,- ,- ,- ,- ,- ,- ,- ,- ,
-1 ,RigidTruck ,8x4 ,0 ,99 ,16 ,3.6 ,85 , , , ,Truck.vacc, , ,RigidSolo , ,25/25/25/25 , , , , , , ,- ,- ,- ,- ,- ,- ,2600/12900 ,- ,- ,- ,- ,- ,
-0 ,RigidTruck ,8x6 ,0 ,99 ,17 ,3.6 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- ,9.0
-0 ,RigidTruck ,8x8 ,0 ,99 ,17 ,4.0 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- ,
-0 ,CityBus ,4x2 ,0 ,18 ,B1 ,4.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,??? ,??? ,??? ,- ,- ,
-0 ,InterurbanBus ,4x2 ,0 ,18 ,B2 ,4.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,??? ,- ,
-0 ,Coach ,4x2 ,0 ,18 ,B3 ,4.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,??? ,
-0 ,CityBus ,6x2 ,18 ,99 ,B4 ,4.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,??? ,??? ,??? ,- ,- ,
-0 ,InterurbanBus ,6x2 ,18 ,99 ,B5 ,4.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,??? ,- ,
-0 ,Coach ,6x2 ,18 ,99 ,B6 ,4.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,??? ,
\ No newline at end of file
+1 ,RigidTruck ,4x2 ,7.5 ,10 ,1 ,3.6 ,85 ,B1 , , ,Truck.vacc, , ,RigidSolo , ,45/55 , , , , , , ,- ,- ,pc10(R)/pc50(R) ,- ,pc10(R)/pc50(R) ,- ,- ,- ,- ,- ,- ,- , ,
+1 ,Tractor ,4x2 ,7.5 ,10 ,1 ,3.6 ,85 ,B1 , , ,Truck.vacc, , ,RigidSolo , ,45/55 , , , , , , ,- ,- ,pc10(R)/pc50(R) ,- ,pc10(R)/pc50(R) ,- ,- ,- ,- ,- ,- ,- , ,
+1 ,RigidTruck ,4x2 ,10 ,12 ,2 ,3.75 ,85 ,B2 ,T1 , ,Truck.vacc,RigidTrailer , ,RigidSolo ,22.5/32.5 ,45/55 ,45 , , , , , ,pc10(R)/pc75(R) ,- ,pc10(R)/pc50(R) ,- ,pc10(R)/pc50(R) ,- ,- ,- ,- ,- ,- ,- , ,
+1 ,Tractor ,4x2 ,10 ,12 ,2 ,3.75 ,85 ,B2 ,T1 , ,Truck.vacc,RigidTrailer , ,RigidSolo ,22.5/32.5 ,45/55 ,45 , , , , , ,pc10(R)/pc75(R) ,- ,pc10(R)/pc50(R) ,- ,pc10(R)/pc50(R) ,- ,- ,- ,- ,- ,- ,- , ,
+1 ,RigidTruck ,4x2 ,12 ,16 ,3 ,3.9 ,85 ,B3 , , ,Truck.vacc, , ,RigidSolo , ,40/60 , , , , , , ,- ,- ,pc10(R)/pc50(R) ,- ,pc10(R)/pc50(R) ,- ,- ,- ,- ,- ,- ,- , ,
+1 ,Tractor ,4x2 ,12 ,16 ,3 ,3.9 ,85 ,B3 , , ,Truck.vacc, , ,RigidSolo , ,40/60 , , , , , , ,- ,- ,pc10(R)/pc50(R) ,- ,pc10(R)/pc50(R) ,- ,- ,- ,- ,- ,- ,- , ,
+1 ,RigidTruck ,4x2 ,16 ,99 ,4 ,4.0 ,85 ,B4 ,T2 , ,Truck.vacc,RigidTrailer , ,RigidSolo ,20/30 ,45/55 ,50 , , , , , ,1900/14000 ,- ,900/4400 ,- ,- ,600/3000 ,- ,- ,- ,- ,- ,- , , 6000
+1 ,Tractor ,4x2 ,16 ,99 ,5 ,4.0 ,85 , ,ST1 ,ST1+T2,Truck.vacc,TractorSemitrailer ,RigidTrailer ,TractorSemitrailer ,20/25 ,25/25 ,55 ,50 ,15/20 ,17.5/25 ,40/25 ,35/22.5 ,2600/19300 ,3500/26500 ,2600/12900 ,3500/17500 ,- ,- ,- ,- ,- ,- ,- ,- , ,
+0 ,RigidTruck ,4x4 ,7.5 ,16 ,6 ,3.75 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,- ,- ,- ,??? ,??? ,- ,- ,- ,- ,- , ,
+0 ,RigidTruck ,4x4 ,16 ,99 ,7 ,4.0 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- , ,
+0 ,Tractor ,4x4 ,16 ,99 ,8 ,4.0 ,85 , , , ,Truck.vacc, , ,TractorSemitrailer , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- , ,
+1 ,RigidTruck ,6x2 ,0 ,99 ,9 ,4.0 ,85 ,B5 ,T2 ,D+ST1 ,Truck.vacc,RigidTrailer ,RigidTrailer ,RigidSolo ,20/30/15 ,35/40/25 ,35 , ,15/20/10 ,17.5/20/10 ,22.5/32.5 ,22.5/30 ,2600/19300 ,3500/26500 ,1400/7100 ,3500/17500 ,- ,1200/6000 ,- ,- ,- ,- ,- ,- , , 6750
+1 ,Tractor ,6x2 ,0 ,99 ,10 ,4.0 ,85 , ,ST1 ,ST1+T2,Truck.vacc,TractorSemitrailer ,RigidTrailer ,TractorSemitrailer ,15/10/20 ,20/10/20 ,55 ,50 ,12.5/15/10 ,15/15/10 ,37.5/25 ,35/25 ,2600/19300 ,3500/26500 ,2600/12900 ,3500/17500 ,- ,- ,- ,- ,- ,- ,- ,- , ,
+1 ,RigidTruck ,6x4 ,0 ,99 ,11 ,4.0 ,85 ,B5 ,T2 ,D+ST1 ,Truck.vacc,RigidTrailer ,RigidTrailer ,RigidSolo ,20/22.5/22.5 ,35/35/30 ,35 , ,15/20/10 ,17.5/20/10 ,22.5/32.5 ,22.5/30 ,2600/19300 ,3500/26500 ,1400/7100 ,3500/17500 ,- ,1200/6000 ,1400/7100 ,- ,- ,- ,- ,- ,8.5 , 6750
+1 ,Tractor ,6x4 ,0 ,99 ,12 ,4.0 ,85 , ,ST1 ,ST1+T2,Truck.vacc,TractorSemitrailer ,RigidTrailer ,TractorSemitrailer ,15/15/15 ,20/15/15 ,55 ,50 ,12.5/15/10 ,15/15/10 ,37.5/25 ,35/25 ,2600/19300 ,3500/26500 ,2600/12900 ,3500/17500 ,- ,- ,2600/12900 ,- ,- ,- ,- ,- ,8.8 ,
+0 ,RigidTruck ,6x6 ,0 ,99 ,13 ,3.6 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- , ,
+0 ,Tractor ,6x6 ,0 ,99 ,14 ,3.6 ,85 , , , ,Truck.vacc, , ,TractorSemitrailer , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- , ,
+0 ,RigidTruck ,8x2 ,0 ,99 ,15 ,3.6 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,??? ,- ,- ,- ,- ,- ,- ,- ,- ,- , ,
+1 ,RigidTruck ,8x4 ,0 ,99 ,16 ,3.6 ,85 , , , ,Truck.vacc, , ,RigidSolo , ,25/25/25/25 , , , , , , ,- ,- ,- ,- ,- ,- ,2600/12900 ,- ,- ,- ,- ,- , ,
+0 ,RigidTruck ,8x6 ,0 ,99 ,17 ,3.6 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- ,9.0 ,
+0 ,RigidTruck ,8x8 ,0 ,99 ,17 ,4.0 ,85 , , , ,Truck.vacc, , ,RigidSolo , , , , , , , , ,- ,- ,- ,- ,- ,- ,??? ,- ,- ,- ,- ,- , ,
+0 ,CityBus ,4x2 ,0 ,18 ,B1 ,4.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,??? ,??? ,??? ,- ,- , ,
+0 ,InterurbanBus ,4x2 ,0 ,18 ,B2 ,4.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,??? ,- , ,
+0 ,Coach ,4x2 ,0 ,18 ,B3 ,4.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,??? , ,
+0 ,CityBus ,6x2 ,18 ,99 ,B4 ,4.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,??? ,??? ,??? ,- ,- , ,
+0 ,InterurbanBus ,6x2 ,18 ,99 ,B5 ,4.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,??? ,- , ,
+0 ,Coach ,6x2 ,18 ,99 ,B6 ,4.0 ,85 , , , , , , ,CoachBus , , , , , , , , ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,- ,??? , ,
\ No newline at end of file
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index efe727aaa007e2538c714211af28022ca8472033..459239ec801bb9c1bcbbb62c185bd93e10ba1305 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -429,6 +429,8 @@
<EmbeddedResource Include="Resources\XSD\xmldsig-core-schema.xsd">
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="Resources\Declaration\MissionCycles\MunicipalUtility_PTO_generic.vptoc" />
+ <EmbeddedResource Include="Resources\Declaration\MissionCycles\MunicipalUtility_PTO_generic.vptol" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Declaration\Report\4x2r.png" />
diff --git a/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs b/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs
index 9d36d184cd3186b62e71f0138f4b77825a979dc0..1a771b921a33fd19465f13d96291185d7a29982c 100644
--- a/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/FullCycleDeclarationTest.cs
@@ -57,6 +57,10 @@ namespace TUGraz.VectoCore.Tests.Integration
public const string DeliveryTruck8GearDeclarationJob =
@"TestData\Integration\DeclarationMode\12t Truck\12t Delivery Truck_8gear.vecto";
+ public const string Class9RigidTruckPTOJob =
+ @"TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Class9_RigidTruck_DECL.vecto";
+
+
[TestMethod]
public void Truck40t_LongHaulCycle_RefLoad()
{
@@ -328,5 +332,28 @@ namespace TUGraz.VectoCore.Tests.Integration
Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException)));
}
+
+
+ [TestMethod]
+ public void DeclarationClass9PTOTest()
+ {
+ var inputData = JSONInputDataFactory.ReadJsonJob(Class9RigidTruckPTOJob);
+ var fileWriter = new FileOutputWriter(Class9RigidTruckPTOJob);
+ var factory = new SimulatorFactory(ExecutionMode.Declaration, inputData, fileWriter) {
+ WriteModalResults = true
+ };
+ var sumData = new SummaryDataContainer(fileWriter);
+ var jobContainer = new JobContainer(sumData);
+ jobContainer.AddRuns(factory);
+
+ //var runs = jobContainer.Runs;
+
+ //runs[8].Run.Run();
+
+ jobContainer.Execute();
+ jobContainer.WaitFinished();
+
+ Assert.IsTrue(jobContainer.Runs.All(r => r.Success), string.Concat(jobContainer.Runs.Select(r => r.ExecException)));
+ }
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationAdapterTestHelper.cs b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationAdapterTestHelper.cs
new file mode 100644
index 0000000000000000000000000000000000000000..14cabbc84ff3173eb9c31b4bb9c4b2bc03917bac
--- /dev/null
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationAdapterTestHelper.cs
@@ -0,0 +1,22 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCore.Models.Declaration;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
+
+namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
+{
+ public class DeclarationAdapterTestHelper
+ {
+ public static void AssertVehicleData(VehicleData vehicleData, VehicleCategory vehicleCategory,
+ VehicleClass vehicleClass,
+ AxleConfiguration axleConfiguration, double wheelsInertia, double totalVehicleWeight, double totalRollResistance)
+ {
+ Assert.AreEqual(vehicleCategory, vehicleData.VehicleCategory, "VehicleCategory");
+ Assert.AreEqual(vehicleClass, vehicleData.VehicleClass, "VehicleClass");
+ Assert.AreEqual(axleConfiguration, vehicleData.AxleConfiguration, "AxleConfiguration");
+ Assert.AreEqual(totalVehicleWeight, vehicleData.TotalVehicleWeight.Value(), 1e-3, "TotalVehicleWeight");
+ Assert.AreEqual(wheelsInertia, vehicleData.WheelsInertia.Value(), 1e-6, "WheelsInertia");
+ Assert.AreEqual(totalRollResistance, vehicleData.TotalRollResistanceCoefficient, 1e-6, "TotalRollResistance");
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class2.cs b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class2.cs
new file mode 100644
index 0000000000000000000000000000000000000000..e3d149dd482136436963e76b157c53d3440288ef
--- /dev/null
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class2.cs
@@ -0,0 +1,127 @@
+using System.Linq;
+using NUnit.Framework;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCore.InputData.FileIO.JSON;
+using TUGraz.VectoCore.InputData.Reader.Impl;
+using TUGraz.VectoCore.Models.Declaration;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using Assert = Microsoft.VisualStudio.TestTools.UnitTesting.Assert;
+
+namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
+{
+ [TestFixture]
+ public class DeclarationDataAdapterTest_Class2
+ {
+ public const string Class2RigidTruckNoEMSJob =
+ @"TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2\Class2_RigidTruck_DECL.vecto";
+
+ public const int CurbWeight = 4670;
+
+ [TestCase(Class2RigidTruckNoEMSJob, 0)]
+ public void TestClass2_Vehicle_LongHaul_LowLoad(string file, int runIdx)
+ {
+ var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+ var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+ var runData = dataReader.NextRun().ToArray();
+
+ Assert.AreEqual(6, runData.Length);
+
+ // long haul, min load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class2,
+ axleConfiguration: AxleConfiguration.AxleConfig_4x2,
+ wheelsInertia: 57,
+ totalVehicleWeight: CurbWeight + 1900 + 3400 + 603.917 + 710,
+ totalRollResistance: 0.006954);
+ }
+
+ [TestCase(Class2RigidTruckNoEMSJob, 1)]
+ public void TestClass2_Vehicle_LongHaul_RefLoad(string file, int runIdx)
+ {
+ var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+ var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+ var runData = dataReader.NextRun().ToArray();
+
+ // long haul, ref load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class2,
+ axleConfiguration: AxleConfiguration.AxleConfig_4x2,
+ wheelsInertia: 57,
+ totalVehicleWeight: CurbWeight + 1900 + 3400 + 4541.176 + 5325,
+ totalRollResistance: 0.0065733);
+ }
+
+
+ [TestCase(Class2RigidTruckNoEMSJob, 2)]
+ public void TestClass2_Vehicle_RegionalDel_LowLoad(string file, int runIdx)
+ {
+ var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+ var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+ var runData = dataReader.NextRun().ToArray();
+
+ // regional del., min load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class2,
+ axleConfiguration: AxleConfiguration.AxleConfig_4x2,
+ wheelsInertia: 39,
+ totalVehicleWeight: CurbWeight + 1900 + 603.917,
+ totalRollResistance: 0.007461);
+ }
+
+ [TestCase(Class2RigidTruckNoEMSJob, 3)]
+ public void TestClass2_Vehicle_RegionalDel_RefLoad(string file, int runIdx)
+ {
+ var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+ var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+ var runData = dataReader.NextRun().ToArray();
+
+ // regional del., ref load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class2,
+ axleConfiguration: AxleConfiguration.AxleConfig_4x2,
+ wheelsInertia: 39,
+ totalVehicleWeight: CurbWeight + 1900 + 3019.588,
+ totalRollResistance: 0.007248);
+ }
+
+
+ [TestCase(Class2RigidTruckNoEMSJob, 4)]
+ public void TestClass2_Vehicle_UrbanDel_LowLoad(string file, int runIdx)
+ {
+ var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+ var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+ var runData = dataReader.NextRun().ToArray();
+
+ // municipal, min load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class2,
+ axleConfiguration: AxleConfiguration.AxleConfig_4x2,
+ wheelsInertia: 39,
+ totalVehicleWeight: CurbWeight + 1900 + 603.917,
+ totalRollResistance: 0.007461);
+ }
+
+ [TestCase(Class2RigidTruckNoEMSJob, 5)]
+ public void TestClass2_Vehicle_UrbanDel_RefLoad(string file, int runIdx)
+ {
+ var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+ var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+ var runData = dataReader.NextRun().ToArray();
+
+ // municipal, min load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class2,
+ axleConfiguration: AxleConfiguration.AxleConfig_4x2,
+ wheelsInertia: 39,
+ totalVehicleWeight: CurbWeight + 1900 + 3019.588,
+ totalRollResistance: 0.007248);
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class5.cs b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class5.cs
new file mode 100644
index 0000000000000000000000000000000000000000..524be959bb7527ad9bb22e6a42c23a436ef70d99
--- /dev/null
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class5.cs
@@ -0,0 +1,92 @@
+using System.Linq;
+using NUnit.Framework;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCore.InputData.FileIO.JSON;
+using TUGraz.VectoCore.InputData.Reader.Impl;
+using TUGraz.VectoCore.Models.Declaration;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using Assert = Microsoft.VisualStudio.TestTools.UnitTesting.Assert;
+
+namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
+{
+ [TestFixture]
+ public class DeclarationDataAdapterTest_Class5
+ {
+ public const string Class5TractorNoEMS_PTOJob =
+ @"TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Class5_Tractor_DECL.vecto";
+
+ public const int CurbWeight = 8229;
+
+ [TestCase(Class5TractorNoEMS_PTOJob, 0)]
+ public void TestClass5_Vehicle_LongHaul_LowLoad(string file, int runIdx)
+ {
+ var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+ var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+ var runData = dataReader.NextRun().ToArray();
+
+ Assert.AreEqual(4, runData.Length);
+
+ // long haul, min load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+ vehicleCategory: VehicleCategory.Tractor,
+ vehicleClass: VehicleClass.Class5,
+ axleConfiguration: AxleConfiguration.AxleConfig_4x2,
+ wheelsInertia: 204.6,
+ totalVehicleWeight: CurbWeight + 7500 + 2600,
+ totalRollResistance: 0.0062662);
+ }
+
+ [TestCase(Class5TractorNoEMS_PTOJob, 1)]
+ public void TestClass5_Vehicle_LongHaul_RefLoad(string file, int runIdx)
+ {
+ var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+ var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+ var runData = dataReader.NextRun().ToArray();
+
+ // long haul, ref load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+ vehicleCategory: VehicleCategory.Tractor,
+ vehicleClass: VehicleClass.Class5,
+ axleConfiguration: AxleConfiguration.AxleConfig_4x2,
+ wheelsInertia: 204.6,
+ totalVehicleWeight: CurbWeight + 7500 + 19300,
+ totalRollResistance: 0.00587322);
+ }
+
+
+ [TestCase(Class5TractorNoEMS_PTOJob, 2)]
+ public void TestClass5_Vehicle_RegionalDel_LowLoad(string file, int runIdx)
+ {
+ var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+ var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+ var runData = dataReader.NextRun().ToArray();
+
+ // regional del., min load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+ vehicleCategory: VehicleCategory.Tractor,
+ vehicleClass: VehicleClass.Class5,
+ axleConfiguration: AxleConfiguration.AxleConfig_4x2,
+ wheelsInertia: 204.6,
+ totalVehicleWeight: CurbWeight + 7500 + 2600,
+ totalRollResistance: 0.0062565);
+ }
+
+ [TestCase(Class5TractorNoEMS_PTOJob, 3)]
+ public void TestClass5_Vehicle_RegionalDel_RefLoad(string file, int runIdx)
+ {
+ var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+ var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+ var runData = dataReader.NextRun().ToArray();
+
+ // regional del., ref load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+ vehicleCategory: VehicleCategory.Tractor,
+ vehicleClass: VehicleClass.Class5,
+ axleConfiguration: AxleConfiguration.AxleConfig_4x2,
+ wheelsInertia: 204.6,
+ totalVehicleWeight: CurbWeight + 7500 + 12900,
+ totalRollResistance: 0.0059836);
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class9.cs b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class9.cs
new file mode 100644
index 0000000000000000000000000000000000000000..6f3b506a25f4be67e2501991b727e092ecb1e17f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DataAdapter/DeclarationDataAdapterTest_Class9.cs
@@ -0,0 +1,125 @@
+using System.Linq;
+using NUnit.Framework;
+using TUGraz.VectoCommon.InputData;
+using TUGraz.VectoCommon.Models;
+using TUGraz.VectoCore.InputData.FileIO.JSON;
+using TUGraz.VectoCore.InputData.Reader.Impl;
+using TUGraz.VectoCore.Models.Declaration;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
+using Assert = Microsoft.VisualStudio.TestTools.UnitTesting.Assert;
+
+namespace TUGraz.VectoCore.Tests.Models.Declaration.DataAdapter
+{
+ [TestFixture]
+ public class DeclarationDataAdapterTest_Class9
+ {
+ public const string Class9RigidTruckNoEMS_PTOJob =
+ @"TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Class9_RigidTruck_DECL.vecto";
+
+ [TestCase(Class9RigidTruckNoEMS_PTOJob, 0)]
+ public void TestClass9_Vehicle_LongHaul_LowLoad(string file, int runIdx)
+ {
+ var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+ var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+ var runData = dataReader.NextRun().ToArray();
+
+ Assert.AreEqual(6, runData.Length);
+
+ // long haul, min load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class9,
+ axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+ wheelsInertia: 196,
+ totalVehicleWeight: 9300 + 2200 + 5400 + 2600,
+ totalRollResistance: 0.0059426);
+ }
+
+ [TestCase(Class9RigidTruckNoEMS_PTOJob, 1)]
+ public void TestClass9_Vehicle_LongHaul_RefLoad(string file, int runIdx)
+ {
+ var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+ var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+ var runData = dataReader.NextRun().ToArray();
+
+ // long haul, ref load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class9,
+ axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+ wheelsInertia: 196,
+ totalVehicleWeight: 9300 + 2200 + 5400 + 19300,
+ totalRollResistance: 0.00558611);
+ }
+
+
+ [TestCase(Class9RigidTruckNoEMS_PTOJob, 2)]
+ public void TestClass9_Vehicle_RegionalDel_LowLoad(string file, int runIdx)
+ {
+ var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+ var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+ var runData = dataReader.NextRun().ToArray();
+
+ // regional del., min load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class9,
+ axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+ wheelsInertia: 119.2,
+ totalVehicleWeight: 9300 + 2200 + 1400,
+ totalRollResistance: 0.0059109);
+ }
+
+ [TestCase(Class9RigidTruckNoEMS_PTOJob, 3)]
+ public void TestClass9_Vehicle_RegionalDel_RefLoad(string file, int runIdx)
+ {
+ var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+ var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+ var runData = dataReader.NextRun().ToArray();
+
+ // regional del., ref load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class9,
+ axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+ wheelsInertia: 119.2,
+ totalVehicleWeight: 9300 + 2200 + 7100,
+ totalRollResistance: 0.0056986);
+ }
+
+
+ [TestCase(Class9RigidTruckNoEMS_PTOJob, 4)]
+ public void TestClass9_Vehicle_Municipal_LowLoad(string file, int runIdx)
+ {
+ var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+ var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+ var runData = dataReader.NextRun().ToArray();
+
+ // municipal, min load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class9,
+ axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+ wheelsInertia: 119.2,
+ totalVehicleWeight: 9300 + 6750 + 1200,
+ totalRollResistance: 0.0057417);
+ }
+
+ [TestCase(Class9RigidTruckNoEMS_PTOJob, 5)]
+ public void TestClass9_Vehicle_Municipal_RefLoad(string file, int runIdx)
+ {
+ var inputData = (IDeclarationInputDataProvider)JSONInputDataFactory.ReadJsonJob(file);
+ var dataReader = new DeclarationModeVectoRunDataFactory(inputData, null);
+ var runData = dataReader.NextRun().ToArray();
+
+ // municipal, min load
+ DeclarationAdapterTestHelper.AssertVehicleData(runData[runIdx].VehicleData,
+ vehicleCategory: VehicleCategory.RigidTruck,
+ vehicleClass: VehicleClass.Class9,
+ axleConfiguration: AxleConfiguration.AxleConfig_6x2,
+ wheelsInertia: 119.2,
+ totalVehicleWeight: 9300 + 6750 + 6000,
+ totalRollResistance: 0.005602);
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/324kW.vfld b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/324kW.vfld
new file mode 100644
index 0000000000000000000000000000000000000000..d305e26d47414e8d519363447a258f5106b038c6
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/324kW.vfld
@@ -0,0 +1,11 @@
+engine speed [1/min],full load torque [Nm],motoring torque [Nm],PT1 [s]
+600,1258,-150,0.24
+800,1758,-155,0.47
+1000,2140,-165,0.58
+1200,2146,-179,0.53
+1400,2109,-203,0.46
+1600,1903,-235,0.349999999
+1800,1719,-264,0.2
+2000,1259,-301,0.11
+2100,1079,-320,0.11
+2200,0,-339,0.11
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/350kW.vmap b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/350kW.vmap
new file mode 100644
index 0000000000000000000000000000000000000000..4ae21e4b8e35fadfbc04b5a17e06365cb6128c4f
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/350kW.vmap
@@ -0,0 +1,107 @@
+engine speed [rpm],torque [Nm],fuel consumption [g/h]
+600,-150,0
+600,0,1459
+600,200,3358
+600,400,5498
+600,600,8101
+600,800,10014
+600,1000,12071
+600,1200,14400
+600,1282,15350
+800,-155,0
+800,0,1879
+800,200,4286
+800,400,7350
+800,600,10059
+800,800,13086
+800,1000,16015
+800,1200,19239
+800,1400,22426
+800,1600,25600
+800,1791,28905
+1000,-165,0
+1000,0,2865
+1000,200,5963
+1000,400,9198
+1000,600,12354
+1000,800,15965
+1000,1000,19864
+1000,1200,23530
+1000,1400,27202
+1000,1600,31165
+1000,1800,35103
+1000,2000,39360
+1000,2200,44120
+1000,2300,46836
+1200,-179,0
+1200,0,3307
+1200,200,6897
+1200,400,10651
+1200,600,14645
+1200,800,19115
+1200,1000,23677
+1200,1200,28180
+1200,1400,32431
+1200,1600,37000
+1200,1800,41691
+1200,2000,46915
+1200,2200,51783
+1200,2300,54932
+1400,-203,0
+1400,0,4306
+1400,200,8143
+1400,400,12723
+1400,600,17523
+1400,800,22288
+1400,1000,27093
+1400,1200,32536
+1400,1400,37746
+1400,1600,43194
+1400,1800,49453
+1400,2000,55750
+1400,2200,61072
+1400,2300,64377
+1600,-235,0
+1600,0,5209
+1600,200,9669
+1600,400,14838
+1600,600,20127
+1600,800,25894
+1600,1000,31631
+1600,1200,37248
+1600,1400,43450
+1600,1600,49752
+1600,1800,57020
+1600,2000,63914
+1600,2079,66520
+1800,-264,0
+1800,0,6409
+1800,200,11777
+1800,400,17320
+1800,600,23394
+1800,800,30501
+1800,1000,36378
+1800,1200,43079
+1800,1400,50250
+1800,1600,57436
+1800,1800,65157
+1800,1857,67574
+2000,-301,0
+2000,0,9127
+2000,200,14822
+2000,400,20655
+2000,600,27076
+2000,800,34188
+2000,1000,42837
+2000,1200,51018
+2000,1352,56618
+2100,-320,0
+2100,0,10470
+2100,200,16332
+2100,400,22396
+2100,600,28914
+2100,800,35717
+2100,1000,45643
+2100,1100,50653
+2200,-339,0
+2200,0,13444.59908
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/AMT_12.vgbx b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/AMT_12.vgbx
new file mode 100644
index 0000000000000000000000000000000000000000..9b717385f7785d878458cf77a0a1ca325643402c
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/AMT_12.vgbx
@@ -0,0 +1,117 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2017-05-19T08:19:13.4575457Z",
+ "AppVersion": "3",
+ "FileVersion": 6
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "ModelName": "tractor_12gear_example",
+ "Inertia": 0.0,
+ "TracInt": 1.0,
+ "Gears": [
+ {
+ "Ratio": 2.64,
+ "LossMap": "Axle_4x2.vtlm"
+ },
+ {
+ "Ratio": 14.93,
+ "LossMap": "Gear_1.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 11.64,
+ "LossMap": "Gear_2.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 9.02,
+ "LossMap": "Gear_3.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 7.04,
+ "LossMap": "Gear_4.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 5.64,
+ "LossMap": "Gear_5.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 4.4,
+ "LossMap": "Gear_6.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 3.39,
+ "LossMap": "Gear_7.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 2.65,
+ "LossMap": "Gear_8.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 2.05,
+ "LossMap": "Gear_9.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 1.6,
+ "LossMap": "Gear_10.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 1.28,
+ "LossMap": "Gear_11.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ },
+ {
+ "Ratio": 1.0,
+ "LossMap": "Gear_12.vtlm",
+ "ShiftPolygon": "",
+ "MaxTorque": "",
+ "MaxSpeed": ""
+ }
+ ],
+ "TqReserve": 20.0,
+ "ShiftTime": 1.5,
+ "StartTqReserve": 20.0,
+ "StartSpeed": 1.3,
+ "StartAcc": 0.6,
+ "GearboxType": "AMT",
+ "TorqueConverter": {
+ "Enabled": false
+ },
+ "DownshiftAfterUpshiftDelay": 10.0,
+ "UpshiftAfterDownshiftDelay": 10.0,
+ "UpshiftMinAcceleration": 0.1,
+ "PowershiftShiftTime": 0.8
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Axle_4x2.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Axle_4x2.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..e11cbf7cdde175e06ab8f6a0b79d46b84b3e0c1a
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Axle_4x2.vtlm
@@ -0,0 +1,317 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-5478,220
+0,-176,28
+0,0,8
+0,116,14
+0,220,17
+0,326,21
+0,432,24
+0,641,31
+0,853,38
+0,1274,53
+0,1696,67
+0,2117,82
+0,2538,96
+0,2959,110
+0,3376,119
+0,3785,123
+0,4200,130
+0,6309,204
+0,8409,268
+0,10507,332
+0,12606,396
+0,16804,523
+0,21002,651
+0,25199,778
+0,29397,905
+0,33594,1032
+0,37792,1160
+0,41990,1288
+0,46187,1415
+0,50385,1542
+143,-5482,216
+143,-174,28
+143,0,9
+143,116,14
+143,222,17
+143,326,21
+143,432,24
+143,641,31
+143,853,38
+143,1273,52
+143,1694,66
+143,2115,80
+143,2536,94
+143,2957,108
+143,3372,116
+143,3786,123
+143,4200,130
+143,6323,218
+143,8427,287
+143,10532,356
+143,12635,425
+143,16843,563
+143,21052,701
+143,25260,839
+143,29467,977
+143,33676,1115
+143,37884,1253
+143,42092,1391
+143,46300,1529
+143,50509,1667
+285,-5496,202
+285,-172,32
+285,0,10
+285,118,16
+285,223,19
+285,327,22
+285,432,24
+285,641,31
+285,851,37
+285,1271,50
+285,1690,63
+285,2110,75
+285,2530,88
+285,2950,101
+285,3369,113
+285,3780,117
+285,4195,124
+285,6305,200
+285,8402,262
+285,10499,324
+285,12596,386
+285,16791,510
+285,20987,636
+285,25181,760
+285,29376,884
+285,33570,1009
+285,37765,1133
+285,41960,1259
+285,46154,1383
+285,50350,1507
+428,-5501,200
+428,-167,35
+428,0,12
+428,119,17
+428,224,21
+428,328,23
+428,433,26
+428,643,31
+428,851,37
+428,1270,49
+428,1689,61
+428,2109,74
+428,2529,87
+428,2949,100
+428,3365,109
+428,3778,115
+428,4191,121
+428,6296,191
+428,8390,251
+428,10485,310
+428,12579,369
+428,16767,486
+428,20955,604
+428,25143,723
+428,29332,841
+428,33521,958
+428,37708,1076
+428,41897,1195
+428,46084,1313
+428,50273,1430
+570,-5512,188
+570,-167,37
+570,0,13
+570,121,19
+570,224,21
+570,328,23
+570,433,26
+570,641,31
+570,850,36
+570,1268,46
+570,1685,58
+570,2104,70
+570,2523,81
+570,2943,94
+570,3363,107
+570,3776,113
+570,4189,118
+570,6281,175
+570,8369,230
+570,10459,283
+570,12547,336
+570,16724,443
+570,20901,550
+570,25078,658
+570,29255,764
+570,33432,871
+570,37611,979
+570,41788,1086
+570,45965,1192
+570,50142,1299
+713,-5517,181
+713,-165,39
+713,0,14
+713,122,20
+713,225,22
+713,329,24
+713,433,27
+713,641,30
+713,850,36
+713,1267,45
+713,1684,56
+713,2102,67
+713,2521,79
+713,2939,90
+713,3358,102
+713,3775,111
+713,4188,118
+713,6272,166
+713,8357,217
+713,10442,267
+713,12527,317
+713,16697,416
+713,20867,517
+713,25039,617
+713,29209,717
+713,33379,818
+713,37549,918
+713,41719,1017
+713,45890,1117
+713,50060,1218
+855,-5524,174
+855,-162,42
+855,0,15
+855,122,21
+855,226,22
+855,329,24
+855,434,27
+855,641,31
+855,849,35
+855,1266,45
+855,1683,55
+855,2100,65
+855,2518,77
+855,2937,87
+855,3355,99
+855,3775,111
+855,4188,117
+855,6264,158
+855,8346,205
+855,10427,252
+855,12509,299
+855,16674,393
+855,20838,487
+855,25003,581
+855,29167,675
+855,33330,769
+855,37495,863
+855,41659,957
+855,45823,1051
+855,49988,1145
+998,-5526,172
+998,-160,44
+998,0,16
+998,123,22
+998,227,23
+998,331,26
+998,435,28
+998,641,31
+998,850,36
+998,1266,45
+998,1682,55
+998,2100,64
+998,2517,74
+998,2935,86
+998,3354,97
+998,3772,109
+998,4185,115
+998,6258,153
+998,8338,197
+998,10418,242
+998,12498,288
+998,16658,377
+998,20817,466
+998,24977,556
+998,29137,645
+998,33297,735
+998,37456,825
+998,41616,914
+998,45776,1003
+998,49936,1093
+1140,-5529,169
+1140,-158,46
+1140,0,18
+1140,125,23
+1140,229,24
+1140,332,27
+1140,436,29
+1140,643,32
+1140,851,37
+1140,1267,45
+1140,1683,55
+1140,2100,64
+1140,2516,74
+1140,2934,85
+1140,3352,96
+1140,3771,108
+1140,4183,114
+1283,-5529,169
+1283,-155,49
+1283,0,19
+1283,126,24
+1283,230,26
+1283,333,28
+1283,437,30
+1283,644,34
+1283,853,38
+1283,1267,46
+1283,1683,55
+1283,2098,64
+1283,2516,74
+1283,2934,85
+1283,3351,95
+1283,3764,101
+1425,-5531,167
+1425,-153,51
+1425,0,20
+1425,128,26
+1425,231,27
+1425,336,30
+1425,436,29
+1425,646,36
+1425,853,38
+1425,1268,46
+1425,1683,55
+1425,2098,63
+1425,2516,73
+1425,2932,84
+1425,3345,89
+1568,-5538,160
+1568,-148,56
+1568,0,21
+1568,129,28
+1568,232,29
+1568,336,31
+1568,440,32
+1568,647,37
+1568,854,41
+1568,1269,48
+1568,1684,57
+1568,2101,65
+1568,2517,74
+1568,2929,80
+1853,-5540,158
+1853,-144,60
+1853,0,24
+1853,132,30
+1853,234,31
+1853,340,34
+1853,442,35
+1853,650,38
+1853,856,42
+1853,1269,49
+1853,1684,57
+1853,2098,64
+1853,2515,73
+1853,2928,79
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh
new file mode 100644
index 0000000000000000000000000000000000000000..b72b915743e0e3b45da5379eb3ffcfc9fa7e0c86
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck.vveh
@@ -0,0 +1,65 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2017-05-19T08:36:54.5380903Z",
+ "AppVersion": "3",
+ "FileVersion": 7
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "VehCat": "RigidTruck",
+ "CurbWeight": 9300.0,
+ "CurbWeightExtra": 0.0,
+ "Loading": 0.0,
+ "MassMax": 26.0,
+ "CdA": 5.2,
+ "rdyn": 0.0,
+ "CdCorrMode": "CdofVdecl",
+ "CdCorrFile": "",
+ "Retarder": {
+ "Type": "secondary",
+ "Ratio": 1.0,
+ "File": "Retarder.vrlm"
+ },
+ "Angledrive": {
+ "Type": "None",
+ "Ratio": "NaN",
+ "LossMap": ""
+ },
+ "PTO": {
+ "Type": "drive shaft and/or more than 2 gear wheels - multi-disc clutch, oil pump",
+ "LossMap": "",
+ "Cycle": ""
+ },
+ "TorqueLimits": {},
+ "AxleConfig": {
+ "Type": "6x2",
+ "Axles": [
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.0,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 33350.0
+ },
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.0,
+ "TwinTyres": true,
+ "RRCISO": 0.0055,
+ "FzISO": 33350.0
+ },
+ {
+ "Inertia": 14.9,
+ "Wheels": "315/70 R22.5",
+ "AxleWeightShare": 0.0,
+ "TwinTyres": false,
+ "RRCISO": 0.0055,
+ "FzISO": 33350.0
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL.vecto b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..ef46306882fd865abf8d0c8fbc6723b65969c582
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Class9_RigidTruck_DECL.vecto
@@ -0,0 +1,61 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2017-05-19T08:36:57.2458195Z",
+ "AppVersion": "3",
+ "FileVersion": 3
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "EngineOnlyMode": false,
+ "VehicleFile": "Class9_RigidTruck.vveh",
+ "EngineFile": "Engine_324kW_12.7l.veng",
+ "GearboxFile": "AMT_12.vgbx",
+ "AuxiliaryAssembly": "Classic",
+ "AuxiliaryVersion": "CLASSIC",
+ "AdvancedAuxiliaryFilePath": "",
+ "Aux": [
+ {
+ "ID": "FAN",
+ "Type": "Fan",
+ "Technology": [
+ "Crankshaft mounted - On/off clutch"
+ ]
+ },
+ {
+ "ID": "STP",
+ "Type": "Steering pump",
+ "Technology": [
+ "Fixed displacement with elec. control"
+ ]
+ },
+ {
+ "ID": "AC",
+ "Type": "HVAC",
+ "Technology": [
+ "Default"
+ ]
+ },
+ {
+ "ID": "ES",
+ "Type": "Electric System",
+ "Technology": [
+ "Standard technology"
+ ]
+ },
+ {
+ "ID": "PS",
+ "Type": "Pneumatic System",
+ "Technology": [
+ "Medium Supply 2-stage + ESS + AMS"
+ ]
+ }
+ ],
+ "OverSpeedEcoRoll": {
+ "Mode": "Overspeed",
+ "MinSpeed": 50.0,
+ "OverSpeed": 5.0,
+ "UnderSpeed": 5.0
+ }
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng
new file mode 100644
index 0000000000000000000000000000000000000000..9c995ff80fd7f9212a3f0e162b74a3f2fcd27894
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng
@@ -0,0 +1,22 @@
+{
+ "Header": {
+ "CreatedBy": " ()",
+ "Date": "2017-05-19T08:13:02.2025457Z",
+ "AppVersion": "3",
+ "FileVersion": 3
+ },
+ "Body": {
+ "SavedInDeclMode": true,
+ "ModelName": "324kW 7l Engine",
+ "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
+ }
+}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_1.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_1.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_1.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_10.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_10.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_10.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_11.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_11.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_11.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_12.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_12.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..4dfffd693b9b66d912044ed77371b0b6150c491c
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_12.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-2457,23
+0,-117,12
+0,0,5
+0,59,6
+0,293,7
+0,527,8
+0,761,9
+0,995,11
+0,1229,12
+0,1463,13
+0,1697,14
+0,1931,15
+0,2165,16
+0,2399,18
+0,2633,19
+0,2867,20
+100,-2457,26
+100,-117,14
+100,0,6
+100,59,7
+100,293,8
+100,527,9
+100,761,11
+100,995,12
+100,1229,13
+100,1463,14
+100,1697,15
+100,1931,16
+100,2165,18
+100,2399,19
+100,2633,20
+100,2867,21
+300,-2457,28
+300,-117,16
+300,0,7
+300,59,8
+300,293,9
+300,527,11
+300,761,12
+300,995,13
+300,1229,14
+300,1463,15
+300,1697,16
+300,1931,18
+300,2165,19
+300,2399,20
+300,2633,21
+300,2867,22
+500,-2457,30
+500,-117,19
+500,0,8
+500,59,9
+500,293,11
+500,527,12
+500,761,13
+500,995,14
+500,1229,15
+500,1463,16
+500,1697,18
+500,1931,19
+500,2165,20
+500,2399,21
+500,2633,22
+500,2867,23
+700,-2457,33
+700,-117,21
+700,0,9
+700,59,11
+700,293,12
+700,527,13
+700,761,14
+700,995,15
+700,1229,16
+700,1463,18
+700,1697,19
+700,1931,20
+700,2165,21
+700,2399,22
+700,2633,23
+700,2867,25
+900,-2457,35
+900,-117,23
+900,0,10
+900,59,12
+900,293,13
+900,527,14
+900,761,15
+900,995,16
+900,1229,18
+900,1463,19
+900,1697,20
+900,1931,21
+900,2165,22
+900,2399,23
+900,2633,25
+900,2867,26
+1100,-2457,37
+1100,-117,26
+1100,0,11
+1100,59,13
+1100,293,14
+1100,527,15
+1100,761,16
+1100,995,18
+1100,1229,19
+1100,1463,20
+1100,1697,21
+1100,1931,22
+1100,2165,23
+1100,2399,25
+1100,2633,26
+1100,2867,27
+1300,-2457,40
+1300,-117,28
+1300,0,12
+1300,59,14
+1300,293,15
+1300,527,16
+1300,761,18
+1300,995,19
+1300,1229,20
+1300,1463,21
+1300,1697,22
+1300,1931,23
+1300,2165,25
+1300,2399,26
+1300,2633,27
+1300,2867,28
+1500,-2457,42
+1500,-117,30
+1500,0,13
+1500,59,15
+1500,293,16
+1500,527,18
+1500,761,19
+1500,995,20
+1500,1229,21
+1500,1463,22
+1500,1697,23
+1500,1931,25
+1500,2165,26
+1500,2399,27
+1500,2633,28
+1500,2867,29
+1700,-2457,44
+1700,-117,33
+1700,0,14
+1700,59,16
+1700,293,18
+1700,527,19
+1700,761,20
+1700,995,21
+1700,1229,22
+1700,1463,23
+1700,1697,25
+1700,1931,26
+1700,2165,27
+1700,2399,28
+1700,2633,29
+1700,2867,30
+1900,-2457,47
+1900,-117,35
+1900,0,15
+1900,59,18
+1900,293,19
+1900,527,20
+1900,761,21
+1900,995,22
+1900,1229,23
+1900,1463,25
+1900,1697,26
+1900,1931,27
+1900,2165,28
+1900,2399,29
+1900,2633,30
+1900,2867,32
+2100,-2457,49
+2100,-117,37
+2100,0,16
+2100,59,19
+2100,293,20
+2100,527,21
+2100,761,22
+2100,995,23
+2100,1229,25
+2100,1463,26
+2100,1697,27
+2100,1931,28
+2100,2165,29
+2100,2399,30
+2100,2633,32
+2100,2867,33
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_2.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_2.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_2.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_3.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_3.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_3.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_4.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_4.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_4.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_5.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_5.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_5.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_6.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_6.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_6.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_7.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_7.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_7.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_8.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_8.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_8.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_9.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_9.vtlm
new file mode 100644
index 0000000000000000000000000000000000000000..211ceb1b69b3215b8eb6cfe3b87fc7c9953f9b71
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Gear_9.vtlm
@@ -0,0 +1,193 @@
+Input Speed [rpm],Input Torque [Nm],Torque Loss [Nm]
+0,-812,28
+0,-348,19
+0,0,5
+0,58,7
+0,290,12
+0,522,16
+0,754,21
+0,986,26
+0,1218,30
+0,1450,35
+0,1682,39
+0,1914,44
+0,2146,49
+0,2378,53
+0,2610,58
+0,2842,63
+100,-812,30
+100,-348,21
+100,0,6
+100,58,8
+100,290,13
+100,522,17
+100,754,22
+100,986,27
+100,1218,31
+100,1450,36
+100,1682,41
+100,1914,45
+100,2146,50
+100,2378,55
+100,2610,59
+100,2842,64
+300,-812,32
+300,-348,23
+300,0,7
+300,58,9
+300,290,14
+300,522,19
+300,754,23
+300,986,28
+300,1218,32
+300,1450,37
+300,1682,42
+300,1914,46
+300,2146,51
+300,2378,56
+300,2610,60
+300,2842,65
+500,-812,35
+500,-348,26
+500,0,8
+500,58,10
+500,290,15
+500,522,20
+500,754,24
+500,986,29
+500,1218,34
+500,1450,38
+500,1682,43
+500,1914,48
+500,2146,52
+500,2378,57
+500,2610,61
+500,2842,66
+700,-812,37
+700,-348,28
+700,0,9
+700,58,12
+700,290,16
+700,522,21
+700,754,26
+700,986,30
+700,1218,35
+700,1450,39
+700,1682,44
+700,1914,49
+700,2146,53
+700,2378,58
+700,2610,63
+700,2842,67
+900,-812,39
+900,-348,30
+900,0,10
+900,58,13
+900,290,17
+900,522,22
+900,754,27
+900,986,31
+900,1218,36
+900,1450,41
+900,1682,45
+900,1914,50
+900,2146,55
+900,2378,59
+900,2610,64
+900,2842,68
+1100,-812,42
+1100,-348,32
+1100,0,11
+1100,58,14
+1100,290,19
+1100,522,23
+1100,754,28
+1100,986,32
+1100,1218,37
+1100,1450,42
+1100,1682,46
+1100,1914,51
+1100,2146,56
+1100,2378,60
+1100,2610,65
+1100,2842,70
+1300,-812,44
+1300,-348,35
+1300,0,12
+1300,58,15
+1300,290,20
+1300,522,24
+1300,754,29
+1300,986,34
+1300,1218,38
+1300,1450,43
+1300,1682,48
+1300,1914,52
+1300,2146,57
+1300,2378,61
+1300,2610,66
+1300,2842,71
+1500,-812,46
+1500,-348,37
+1500,0,13
+1500,58,16
+1500,290,21
+1500,522,26
+1500,754,30
+1500,986,35
+1500,1218,39
+1500,1450,44
+1500,1682,49
+1500,1914,53
+1500,2146,58
+1500,2378,63
+1500,2610,67
+1500,2842,72
+1700,-812,49
+1700,-348,39
+1700,0,14
+1700,58,17
+1700,290,22
+1700,522,27
+1700,754,31
+1700,986,36
+1700,1218,41
+1700,1450,45
+1700,1682,50
+1700,1914,55
+1700,2146,59
+1700,2378,64
+1700,2610,68
+1700,2842,73
+1900,-812,51
+1900,-348,42
+1900,0,15
+1900,58,19
+1900,290,23
+1900,522,28
+1900,754,32
+1900,986,37
+1900,1218,42
+1900,1450,46
+1900,1682,51
+1900,1914,56
+1900,2146,60
+1900,2378,65
+1900,2610,70
+1900,2842,74
+2100,-812,53
+2100,-348,44
+2100,0,16
+2100,58,20
+2100,290,24
+2100,522,29
+2100,754,34
+2100,986,38
+2100,1218,43
+2100,1450,48
+2100,1682,52
+2100,1914,57
+2100,2146,61
+2100,2378,66
+2100,2610,71
+2100,2842,75
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Retarder.vrlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Retarder.vrlm
new file mode 100644
index 0000000000000000000000000000000000000000..eb575b99973291e5414c4826da086c1f03a7f179
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Retarder.vrlm
@@ -0,0 +1,32 @@
+Retarder Speed [1/min],Torque Loss [Nm]
+0,10
+100,10
+200,10.1
+300,10.2
+400,10.3
+500,10.5
+600,10.7
+700,11
+800,11.3
+900,11.6
+1000,12
+1100,12.4
+1200,12.9
+1300,13.4
+1400,13.9
+1500,14.5
+1600,15.1
+1700,15.8
+1800,16.5
+1900,17.2
+2000,18
+2100,18.8
+2200,19.7
+2300,20.6
+2400,21.5
+2500,22.5
+2600,23.5
+2700,24.6
+2800,25.7
+2900,26.8
+3000,28
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index 48e16a4e983d0068f20c0c19e84757fb3e3ac983..3c4fb4b0e47f4a75bb16e0310958e2a1795d5a2e 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -95,6 +95,10 @@
<Compile Include="Integration\DeclarationReportTest.cs" />
<Compile Include="Integration\ShiftStrategy\ShiftStrategyTest.cs" />
<Compile Include="Integration\TorqueLimitsTest.cs" />
+ <Compile Include="Models\Declaration\DataAdapter\DeclarationAdapterTestHelper.cs" />
+ <Compile Include="Models\Declaration\DataAdapter\DeclarationDataAdapterTest_Class5.cs" />
+ <Compile Include="Models\Declaration\DataAdapter\DeclarationDataAdapterTest_Class2.cs" />
+ <Compile Include="Models\Declaration\DataAdapter\DeclarationDataAdapterTest_Class9.cs" />
<Compile Include="Models\Declaration\ShiftPolygonTest.cs" />
<Compile Include="Models\SimulationComponentData\TorqueConverterDataTest.cs" />
<Compile Include="Models\SimulationComponentData\ValidationTest.cs" />
@@ -885,6 +889,189 @@
<None Include="TestData\Integration\DeclarationMode\Class2_RigidTruck_4x2_VehTorqueLimits\MT_6.vgbx">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\325kW.vfld">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\325kW.vmap">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\AMT_12.vgbx">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Axle_4x2_Tractor.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Class5_Tractor.vveh">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Class5_Tractor_DECL.vecto">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Class5_Tractor_DECL.vsum">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Default.vrlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Engine_325kW_12.7l.veng">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_1.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_10.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_11.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_12.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_2.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_3.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_4.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_5.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_6.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_7.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_8.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2\Gear_9.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\325kW.vfld">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\325kW.vmap">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\AMT_12_topTorque.vgbx">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Axle_4x2_Tractor.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Class5_Tractor_topTorque.vveh">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Class5_Tractor_TopTorque_DECL.vecto">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Default.vrlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Engine_325kW_12.7l.veng">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_1.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_10.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_11.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_12.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_2.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_3.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_4.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_5.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_6.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_7.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_8.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class5_Tractor_4x2_TopTorque\Gear_9.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\324kW.vfld">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\350kW.vmap">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\AMT_12.vgbx">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Axle_4x2.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Class9_RigidTruck.vveh">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Class9_RigidTruck_DECL.vecto">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Engine_324kW_12.7l.veng">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_1.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_10.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_11.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_12.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_2.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_3.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_4.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_5.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_6.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_7.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_8.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Gear_9.vtlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="TestData\Integration\DeclarationMode\Class9_RigidTruck_6x2\Retarder.vrlm">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
<None Include="TestData\Integration\DriverStrategy\Cycles\Cycle_AccelerateAtBrake_80_0_level.vdri" />
<None Include="TestData\Integration\DriverStrategy\Cycles\Cycle_AccelerateBeforeBrake_80_0_level.vdri" />
<None Include="TestData\Integration\DriverStrategy\Cycles\Cycle_AccelerateWhileBrake_80_0_level.vdri" />
diff --git a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
index 6cff5ae60a90d6e3aeeaab971693c3dffbb93f76..df49d31fbc678f9383291b821f853bf9323e0005 100644
--- a/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLDeclarationInputTest.cs
@@ -1,7 +1,9 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
+using System.Windows.Forms;
using System.Xml;
+using System.Xml.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.Models;
@@ -9,6 +11,7 @@ using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.FileIO.XML.Declaration;
using TUGraz.VectoCore.InputData.Reader.ComponentData;
+using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Impl;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Engine;
using TUGraz.VectoCore.OutputData;
@@ -608,20 +611,20 @@ namespace TUGraz.VectoCore.Tests.XML
}
}
- [TestMethod, Ignore]
+ [TestMethod]
public void TestPTOTypeTypes()
{
- var ptoTypes = new[] {
- "None",
- "only the drive shaft of the PTO - shift claw, synchronizer, Schieberad",
- "only the drive shaft of the PTO - multi-disc clutch",
- "only the drive shaft of the PTO - multi-disc clutch, oil pump",
- "drive shaft and/or up to 2 gear wheels - shift claw, synchronizer, Schieberad",
- "drive shaft and/or up to 2 gear wheels - multi-disc clutch",
- "drive shaft and/or up to 2 gear wheels - multi-disc clutch, oil pump",
- "drive shaft and/or more than 2 gear wheels - shift claw, synchronizer, Schieberad",
- "drive shaft and/or more than 2 gear wheels - multi-disc clutch",
- "drive shaft and/or more than 2 gear wheels - multi-disc clutch, oil pump",
+ var ptoTypes = new string[][] {
+ new[] { "none", "none" },
+ new[] { "only the drive shaft of the PTO", "shift claw, synchronizer, sliding gearwheel" },
+ new[] { "only the drive shaft of the PTO", "multi-disc clutch" },
+ new[] { "only the drive shaft of the PTO", "multi-disc clutch, oil pump" },
+ new[] { "drive shaft and/or up to 2 gear wheels", "shift claw, synchronizer, sliding gearwheel" },
+ new[] { "drive shaft and/or up to 2 gear wheels", "multi-disc clutch" },
+ new[] { "drive shaft and/or up to 2 gear wheels", "multi-disc clutch, oil pump" },
+ new[] { "drive shaft and/or more than 2 gear wheels", "shift claw, synchronizer, sliding gearwheel" },
+ new[] { "drive shaft and/or more than 2 gear wheels", "multi-disc clutch" },
+ new[] { "drive shaft and/or more than 2 gear wheels", "multi-disc clutch, oil pump" },
};
foreach (var ptoType in ptoTypes) {
var reader = XmlReader.Create(SampleVehicleDecl);
@@ -633,20 +636,36 @@ namespace TUGraz.VectoCore.Tests.XML
var helper = new XPathHelper(ExecutionMode.Declaration);
helper.AddNamespaces(manager);
- var xmlRetarderType = nav.SelectSingleNode(helper.QueryAbs(
+ var ptoGearWheels = nav.SelectSingleNode(helper.QueryAbs(
+ helper.NSPrefix(XMLNames.VectoInputDeclaration,
+ Constants.XML.RootNSPrefix),
+ XMLNames.Component_Vehicle,
+ XMLNames.Vehicle_PTO,
+ XMLNames.Vehicle_PTO_ShaftsGearWheels),
+ manager);
+ ptoGearWheels.SetValue(ptoType[0]);
+ var ptoOther = nav.SelectSingleNode(helper.QueryAbs(
helper.NSPrefix(XMLNames.VectoInputDeclaration,
Constants.XML.RootNSPrefix),
XMLNames.Component_Vehicle,
- XMLNames.Vehicle_PTOType),
+ XMLNames.Vehicle_PTO,
+ XMLNames.Vehicle_PTO_OtherElements),
manager);
- xmlRetarderType.SetValue(ptoType);
+ ptoOther.SetValue(ptoType[1]);
var modified = XmlReader.Create(new StringReader(nav.OuterXml));
var inputDataProvider = new XMLDeclarationInputDataProvider(modified,
true);
- //Assert.AreEqual(ptoType, inputDataProvider.VehicleInputData.pto);
+ if (ptoType[0] == "none") {
+ Assert.AreEqual("None",
+ inputDataProvider.PTOTransmissionInputData.PTOTransmissionType);
+ } else {
+ Assert.AreEqual(string.Format("{0} - {1}", ptoType[0], ptoType[1]),
+ inputDataProvider.PTOTransmissionInputData.PTOTransmissionType);
+ }
+ DeclarationData.PTOTransmission.Lookup(inputDataProvider.PTOTransmissionInputData.PTOTransmissionType);
}
}
@@ -723,5 +742,29 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.AreEqual(gearboxType.Value, inputDataProvider.GearboxInputData.Type);
}
}
+
+ [TestMethod]
+ public void TestPTOInputNone()
+ {
+ var reader = XmlReader.Create(SampleVehicleDecl);
+
+ var inputDataProvider = new XMLDeclarationInputDataProvider(reader, true);
+ var ptoDataProvider = inputDataProvider.PTOTransmissionInputData;
+
+ Assert.AreEqual("None", ptoDataProvider.PTOTransmissionType);
+ }
+
+ [TestMethod]
+ public void TestPTOInput()
+ {
+ var reader = XmlReader.Create(SampleVehicleFullDecl);
+
+ var inputDataProvider = new XMLDeclarationInputDataProvider(reader, true);
+ var ptoDataProvider = inputDataProvider.PTOTransmissionInputData;
+ var ptoLosses = DeclarationData.PTOTransmission.Lookup(ptoDataProvider.PTOTransmissionType);
+
+ Assert.AreEqual("only the drive shaft of the PTO - multi-disc clutch", ptoDataProvider.PTOTransmissionType);
+ Assert.AreEqual(1000, ptoLosses.Value());
+ }
}
}
\ No newline at end of file