Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit bd77cc6b authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge pull request #418 in VECTO/vecto-sim from... 

Merge pull request #418 in VECTO/vecto-sim from ~EMQUARIMA/vecto-sim:feature/VECTO-499-change-decision-if-ems-is-used to develop

* commit '8f0280c4':
  change decision whether EMS is simulated depending on declared engine power
  elevate testdata to latest json file version (engine v4)
parents a9611f0a 8f0280c4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 86 additions and 60 deletions
VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
+ 1
− 1
View file @ bd77cc6b
......@@ -104,7 +104,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
foreach (var mission in segment.Missions) {
if (mission.MissionType.IsEMS() &&
engineData.FullLoadCurves[0].MaxPower.IsSmaller(DeclarationData.MinEnginePowerForEMS)) {
engineData.RatedPowerDeclared.IsSmaller(DeclarationData.MinEnginePowerForEMS)) {
continue;
}
DrivingCycleData cycle;
......
VectoCore/VectoCoreTest/TestData/Components/40t_Long_Haul_Truck.veng
+ 21
− 14
View file @ bd77cc6b
{
"Header": {
"CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
"Date": "25.06.2015 09:02:39",
"AppVersion": "2.2 beta",
"FileVersion": 3
"CreatedBy": "Raphael Luz IVT TU-Graz (14fea510-e457-4bf6-860f-a9514dc327f1)",
"Date": "25.06.2015 09:02:39",
"AppVersion": "2.2 beta",
"FileVersion": 4
},
"Body": {
"SavedInDeclMode": true,
"ModelName": "Generic 40t Long Haul Truck",
"Displacement": 12730.0,
"IdlingSpeed": 560.0,
"Inertia": 5.1471,
"FullLoadCurve": "40t_Long_Haul_Truck.vfld",
"FuelMap": "40t_Long_Haul_Truck.vmap",
"WHTC-Urban": 0.97,
"WHTC-Rural": 0.99,
"WHTC-Motorway": 1.02
"SavedInDeclMode": true,
"ModelName": "Generic 40t Long Haul Truck",
"Displacement": 12730.0,
"IdlingSpeed": 560.0,
"Inertia": 5.1471,
"FullLoadCurve": "40t_Long_Haul_Truck.vfld",
"FuelMap": "40t_Long_Haul_Truck.vmap",
"WHTC-Urban": 0.97,
"WHTC-Rural": 0.99,
"WHTC-Motorway": 1.02,
"ColdHotBalancingFactor": 1.0,
"CFRegPer": 1.00,
"CFNCF": 1.00,
"FuelType": "Diesel CI",
"RatedPower": 320000,
"RatedSpeed": 2400,
"MaxTorque": 2300
}
}
\ No newline at end of file
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/40t Truck/40t_Long_Haul_Truck.veng
+ 21
− 14
View file @ bd77cc6b
{
"Header": {
"CreatedBy": " ()",
"Date": "10/6/2015 3:15:22 PM",
"AppVersion": "2.2",
"FileVersion": 3
"CreatedBy": " ()",
"Date": "10/6/2015 3:15:22 PM",
"AppVersion": "2.2",
"FileVersion": 4
},
"Body": {
"SavedInDeclMode": true,
"ModelName": "Generic 40t Long Haul Truck",
"Displacement": 12730.0,
"IdlingSpeed": 560.0,
"Inertia": 5.1471,
"FullLoadCurve": "40t_Long_Haul_Truck.vfld",
"FuelMap": "40t_Long_Haul_Truck.vmap",
"WHTC-Urban": 0.97,
"WHTC-Rural": 0.99,
"WHTC-Motorway": 1.02
"SavedInDeclMode": true,
"ModelName": "Generic 40t Long Haul Truck",
"Displacement": 12730.0,
"IdlingSpeed": 560.0,
"Inertia": 5.1471,
"FullLoadCurve": "40t_Long_Haul_Truck.vfld",
"FuelMap": "40t_Long_Haul_Truck.vmap",
"WHTC-Urban": 0.97,
"WHTC-Rural": 0.99,
"WHTC-Motorway": 1.02,
"ColdHotBalancingFactor": 1.0,
"CFRegPer": 1.00,
"CFNCF": 1.00,
"FuelType": "Diesel CI",
"RatedPower": 320000,
"RatedSpeed": 2400,
"MaxTorque": 2300
}
}
\ No newline at end of file
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class5_Tractor_4x2/Engine_325kW_12.7l.veng
+ 21
− 15
View file @ bd77cc6b
{
"Header": {
"CreatedBy": " ()",
"Date": "2016-10-13T10:08:08.3476564Z",
"AppVersion": "3",
"FileVersion": 3
"CreatedBy": " ()",
"Date": "2016-10-13T10:08:08.3476564Z",
"AppVersion": "3",
"FileVersion": 4
},
"Body": {
"SavedInDeclMode": true,
"ModelName": "325kW 12.7l Engine",
"Displacement": "12740",
"IdlingSpeed": 600.0,
"Inertia": 5.1498,
"FullLoadCurve": "325kW.vfld",
"FuelMap": "325kW.vmap",
"WHTC-Urban": 1.04,
"WHTC-Rural": 1.01,
"WHTC-Motorway": 1.00,
"ColdHotBalancingFactor": 1.0
"SavedInDeclMode": true,
"ModelName": "325kW 12.7l Engine",
"Displacement": "12740",
"IdlingSpeed": 600.0,
"Inertia": 5.1498,
"FullLoadCurve": "325kW.vfld",
"FuelMap": "325kW.vmap",
"WHTC-Urban": 1.04,
"WHTC-Rural": 1.01,
"WHTC-Motorway": 1.00,
"ColdHotBalancingFactor": 1.0,
"CFRegPer": 1.00,
"CFNCF": 1.00,
"FuelType": "Diesel CI",
"RatedPower": 325000,
"RatedSpeed": 2400,
"MaxTorque": 2300
}
}
\ No newline at end of file
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/Class9_RigidTruck_6x2/Engine_324kW_12.7l.veng
+ 22
− 16
View file @ bd77cc6b
{
"Header": {
"CreatedBy": " ()",
"Date": "2017-05-19T08:13:02.2025457Z",
"AppVersion": "3",
"FileVersion": 3
"CreatedBy": " ()",
"Date": "2017-05-19T08:13:02.2025457Z",
"AppVersion": "3",
"FileVersion": 4
},
"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
"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,
"CFRegPer": 1.00,
"CFNCF": 1.00,
"FuelType": "Diesel CI",
"RatedPower": 320000,
"RatedSpeed": 2400,
"MaxTorque": 2300
}
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about