From 052b74185b68cbc510505ed74a1c64c5f9fdbb69 Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <quaritsch@ivt.tugraz.at> Date: Fri, 14 Apr 2023 13:36:49 +0200 Subject: [PATCH] formatting CSV tables with HEV strategy parameters, adding parameters for primary buses --- .../HEVParameters/Bus/Gradient_40.csv | 32 +++++++++++------ .../HEV_Strategy_Parameters_fequiv_10soc.csv | 36 +++++++++++-------- .../HEV_Strategy_Parameters_fequiv_20soc.csv | 35 ++++++++++-------- .../HEV_Strategy_Parameters_fequiv_40soc.csv | 35 ++++++++++-------- .../HEVParameters/Lorry/Gradient_40.csv | 28 +++++++-------- .../HEV_Strategy_Parameters_fequiv_10soc.csv | 28 +++++++-------- .../HEV_Strategy_Parameters_fequiv_20soc.csv | 28 +++++++-------- .../HEV_Strategy_Parameters_fequiv_40soc.csv | 28 +++++++-------- 8 files changed, 140 insertions(+), 110 deletions(-) diff --git a/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Bus/Gradient_40.csv b/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Bus/Gradient_40.csv index 0b84aecfcb..da30d8b7e6 100644 --- a/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Bus/Gradient_40.csv +++ b/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Bus/Gradient_40.csv @@ -1,11 +1,21 @@ -vehiclegroup ,heavyurban ,suburban ,urban ,interurban ,coach - 31 ,0.0995/0.0925 ,0.0873/0.104 ,0.0983/0.0931 ,0.9/0.9 , - 32 , , , ,0.9/0.9 ,0.9/0.9 - 33 ,0.0995/0.0925 ,0.0873/0.104 ,0.0983/0.0931 ,0.9/0.9 , - 34 , , , ,0.9/0.9 ,0.9/0.9 - 35 ,0.0995/0.0925 ,0.0873/0.104 ,0.0983/0.0931 ,0.9/0.9 , - 36 , , , ,0.9/0.9 ,0.9/0.9 - 37 ,0.0995/0.0925 ,0.0873/0.104 ,0.0983/0.0931 ,0.9/0.9 , - 38 , , , ,0.9/0.9 ,0.9/0.9 - 39 ,0.0995/0.0925 ,0.0873/0.104 ,0.0983/0.0931 ,0.9/0.9 , - 40 , , , ,0.9/0.9 ,0.9/0.9 +vehiclegroup , heavyurban , suburban , urban , interurban , coach +P31SD , 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 , +P32SD , , , , 0.9/0.9 , 0.9/0.9 +P32DD , , , , 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 , +P33DD , 0.0995/0.0925 , 0.0873/0.104 , 0.0983/0.0931 , 0.9/0.9 , +P34SD , , , , 0.9/0.9 , 0.9/0.9 +P34DD , , , , 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 , +P35DD , 0.0995/0.0925 , 0.0873/0.104 , 0.0983/0.0931 , 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 diff --git a/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Bus/HEV_Strategy_Parameters_fequiv_10soc.csv b/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Bus/HEV_Strategy_Parameters_fequiv_10soc.csv index 5340fb6daa..fc6c767847 100644 --- a/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Bus/HEV_Strategy_Parameters_fequiv_10soc.csv +++ b/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Bus/HEV_Strategy_Parameters_fequiv_10soc.csv @@ -1,15 +1,21 @@ -vehiclegroup , longhaul , regionaldelivery , urbandelivery , municipalutility , construction -53 , , 2.6/2.3 , 2.7/2.3 , , -54 , , 2.6/2.3 , 2.7/2.3 , , -1s , , 2.6/2.3 , 2.7/2.3 , , -1 , , 2.6/2.3 , 2.7/2.3 , , -2 , 0.1/0.1 , 2.6/2.3 , 2.7/2.3 , , -3 , , 2.6/2.3 , 2.7/2.3 , , -4 , 1.4/1.3 , 2.2/2.6 , 1.9/2.3 , 2.1/2.1 , 2.1/2.1 -5 , 1.4/1.3 , 2.2/2.6 , 1.9/2.3 , , 2.1/2.1 -9 , 1.4/1.3 , 2.2/2.6 , , 2.1/2.1 , 2.1/2.1 -10 , 1.4/1.3 , 2.2/2.6 , , , 2.1/2.1 -11 , 1.4/1.3 , 2.2/2.6 , , 2.1/2.1 , 2.1/2.1 -12 , 1.4/1.3 , 2.2/2.6 , , , 2.1/2.1 -16 , , , , , 2.1/2.1 - +vehiclegroup , heavyurban , suburban , urban , interurban , coach +P31SD , 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 , +P32SD , , , , 0.10 / 0.10 , 1.80 / 1.70 +P32DD , , , , 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 , +P33DD , 2.50 / 2.20 , 2.00 / 1.50 , 2.80 / 2.60 , 0.10 / 0.10 , +P34SD , , , , 0.10 / 0.10 , 1.80 / 1.70 +P34DD , , , , 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 , +P35DD , 2.50 / 2.20 , 2.00 / 1.50 , 2.80 / 2.60 , 0.10 / 0.10 , +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 diff --git a/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Bus/HEV_Strategy_Parameters_fequiv_20soc.csv b/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Bus/HEV_Strategy_Parameters_fequiv_20soc.csv index 96dbaeb586..1872058299 100644 --- a/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Bus/HEV_Strategy_Parameters_fequiv_20soc.csv +++ b/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Bus/HEV_Strategy_Parameters_fequiv_20soc.csv @@ -1,14 +1,21 @@ -vehiclegroup ,longhaul ,regionaldelivery ,urbandelivery ,municipalutility ,construction -53 , ,2.8/2.5 ,2.7/2.6 , , -54 , ,2.8/2.5 ,2.7/2.6 , , -1s , ,2.8/2.5 ,2.7/2.6 , , -1 , ,2.8/2.5 ,2.7/2.6 , , -2 ,1.9/2.4 ,2.8/2.5 ,2.7/2.6 , , -3 , ,2.8/2.5 ,2.7/2.6 , , -4 ,1.8/1.6 ,2.4/2.7 ,2.1/2.5 ,2.1/2.1 ,2.1/2.1 -5 ,1.8/1.6 ,2.4/2.7 ,2.1/2.5 , ,2.1/2.1 -9 ,1.8/1.6 ,2.4/2.7 , ,2.1/2.1 ,2.1/2.1 -10 ,1.8/1.6 ,2.4/2.7 , , ,2.1/2.1 -11 ,1.8/1.6 ,2.4/2.7 , ,2.1/2.1 ,2.1/2.1 -12 ,1.8/1.6 ,2.4/2.7 , , ,2.1/2.1 -16 , , , , ,2.1/2.1 +vehiclegroup , heavyurban , suburban , urban , interurban , coach +P31SD , 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 , +P32SD , , , , 0.10 / 0.10 , 1.80 / 1.70 +P32DD , , , , 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 , +P33DD , 2.80 / 2.50 , 2.30 / 1.90 , 3.00 / 2.80 , 0.10 / 0.10 , +P34SD , , , , 0.10 / 0.10 , 1.80 / 1.70 +P34DD , , , , 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 , +P35DD , 2.80 / 2.50 , 2.30 / 1.90 , 3.00 / 2.80 , 0.10 / 0.10 , +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 diff --git a/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Bus/HEV_Strategy_Parameters_fequiv_40soc.csv b/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Bus/HEV_Strategy_Parameters_fequiv_40soc.csv index aa52ea9aaf..d2379f0af1 100644 --- a/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Bus/HEV_Strategy_Parameters_fequiv_40soc.csv +++ b/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Bus/HEV_Strategy_Parameters_fequiv_40soc.csv @@ -1,14 +1,21 @@ -vehiclegroup , longhaul , regionaldelivery , urbandelivery , municipalutility , construction -53 , , 2.8/2.6 , 2.8/2.7 , , -54 , , 2.8/2.6 , 2.8/2.7 , , -1s , , 2.8/2.6 , 2.8/2.7 , , -1 , , 2.8/2.6 , 2.8/2.7 , , -2 , 2/2.2 , 2.8/2.6 , 2.8/2.7 , , -3 , , 2.8/2.6 , 2.8/2.7 , , -4 , 2/1.8 , 2.4/2.8 , 2.1/2.5 , 2.1/2.1 , 2.1/2.1 -5 , 2/1.8 , 2.4/2.8 , 2.1/2.5 , , 2.1/2.1 -9 , 2/1.8 , 2.4/2.8 , , 2.1/2.1 , 2.1/2.1 -10 , 2/1.8 , 2.4/2.8 , , , 2.1/2.1 -11 , 2/1.8 , 2.4/2.8 , , 2.1/2.1 , 2.1/2.1 -12 , 2/1.8 , 2.4/2.8 , , , 2.1/2.1 -16 , , , , , 2.1/2.1 +vehiclegroup , heavyurban , suburban , urban , interurban , coach +P31SD , 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 , +P32SD , , , , 0.10 / 0.10 , 1.80 / 1.70 +P32DD , , , , 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 , +P33DD , 2.90 / 2.70 , 2.40 / 2.20 , 3.00 / 2.80 , 0.10 / 0.10 , +P34SD , , , , 0.10 / 0.10 , 1.80 / 1.70 +P34DD , , , , 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 , +P35DD , 2.90 / 2.70 , 2.40 / 2.20 , 3.00 / 2.80 , 0.10 / 0.10 , +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 diff --git a/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Lorry/Gradient_40.csv b/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Lorry/Gradient_40.csv index 1d7f0213d7..070164fc2b 100644 --- a/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Lorry/Gradient_40.csv +++ b/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Lorry/Gradient_40.csv @@ -1,14 +1,14 @@ -vehiclegroup ,longhaul ,regionaldelivery ,urbandelivery ,municipalutility ,construction -53 , ,0.0898/0.0919 ,0.0957/0.096 , , -54 , ,0.0898/0.0919 ,0.0957/0.096 , , -1s , ,0.0898/0.0919 ,0.0957/0.096 , , -1 , ,0.0898/0.0919 ,0.0957/0.096 , , -2 ,0.0956/0.1062 ,0.0898/0.0919 ,0.0957/0.096 , , -3 , ,0.0898/0.0919 ,0.0957/0.096 , , -4 ,0.0993/0.0905 ,0.0723/0.0632 ,0.0876/0.0925 ,0.9/0.9 ,0.9/0.9 -5 ,0.0993/0.0905 ,0.0723/0.0632 ,0.0876/0.0925 , ,0.9/0.9 -9 ,0.0993/0.0905 ,0.0723/0.0632 , ,0.9/0.9 ,0.9/0.9 -10 ,0.0993/0.0905 ,0.0723/0.0632 , , ,0.9/0.9 -11 ,0.0993/0.0905 ,0.0723/0.0632 , ,0.9/0.9 ,0.9/0.9 -12 ,0.0993/0.0905 ,0.0723/0.0632 , , ,0.9/0.9 -16 , , , , ,0.9/0.9 +vehiclegroup , longhaul , regionaldelivery , urbandelivery , municipalutility , construction +53 , , 0.0898 / 0.0919 , 0.0957 / 0.096 , , +54 , , 0.0898 / 0.0919 , 0.0957 / 0.096 , , +1s , , 0.0898 / 0.0919 , 0.0957 / 0.096 , , +1 , , 0.0898 / 0.0919 , 0.0957 / 0.096 , , +2 , 0.0956 / 0.1062 , 0.0898 / 0.0919 , 0.0957 / 0.096 , , +3 , , 0.0898 / 0.0919 , 0.0957 / 0.096 , , +4 , 0.0993 / 0.0905 , 0.0723 / 0.0632 , 0.0876 / 0.0925 , 0.9 / 0.9 , 0.9 / 0.9 +5 , 0.0993 / 0.0905 , 0.0723 / 0.0632 , 0.0876 / 0.0925 , , 0.9 / 0.9 +9 , 0.0993 / 0.0905 , 0.0723 / 0.0632 , , 0.9 / 0.9 , 0.9 / 0.9 +10 , 0.0993 / 0.0905 , 0.0723 / 0.0632 , , , 0.9 / 0.9 +11 , 0.0993 / 0.0905 , 0.0723 / 0.0632 , , 0.9 / 0.9 , 0.9 / 0.9 +12 , 0.0993 / 0.0905 , 0.0723 / 0.0632 , , , 0.9 / 0.9 +16 , , , , , 0.9 / 0.9 diff --git a/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Lorry/HEV_Strategy_Parameters_fequiv_10soc.csv b/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Lorry/HEV_Strategy_Parameters_fequiv_10soc.csv index 5340fb6daa..286f42463d 100644 --- a/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Lorry/HEV_Strategy_Parameters_fequiv_10soc.csv +++ b/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Lorry/HEV_Strategy_Parameters_fequiv_10soc.csv @@ -1,15 +1,15 @@ -vehiclegroup , longhaul , regionaldelivery , urbandelivery , municipalutility , construction -53 , , 2.6/2.3 , 2.7/2.3 , , -54 , , 2.6/2.3 , 2.7/2.3 , , -1s , , 2.6/2.3 , 2.7/2.3 , , -1 , , 2.6/2.3 , 2.7/2.3 , , -2 , 0.1/0.1 , 2.6/2.3 , 2.7/2.3 , , -3 , , 2.6/2.3 , 2.7/2.3 , , -4 , 1.4/1.3 , 2.2/2.6 , 1.9/2.3 , 2.1/2.1 , 2.1/2.1 -5 , 1.4/1.3 , 2.2/2.6 , 1.9/2.3 , , 2.1/2.1 -9 , 1.4/1.3 , 2.2/2.6 , , 2.1/2.1 , 2.1/2.1 -10 , 1.4/1.3 , 2.2/2.6 , , , 2.1/2.1 -11 , 1.4/1.3 , 2.2/2.6 , , 2.1/2.1 , 2.1/2.1 -12 , 1.4/1.3 , 2.2/2.6 , , , 2.1/2.1 -16 , , , , , 2.1/2.1 +vehiclegroup , longhaul , regionaldelivery , urbandelivery , municipalutility , construction +53 , , 2.6 / 2.3 , 2.7 / 2.3 , , +54 , , 2.6 / 2.3 , 2.7 / 2.3 , , +1s , , 2.6 / 2.3 , 2.7 / 2.3 , , +1 , , 2.6 / 2.3 , 2.7 / 2.3 , , +2 , 0.1 / 0.1 , 2.6 / 2.3 , 2.7 / 2.3 , , +3 , , 2.6 / 2.3 , 2.7 / 2.3 , , +4 , 1.4 / 1.3 , 2.2 / 2.6 , 1.9 / 2.3 , 2.1 / 2.1 , 2.1 / 2.1 +5 , 1.4 / 1.3 , 2.2 / 2.6 , 1.9 / 2.3 , , 2.1 / 2.1 +9 , 1.4 / 1.3 , 2.2 / 2.6 , , 2.1 / 2.1 , 2.1 / 2.1 +10 , 1.4 / 1.3 , 2.2 / 2.6 , , , 2.1 / 2.1 +11 , 1.4 / 1.3 , 2.2 / 2.6 , , 2.1 / 2.1 , 2.1 / 2.1 +12 , 1.4 / 1.3 , 2.2 / 2.6 , , , 2.1 / 2.1 +16 , , , , , 2.1 / 2.1 diff --git a/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Lorry/HEV_Strategy_Parameters_fequiv_20soc.csv b/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Lorry/HEV_Strategy_Parameters_fequiv_20soc.csv index 96dbaeb586..81ea944b66 100644 --- a/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Lorry/HEV_Strategy_Parameters_fequiv_20soc.csv +++ b/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Lorry/HEV_Strategy_Parameters_fequiv_20soc.csv @@ -1,14 +1,14 @@ -vehiclegroup ,longhaul ,regionaldelivery ,urbandelivery ,municipalutility ,construction -53 , ,2.8/2.5 ,2.7/2.6 , , -54 , ,2.8/2.5 ,2.7/2.6 , , -1s , ,2.8/2.5 ,2.7/2.6 , , -1 , ,2.8/2.5 ,2.7/2.6 , , -2 ,1.9/2.4 ,2.8/2.5 ,2.7/2.6 , , -3 , ,2.8/2.5 ,2.7/2.6 , , -4 ,1.8/1.6 ,2.4/2.7 ,2.1/2.5 ,2.1/2.1 ,2.1/2.1 -5 ,1.8/1.6 ,2.4/2.7 ,2.1/2.5 , ,2.1/2.1 -9 ,1.8/1.6 ,2.4/2.7 , ,2.1/2.1 ,2.1/2.1 -10 ,1.8/1.6 ,2.4/2.7 , , ,2.1/2.1 -11 ,1.8/1.6 ,2.4/2.7 , ,2.1/2.1 ,2.1/2.1 -12 ,1.8/1.6 ,2.4/2.7 , , ,2.1/2.1 -16 , , , , ,2.1/2.1 +vehiclegroup , longhaul , regionaldelivery , urbandelivery , municipalutility , construction +53 , , 2.8 / 2.5 , 2.7 / 2.6 , , +54 , , 2.8 / 2.5 , 2.7 / 2.6 , , +1s , , 2.8 / 2.5 , 2.7 / 2.6 , , +1 , , 2.8 / 2.5 , 2.7 / 2.6 , , +2 , 1.9 / 2.4 , 2.8 / 2.5 , 2.7 / 2.6 , , +3 , , 2.8 / 2.5 , 2.7 / 2.6 , , +4 , 1.8 / 1.6 , 2.4 / 2.7 , 2.1 / 2.5 , 2.1 / 2.1 , 2.1 / 2.1 +5 , 1.8 / 1.6 , 2.4 / 2.7 , 2.1 / 2.5 , , 2.1 / 2.1 +9 , 1.8 / 1.6 , 2.4 / 2.7 , , 2.1 / 2.1 , 2.1 / 2.1 +10 , 1.8 / 1.6 , 2.4 / 2.7 , , , 2.1 / 2.1 +11 , 1.8 / 1.6 , 2.4 / 2.7 , , 2.1 / 2.1 , 2.1 / 2.1 +12 , 1.8 / 1.6 , 2.4 / 2.7 , , , 2.1 / 2.1 +16 , , , , , 2.1 / 2.1 diff --git a/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Lorry/HEV_Strategy_Parameters_fequiv_40soc.csv b/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Lorry/HEV_Strategy_Parameters_fequiv_40soc.csv index aa52ea9aaf..61c8a51cc6 100644 --- a/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Lorry/HEV_Strategy_Parameters_fequiv_40soc.csv +++ b/VectoCore/VectoCore/Resources/Declaration/HEVParameters/Lorry/HEV_Strategy_Parameters_fequiv_40soc.csv @@ -1,14 +1,14 @@ -vehiclegroup , longhaul , regionaldelivery , urbandelivery , municipalutility , construction -53 , , 2.8/2.6 , 2.8/2.7 , , -54 , , 2.8/2.6 , 2.8/2.7 , , -1s , , 2.8/2.6 , 2.8/2.7 , , -1 , , 2.8/2.6 , 2.8/2.7 , , -2 , 2/2.2 , 2.8/2.6 , 2.8/2.7 , , -3 , , 2.8/2.6 , 2.8/2.7 , , -4 , 2/1.8 , 2.4/2.8 , 2.1/2.5 , 2.1/2.1 , 2.1/2.1 -5 , 2/1.8 , 2.4/2.8 , 2.1/2.5 , , 2.1/2.1 -9 , 2/1.8 , 2.4/2.8 , , 2.1/2.1 , 2.1/2.1 -10 , 2/1.8 , 2.4/2.8 , , , 2.1/2.1 -11 , 2/1.8 , 2.4/2.8 , , 2.1/2.1 , 2.1/2.1 -12 , 2/1.8 , 2.4/2.8 , , , 2.1/2.1 -16 , , , , , 2.1/2.1 +vehiclegroup , longhaul , regionaldelivery , urbandelivery , municipalutility , construction +53 , , 2.8 / 2.6 , 2.8 / 2.7 , , +54 , , 2.8 / 2.6 , 2.8 / 2.7 , , +1s , , 2.8 / 2.6 , 2.8 / 2.7 , , +1 , , 2.8 / 2.6 , 2.8 / 2.7 , , +2 , 2.0 / 2.2 , 2.8 / 2.6 , 2.8 / 2.7 , , +3 , , 2.8 / 2.6 , 2.8 / 2.7 , , +4 , 2.0 / 1.8 , 2.4 / 2.8 , 2.1 / 2.5 , 2.1 / 2.1 , 2.1 / 2.1 +5 , 2.0 / 1.8 , 2.4 / 2.8 , 2.1 / 2.5 , , 2.1 / 2.1 +9 , 2.0 / 1.8 , 2.4 / 2.8 , , 2.1 / 2.1 , 2.1 / 2.1 +10 , 2.0 / 1.8 , 2.4 / 2.8 , , , 2.1 / 2.1 +11 , 2.0 / 1.8 , 2.4 / 2.8 , , 2.1 / 2.1 , 2.1 / 2.1 +12 , 2.0 / 1.8 , 2.4 / 2.8 , , , 2.1 / 2.1 +16 , , , , , 2.1 / 2.1 -- GitLab