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

Skip to content
Snippets Groups Projects
Commit 719965bc authored by Harald Martini's avatar Harald Martini
Browse files

Merge branch 'feature/VECTO-1731-declaration-mode-xev-primary-bus' of... 

Merge branch 'feature/VECTO-1731-declaration-mode-xev-primary-bus' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into feature/VECTO-1731-declaration-mode-xev-primary-bus
parents 4488407e 66eacc8b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 47 additions and 87 deletions
VectoCore/VectoCore/Models/Declaration/InitEquivalenceFactors.cs
+ 3
− 3
View file @ 719965bc
...@@ -94,7 +94,7 @@ namespace TUGraz.VectoCore.Models.Declaration ...@@ -94,7 +94,7 @@ namespace TUGraz.VectoCore.Models.Declaration
public virtual double LookupSlope(MissionType mission, VehicleClass hdvClass, LoadingType loading) public virtual double LookupSlope(MissionType mission, VehicleClass hdvClass, LoadingType loading)
{ {
return _slope.Lookup( hdvClass.GetClassNumber(), mission.GetNonEMSMissionType().GetName().ToLowerInvariant(), return _slope.Lookup( hdvClass.GetClassNumberWithoutSubSuffix(), mission.GetNonEMSMissionType().GetName().ToLowerInvariant(),
loading); loading);
} }
...@@ -117,7 +117,7 @@ namespace TUGraz.VectoCore.Models.Declaration ...@@ -117,7 +117,7 @@ namespace TUGraz.VectoCore.Models.Declaration
} }
public double LookupEquivalenceFactor(MissionType mission, VehicleClass hdvClass, LoadingType loading) public double LookupEquivalenceFactor(MissionType mission, VehicleClass hdvClass, LoadingType loading)
{ {
var entry = Lookup(hdvClass.GetClassNumber()).cycleDict[mission.GetNonEMSMissionType()]; var entry = Lookup(hdvClass.GetClassNumberWithoutSubSuffix()).cycleDict[mission.GetNonEMSMissionType()];
switch (loading) switch (loading)
{ {
...@@ -157,7 +157,7 @@ namespace TUGraz.VectoCore.Models.Declaration ...@@ -157,7 +157,7 @@ namespace TUGraz.VectoCore.Models.Declaration
foreach (string vehClass in vehicleGroups.Split('/')) { foreach (string vehClass in vehicleGroups.Split('/')) {
var newEntry = new Entry var newEntry = new Entry
{ {
VehicleGroup = vehClass, VehicleGroup = vehClass.Trim(),
cycleDict = new Dictionary<MissionType, Tuple<double, double>>() cycleDict = new Dictionary<MissionType, Tuple<double, double>>()
}; };
......
VectoCore/VectoCore/Resources/Declaration/HEVParameters/Bus/Gradient_40.csv
+ 11
− 21
View file @ 719965bc
vehiclegroup , heavyurban , suburban , urban , interurban , coach vehiclegroup , heavyurban , suburban , urban , interurban , coach
P31SD , 0.0995/0.0925 , 0.0873/0.104 , 0.0983/0.0931 , 0.9/0.9 , 31 / P31SD / P31DD , 0.0995/0.0925 , 0.0873/0.104 , 0.0983/0.0931 , 0.9/0.9 ,
P31DD , 0.0995/0.0925 , 0.0873/0.104 , 0.0983/0.0931 , 0.9/0.9 , 32 / P32SD / P32DD , , , , 0.9/0.9 , 0.9/0.9
P32SD , , , , 0.9/0.9 , 0.9/0.9 33 / P33SD / P33DD , 0.0995/0.0925 , 0.0873/0.104 , 0.0983/0.0931 , 0.9/0.9 ,
P32DD , , , , 0.9/0.9 , 0.9/0.9 34 / P34SD / P34DD , , , , 0.9/0.9 , 0.9/0.9
P33SD , 0.0995/0.0925 , 0.0873/0.104 , 0.0983/0.0931 , 0.9/0.9 , 35 / P35SD / P35DD , 0.0995/0.0925 , 0.0873/0.104 , 0.0983/0.0931 , 0.9/0.9 ,
P33DD , 0.0995/0.0925 , 0.0873/0.104 , 0.0983/0.0931 , 0.9/0.9 , 36 / P36SD / P36DD , , , , 0.9/0.9 , 0.9/0.9
P34SD , , , , 0.9/0.9 , 0.9/0.9 37 / P37SD / P37DD , 0.0995/0.0925 , 0.0873/0.104 , 0.0983/0.0931 , 0.9/0.9 ,
P34DD , , , , 0.9/0.9 , 0.9/0.9 38 / P38SD / P38DD , , , , 0.9/0.9 , 0.9/0.9
P35SD , 0.0995/0.0925 , 0.0873/0.104 , 0.0983/0.0931 , 0.9/0.9 , 39 / P39SD / P39DD , 0.0995/0.0925 , 0.0873/0.104 , 0.0983/0.0931 , 0.9/0.9 ,
P35DD , 0.0995/0.0925 , 0.0873/0.104 , 0.0983/0.0931 , 0.9/0.9 , 40 / P40SD / P40DD , , , , 0.9/0.9 , 0.9/0.9
P36SD , , , , 0.9/0.9 , 0.9/0.9
P36DD , , , , 0.9/0.9 , 0.9/0.9
P37SD , 0.0995/0.0925 , 0.0873/0.104 , 0.0983/0.0931 , 0.9/0.9 ,
P37DD , 0.0995/0.0925 , 0.0873/0.104 , 0.0983/0.0931 , 0.9/0.9 ,
P38SD , , , , 0.9/0.9 , 0.9/0.9
P38DD , , , , 0.9/0.9 , 0.9/0.9
P39SD , 0.0995/0.0925 , 0.0873/0.104 , 0.0983/0.0931 , 0.9/0.9 ,
P39DD , 0.0995/0.0925 , 0.0873/0.104 , 0.0983/0.0931 , 0.9/0.9 ,
P40SD , , , , 0.9/0.9 , 0.9/0.9
P40DD , , , , 0.9/0.9 , 0.9/0.9
VectoCore/VectoCore/Resources/Declaration/HEVParameters/Bus/HEV_Strategy_Parameters_fequiv_10soc.csv
+ 11
− 21
View file @ 719965bc
vehiclegroup , heavyurban , suburban , urban , interurban , coach vehiclegroup , heavyurban , suburban , urban , interurban , coach
P31SD , 2.50 / 2.20 , 2.00 / 1.50 , 2.80 / 2.60 , 0.10 / 0.10 , 31 / P31SD / P31DD , 2.50 / 2.20 , 2.00 / 1.50 , 2.80 / 2.60 , 0.10 / 0.10 ,
P31DD , 2.50 / 2.20 , 2.00 / 1.50 , 2.80 / 2.60 , 0.10 / 0.10 , 32 / P32SD / P32DD , , , , 0.10 / 0.10 , 1.80 / 1.70
P32SD , , , , 0.10 / 0.10 , 1.80 / 1.70 33 / P33SD / P33DD , 2.50 / 2.20 , 2.00 / 1.50 , 2.80 / 2.60 , 0.10 / 0.10 ,
P32DD , , , , 0.10 / 0.10 , 1.80 / 1.70 34 / P34SD / P34DD , , , , 0.10 / 0.10 , 1.80 / 1.70
P33SD , 2.50 / 2.20 , 2.00 / 1.50 , 2.80 / 2.60 , 0.10 / 0.10 , 35 / P35SD / P35DD , 2.50 / 2.20 , 2.00 / 1.50 , 2.80 / 2.60 , 0.10 / 0.10 ,
P33DD , 2.50 / 2.20 , 2.00 / 1.50 , 2.80 / 2.60 , 0.10 / 0.10 , 36 / P36SD / P36DD , , , , 0.10 / 0.10 , 1.80 / 1.70
P34SD , , , , 0.10 / 0.10 , 1.80 / 1.70 37 / P37SD / P37DD , 2.50 / 2.20 , 2.00 / 1.50 , 2.80 / 2.60 , 0.10 / 0.10 ,
P34DD , , , , 0.10 / 0.10 , 1.80 / 1.70 38 / P38SD / P38DD , , , , 0.10 / 0.10 , 1.80 / 1.70
P35SD , 2.50 / 2.20 , 2.00 / 1.50 , 2.80 / 2.60 , 0.10 / 0.10 , 39 / P39SD / P39DD , 2.50 / 2.20 , 2.00 / 1.50 , 2.80 / 2.60 , 0.10 / 0.10 ,
P35DD , 2.50 / 2.20 , 2.00 / 1.50 , 2.80 / 2.60 , 0.10 / 0.10 , 40 / P40SD / P40DD , , , , 0.10 / 0.10 , 1.80 / 1.70
P36SD , , , , 0.10 / 0.10 , 1.80 / 1.70
P36DD , , , , 0.10 / 0.10 , 1.80 / 1.70
P37SD , 2.50 / 2.20 , 2.00 / 1.50 , 2.80 / 2.60 , 0.10 / 0.10 ,
P37DD , 2.50 / 2.20 , 2.00 / 1.50 , 2.80 / 2.60 , 0.10 / 0.10 ,
P38SD , , , , 0.10 / 0.10 , 1.80 / 1.70
P38DD , , , , 0.10 / 0.10 , 1.80 / 1.70
P39SD , 2.50 / 2.20 , 2.00 / 1.50 , 2.80 / 2.60 , 0.10 / 0.10 ,
P39DD , 2.50 / 2.20 , 2.00 / 1.50 , 2.80 / 2.60 , 0.10 / 0.10 ,
P40SD , , , , 0.10 / 0.10 , 1.80 / 1.70
P40DD , , , , 0.10 / 0.10 , 1.80 / 1.70
VectoCore/VectoCore/Resources/Declaration/HEVParameters/Bus/HEV_Strategy_Parameters_fequiv_20soc.csv
+ 11
− 21
View file @ 719965bc
vehiclegroup , heavyurban , suburban , urban , interurban , coach vehiclegroup , heavyurban , suburban , urban , interurban , coach
P31SD , 2.80 / 2.50 , 2.30 / 1.90 , 3.00 / 2.80 , 0.10 / 0.10 , 31 / P31SD / P31DD , 2.80 / 2.50 , 2.30 / 1.90 , 3.00 / 2.80 , 0.10 / 0.10 ,
P31DD , 2.80 / 2.50 , 2.30 / 1.90 , 3.00 / 2.80 , 0.10 / 0.10 , 32 / P32SD / P32DD , , , , 0.10 / 0.10 , 1.80 / 1.70
P32SD , , , , 0.10 / 0.10 , 1.80 / 1.70 33 / P33SD / P33DD , 2.80 / 2.50 , 2.30 / 1.90 , 3.00 / 2.80 , 0.10 / 0.10 ,
P32DD , , , , 0.10 / 0.10 , 1.80 / 1.70 34 / P34SD / P34DD , , , , 0.10 / 0.10 , 1.80 / 1.70
P33SD , 2.80 / 2.50 , 2.30 / 1.90 , 3.00 / 2.80 , 0.10 / 0.10 , 35 / P35SD / P35DD , 2.80 / 2.50 , 2.30 / 1.90 , 3.00 / 2.80 , 0.10 / 0.10 ,
P33DD , 2.80 / 2.50 , 2.30 / 1.90 , 3.00 / 2.80 , 0.10 / 0.10 , 36 / P36SD / P36DD , , , , 0.10 / 0.10 , 1.80 / 1.70
P34SD , , , , 0.10 / 0.10 , 1.80 / 1.70 37 / P37SD / P37DD , 2.80 / 2.50 , 2.30 / 1.90 , 3.00 / 2.80 , 0.10 / 0.10 ,
P34DD , , , , 0.10 / 0.10 , 1.80 / 1.70 38 / P38SD / P38DD , , , , 0.10 / 0.10 , 1.80 / 1.70
P35SD , 2.80 / 2.50 , 2.30 / 1.90 , 3.00 / 2.80 , 0.10 / 0.10 , 39 / P39SD / P39DD , 2.80 / 2.50 , 2.30 / 1.90 , 3.00 / 2.80 , 0.10 / 0.10 ,
P35DD , 2.80 / 2.50 , 2.30 / 1.90 , 3.00 / 2.80 , 0.10 / 0.10 , 40 / P40SD / P40DD , , , , 0.10 / 0.10 , 1.80 / 1.70
P36SD , , , , 0.10 / 0.10 , 1.80 / 1.70
P36DD , , , , 0.10 / 0.10 , 1.80 / 1.70
P37SD , 2.80 / 2.50 , 2.30 / 1.90 , 3.00 / 2.80 , 0.10 / 0.10 ,
P37DD , 2.80 / 2.50 , 2.30 / 1.90 , 3.00 / 2.80 , 0.10 / 0.10 ,
P38SD , , , , 0.10 / 0.10 , 1.80 / 1.70
P38DD , , , , 0.10 / 0.10 , 1.80 / 1.70
P39SD , 2.80 / 2.50 , 2.30 / 1.90 , 3.00 / 2.80 , 0.10 / 0.10 ,
P39DD , 2.80 / 2.50 , 2.30 / 1.90 , 3.00 / 2.80 , 0.10 / 0.10 ,
P40SD , , , , 0.10 / 0.10 , 1.80 / 1.70
P40DD , , , , 0.10 / 0.10 , 1.80 / 1.70
VectoCore/VectoCore/Resources/Declaration/HEVParameters/Bus/HEV_Strategy_Parameters_fequiv_40soc.csv
+ 11
− 21
View file @ 719965bc
vehiclegroup , heavyurban , suburban , urban , interurban , coach vehiclegroup , heavyurban , suburban , urban , interurban , coach
P31SD , 2.90 / 2.70 , 2.40 / 2.20 , 3.00 / 2.80 , 0.10 / 0.10 , 31 / P31SD / P31DD , 2.90 / 2.70 , 2.40 / 2.20 , 3.00 / 2.80 , 0.10 / 0.10 ,
P31DD , 2.90 / 2.70 , 2.40 / 2.20 , 3.00 / 2.80 , 0.10 / 0.10 , 32 / P32SD / P32DD , , , , 0.10 / 0.10 , 1.80 / 1.70
P32SD , , , , 0.10 / 0.10 , 1.80 / 1.70 33 / P33SD / P33DD , 2.90 / 2.70 , 2.40 / 2.20 , 3.00 / 2.80 , 0.10 / 0.10 ,
P32DD , , , , 0.10 / 0.10 , 1.80 / 1.70 34 / P34SD / P34DD , , , , 0.10 / 0.10 , 1.80 / 1.70
P33SD , 2.90 / 2.70 , 2.40 / 2.20 , 3.00 / 2.80 , 0.10 / 0.10 , 35 / P35SD / P35DD , 2.90 / 2.70 , 2.40 / 2.20 , 3.00 / 2.80 , 0.10 / 0.10 ,
P33DD , 2.90 / 2.70 , 2.40 / 2.20 , 3.00 / 2.80 , 0.10 / 0.10 , 36 / P36SD / P36DD , , , , 0.10 / 0.10 , 1.80 / 1.70
P34SD , , , , 0.10 / 0.10 , 1.80 / 1.70 37 / P37SD / P37DD , 2.90 / 2.70 , 2.40 / 2.20 , 3.00 / 2.80 , 0.10 / 0.10 ,
P34DD , , , , 0.10 / 0.10 , 1.80 / 1.70 38 / P38SD / P38DD , , , , 0.10 / 0.10 , 1.80 / 1.70
P35SD , 2.90 / 2.70 , 2.40 / 2.20 , 3.00 / 2.80 , 0.10 / 0.10 , 39 / P39SD / P39DD , 2.90 / 2.70 , 2.40 / 2.20 , 3.00 / 2.80 , 0.10 / 0.10 ,
P35DD , 2.90 / 2.70 , 2.40 / 2.20 , 3.00 / 2.80 , 0.10 / 0.10 , 40 / P40SD / P40DD , , , , 0.10 / 0.10 , 1.80 / 1.70
P36SD , , , , 0.10 / 0.10 , 1.80 / 1.70
P36DD , , , , 0.10 / 0.10 , 1.80 / 1.70
P37SD , 2.90 / 2.70 , 2.40 / 2.20 , 3.00 / 2.80 , 0.10 / 0.10 ,
P37DD , 2.90 / 2.70 , 2.40 / 2.20 , 3.00 / 2.80 , 0.10 / 0.10 ,
P38SD , , , , 0.10 / 0.10 , 1.80 / 1.70
P38DD , , , , 0.10 / 0.10 , 1.80 / 1.70
P39SD , 2.90 / 2.70 , 2.40 / 2.20 , 3.00 / 2.80 , 0.10 / 0.10 ,
P39DD , 2.90 / 2.70 , 2.40 / 2.20 , 3.00 / 2.80 , 0.10 / 0.10 ,
P40SD , , , , 0.10 / 0.10 , 1.80 / 1.70
P40DD , , , , 0.10 / 0.10 , 1.80 / 1.70
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