From d546d45c5e67bc1d46f3824eb30263b56210e560 Mon Sep 17 00:00:00 2001
From: "VKMTHD\\haraldmartini" <harald.martini@student.tugraz.at>
Date: Tue, 20 Sep 2022 14:03:45 +0200
Subject: [PATCH] updated aux CSVs

---
 .../Declaration/VAUX/Fan-Tech-Medium.csv      | 24 +++----
 .../Resources/Declaration/VAUX/Fan-Tech.csv   | 32 ++++-----
 .../Resources/Declaration/VAUX/PS-Table.csv   | 69 +++++++++++--------
 .../Resources/Declaration/VAUX/SP-Tech.csv    | 18 ++---
 4 files changed, 76 insertions(+), 67 deletions(-)

diff --git a/VectoCore/VectoCore/Resources/Declaration/VAUX/Fan-Tech-Medium.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/Fan-Tech-Medium.csv
index 4e2f1ebc32..624e8ac8c1 100644
--- a/VectoCore/VectoCore/Resources/Declaration/VAUX/Fan-Tech-Medium.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/VAUX/Fan-Tech-Medium.csv
@@ -1,12 +1,12 @@
-Technology                                                                 , fully electric , Long haul , Regional delivery , Urban delivery , Municipal utility , Construction
-Crankshaft mounted - Electronically controlled visco clutch                , 0              , 0         , 258               , 198            , 0                 , 0
-Crankshaft mounted - Bimetallic controlled visco clutch                    , 0              , 0         , 335               , 260            , 0                 , 0
-Crankshaft mounted - Discrete step clutch                                  , 0              , 0         , 277               , 237            , 0                 , 0
-Crankshaft mounted - On/off clutch                                         , 0              , 0         , 297               , 256            , 0                 , 0
-Belt driven or driven via transm. - Electronically controlled visco clutch , 0              , 0         , 402               , 320            , 0                 , 0
-Belt driven or driven via transm. - Bimetallic controlled visco clutch     , 0              , 0         , 478               , 382            , 0                 , 0
-Belt driven or driven via transm. - Discrete step clutch                   , 0              , 0         , 421               , 378            , 0                 , 0
-Belt driven or driven via transm. - On/off clutch                          , 0              , 0         , 440               , 397            , 0                 , 0
-Hydraulic driven - Variable displacement pump                              , 0              , 0         , 444               , 320            , 0                 , 0
-Hydraulic driven - Constant displacement pump                              , 0              , 0         , 538               , 385            , 0                 , 0
-Electrically driven - Electronically controlled                            , 0              , 0         , 308               , 231            , 0                 , 0
+Technology                                                                 ,conventional ,P-HEV ,S-HEV ,PEV ,fully electric ,Long haul ,Regional delivery ,Urban delivery ,Municipal utility ,Construction
+Crankshaft mounted - Electronically controlled visco clutch                ,           1 ,    1 ,    1 ,  0 ,             0 ,        0 ,              258 ,           198 ,                0 ,           0
+Crankshaft mounted - Bimetallic controlled visco clutch                    ,           1 ,    1 ,    1 ,  0 ,             0 ,        0 ,              335 ,           260 ,                0 ,           0
+Crankshaft mounted - Discrete step clutch                                  ,           1 ,    1 ,    1 ,  0 ,             0 ,        0 ,              277 ,           237 ,                0 ,           0
+Crankshaft mounted - On/off clutch                                         ,           1 ,    1 ,    1 ,  0 ,             0 ,        0 ,              297 ,           256 ,                0 ,           0
+Belt driven or driven via transm. - Electronically controlled visco clutch ,           1 ,    1 ,    1 ,  0 ,             0 ,        0 ,              402 ,           320 ,                0 ,           0
+Belt driven or driven via transm. - Bimetallic controlled visco clutch     ,           1 ,    1 ,    1 ,  0 ,             0 ,        0 ,              478 ,           382 ,                0 ,           0
+Belt driven or driven via transm. - Discrete step clutch                   ,           1 ,    1 ,    1 ,  0 ,             0 ,        0 ,              421 ,           378 ,                0 ,           0
+Belt driven or driven via transm. - On/off clutch                          ,           1 ,    1 ,    1 ,  0 ,             0 ,        0 ,              440 ,           397 ,                0 ,           0
+Hydraulic driven - Variable displacement pump                              ,           1 ,    1 ,    1 ,  0 ,             0 ,        0 ,              444 ,           320 ,                0 ,           0
+Hydraulic driven - Constant displacement pump                              ,           1 ,    1 ,    1 ,  0 ,             0 ,        0 ,              538 ,           385 ,                0 ,           0
+Electrically driven - Electronically controlled                            ,           1 ,    1 ,    1 ,  0 ,             1 ,        0 ,              308 ,           231 ,                0 ,           0
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Resources/Declaration/VAUX/Fan-Tech.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/Fan-Tech.csv
index b67f1416d1..6ff516d66c 100644
--- a/VectoCore/VectoCore/Resources/Declaration/VAUX/Fan-Tech.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/VAUX/Fan-Tech.csv
@@ -1,16 +1,16 @@
-Technology                                                                 , fully electric , Long haul , Regional delivery , Urban delivery , Municipal utility , Construction , Heavy Urban , Urban , Suburban , Interurban , Coach
-Crankshaft mounted - Electronically controlled visco clutch                , 0              , 618       , 671               , 516            , 566               , 1037         , 2000        , 2000  , 2000     , 1400       , 1400
-Crankshaft mounted - Bimetallic controlled visco clutch                    , 0              , 818       , 871               , 676            , 766               , 1277         , 3000        , 3000  , 3000     , 3000       , 3000
-Crankshaft mounted - Discrete step clutch                                  , 0              , 668       , 721               , 616            , 616               , 1157         , 0           , 0     , 0        , 0          , 0
-Crankshaft mounted - Discrete step clutch 2 stages                         , 0              , 0         , 0                 , 0              , 0                 , 0            , 3000        , 3000  , 3000     , 2400       , 2400
-Crankshaft mounted - Discrete step clutch 3 stages                         , 0              , 0         , 0                 , 0              , 0                 , 0            , 2000        , 2000  , 2000     , 1500       , 1600
-Crankshaft mounted - On/off clutch                                         , 0              , 718       , 771               , 666            , 666               , 1237         , 5000        , 5000  , 5000     , 4300       , 4000
-Belt driven or driven via transm. - Electronically controlled visco clutch , 0              , 989       , 1044              , 833            , 933               , 1478         , 2000        , 2000  , 2000     , 1400       , 1400
-Belt driven or driven via transm. - Bimetallic controlled visco clutch     , 0              , 1189      , 1244              , 993            , 1133              , 1718         , 3000        , 3000  , 3000     , 3000       , 3000
-Belt driven or driven via transm. - Discrete step clutch                   , 0              , 1039      , 1094              , 983            , 983               , 1598         , 0           , 0     , 0        , 0          , 0
-Belt driven or driven via transm. - Discrete step clutch 2 stages          , 0              , 0         , 0                 , 0              , 0                 , 0            , 3000        , 3000  , 3000     , 2400       , 2400
-Belt driven or driven via transm. - Discrete step clutch 3 stages          , 0              , 0         , 0                 , 0              , 0                 , 0            , 2000        , 2000  , 2000     , 1500       , 1600
-Belt driven or driven via transm. - On/off clutch                          , 0              , 1089      , 1144              , 1033           , 1033              , 1678         , 5000        , 5000  , 5000     , 4300       , 4000
-Hydraulic driven - Variable displacement pump                              , 0              , 938       , 1155              , 832            , 917               , 1872         , 1300        , 1300  , 1300     , 1600       , 1900
-Hydraulic driven - Constant displacement pump                              , 0              , 1200      , 1400              , 1000           , 1100              , 2300         , 1800        , 1800  , 1800     , 2000       , 2000
-Electrically driven - Electronically controlled                            , 1              , 700       , 800               , 600            , 600               , 1400         , 1000        , 1000  , 1000     , 1100       , 1200
\ No newline at end of file
+Technology                                                                 ,conventional ,p-hev ,s-hev ,pev ,fully electric ,Long haul ,Regional delivery ,Urban delivery ,Municipal utility ,Construction ,Heavy Urban ,Urban ,Suburban ,Interurban ,Coach
+Crankshaft mounted - Electronically controlled visco clutch                ,           1 ,    1 ,    1 ,  0 ,             0 ,      618 ,              671 ,           516 ,              566 ,        1037 ,       2000 , 2000 ,    2000 ,      1400 , 1400
+Crankshaft mounted - Bimetallic controlled visco clutch                    ,           1 ,    1 ,    1 ,  0 ,             0 ,      818 ,              871 ,           676 ,              766 ,        1277 ,       3000 , 3000 ,    3000 ,      3000 , 3000
+Crankshaft mounted - Discrete step clutch                                  ,           1 ,    1 ,    1 ,  0 ,             0 ,      668 ,              721 ,           616 ,              616 ,        1157 ,          0 ,    0 ,       0 ,         0 ,    0
+Crankshaft mounted - Discrete step clutch 2 stages                         ,           1 ,    1 ,    1 ,  0 ,             0 ,        0 ,                0 ,             0 ,                0 ,           0 ,       3000 , 3000 ,    3000 ,      2400 , 2400
+Crankshaft mounted - Discrete step clutch 3 stages                         ,           1 ,    1 ,    1 ,  0 ,             0 ,        0 ,                0 ,             0 ,                0 ,           0 ,       2000 , 2000 ,    2000 ,      1500 , 1600
+Crankshaft mounted - On/off clutch                                         ,           1 ,    1 ,    1 ,  0 ,             0 ,      718 ,              771 ,           666 ,              666 ,        1237 ,       5000 , 5000 ,    5000 ,      4300 , 4000
+Belt driven or driven via transm. - Electronically controlled visco clutch ,           1 ,    1 ,    1 ,  0 ,             0 ,      989 ,             1044 ,           833 ,              933 ,        1478 ,       2000 , 2000 ,    2000 ,      1400 , 1400
+Belt driven or driven via transm. - Bimetallic controlled visco clutch     ,           1 ,    1 ,    1 ,  0 ,             0 ,     1189 ,             1244 ,           993 ,             1133 ,        1718 ,       3000 , 3000 ,    3000 ,      3000 , 3000
+Belt driven or driven via transm. - Discrete step clutch                   ,           1 ,    1 ,    1 ,  0 ,             0 ,     1039 ,             1094 ,           983 ,              983 ,        1598 ,          0 ,    0 ,       0 ,         0 ,    0
+Belt driven or driven via transm. - Discrete step clutch 2 stages          ,           1 ,    1 ,    1 ,  0 ,             0 ,        0 ,                0 ,             0 ,                0 ,           0 ,       3000 , 3000 ,    3000 ,      2400 , 2400
+Belt driven or driven via transm. - Discrete step clutch 3 stages          ,           1 ,    1 ,    1 ,  0 ,             0 ,        0 ,                0 ,             0 ,                0 ,           0 ,       2000 , 2000 ,    2000 ,      1500 , 1600
+Belt driven or driven via transm. - On/off clutch                          ,           1 ,    1 ,    1 ,  0 ,             0 ,     1089 ,             1144 ,          1033 ,             1033 ,        1678 ,       5000 , 5000 ,    5000 ,      4300 , 4000
+Hydraulic driven - Variable displacement pump                              ,           1 ,    1 ,    1 ,  0 ,             0 ,      938 ,             1155 ,           832 ,              917 ,        1872 ,       1300 , 1300 ,    1300 ,      1600 , 1900
+Hydraulic driven - Constant displacement pump                              ,           1 ,    1 ,    1 ,  0 ,             0 ,     1200 ,             1400 ,          1000 ,             1100 ,        2300 ,       1800 , 1800 ,    1800 ,      2000 , 2000
+Electrically driven - Electronically controlled                            ,           1 ,    1 ,    1 ,  1 ,             1 ,      700 ,              800 ,           600 ,              600 ,        1400 ,       1000 , 1000 ,    1000 ,      1100 , 1200
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Resources/Declaration/VAUX/PS-Table.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/PS-Table.csv
index c2cf8e1895..fb2108bfa7 100644
--- a/VectoCore/VectoCore/Resources/Declaration/VAUX/PS-Table.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/VAUX/PS-Table.csv
@@ -1,30 +1,39 @@
-Technology                                 , Long Haul , Regional Delivery , Urban  Delivery , Municipal utility , Construction
-Small                                      , 1400      , 1300              , 1200            , 1200              , 1300
-Small + ESS                                , 900       , 800               , 800             , 800               , 800
-Small + visco clutch                       , 800       , 700               , 700             , 700               , 700
-Small + mech. clutch                       , 600       , 600               , 650             , 650               , 600
-Small + ESS + AMS                          , 500       , 400               , 500             , 500               , 400
-Small + visco clutch + AMS                 , 400       , 300               , 400             , 400               , 300
-Small + mech. clutch + AMS                 , 200       , 200               , 350             , 350               , 200
-Medium Supply 1-stage                      , 1600      , 1400              , 1350            , 1350              , 1500
-Medium Supply 1-stage + ESS                , 1000      , 900               , 900             , 900               , 900
-Medium Supply 1-stage + visco clutch       , 850       , 800               , 800             , 800               , 750
-Medium Supply 1-stage + mech. clutch       , 600       , 550               , 550             , 550               , 600
-Medium Supply 1-stage + ESS + AMS          , 600       , 700               , 700             , 700               , 500
-Medium Supply 1-stage + visco clutch + AMS , 450       , 600               , 600             , 600               , 350
-Medium Supply 1-stage + mech. clutch + AMS , 200       , 350               , 350             , 350               , 200
-Medium Supply 2-stage                      , 2100      , 1750              , 1700            , 1700              , 2100
-Medium Supply 2-stage + ESS                , 1100      , 1050              , 1000            , 1000              , 1000
-Medium Supply 2-stage + visco clutch       , 1000      , 850               , 800             , 800               , 900
-Medium Supply 2-stage + mech. clutch       , 700       , 650               , 600             , 600               , 800
-Medium Supply 2-stage + ESS + AMS          , 700       , 850               , 800             , 800               , 500
-Medium Supply 2-stage + visco clutch + AMS , 600       , 650               , 600             , 600               , 400
-Medium Supply 2-stage + mech. clutch + AMS , 300       , 450               , 400             , 400               , 300
-Large Supply                               , 4300      , 3600              , 3500            , 3500              , 4100
-Large Supply + ESS                         , 1600      , 1300              , 1200            , 1200              , 1500
-Large Supply + visco clutch                , 1300      , 1100              , 1000            , 1000              , 1200
-Large Supply + mech. clutch                , 800       , 800               , 700             , 700               , 900
-Large Supply + ESS + AMS                   , 1100      , 1000              , 1000            , 1000              , 1000
-Large Supply + visco clutch + AMS          , 800       , 800               , 800             , 800               , 700
-Large Supply + mech. clutch + AMS          , 300       , 500               , 500             , 500               , 400
-Vacuum pump                                , 190       , 160               , 130             , 130               , 130
+Technology                                 ,conventional ,P-HEV ,S-HEV ,PEV ,fully electric ,Long Haul ,Regional Delivery ,Urban  Delivery ,Municipal utility ,Construction
+Small                                      ,           1 ,    1 ,    1 ,  0 ,             0 ,     1400 ,             1300 ,           1200 ,             1200 ,        1300
+Small + ESS                                ,           1 ,    1 ,    1 ,  0 ,             0 ,      900 ,              800 ,            800 ,              800 ,         800
+Small + visco clutch                       ,           1 ,    1 ,    1 ,  0 ,             0 ,      800 ,              700 ,            700 ,              700 ,         700
+Small + mech. clutch                       ,           1 ,    1 ,    1 ,  0 ,             0 ,      600 ,              600 ,            650 ,              650 ,         600
+Small + ESS + AMS                          ,           1 ,    1 ,    1 ,  0 ,             0 ,      500 ,              400 ,            500 ,              500 ,         400
+Small + visco clutch + AMS                 ,           1 ,    1 ,    1 ,  0 ,             0 ,      400 ,              300 ,            400 ,              400 ,         300
+Small + mech. clutch + AMS                 ,           1 ,    1 ,    1 ,  0 ,             0 ,      200 ,              200 ,            350 ,              350 ,         200
+Medium Supply 1-stage                      ,           1 ,    1 ,    1 ,  0 ,             0 ,     1600 ,             1400 ,           1350 ,             1350 ,        1500
+Medium Supply 1-stage + ESS                ,           1 ,    1 ,    1 ,  0 ,             0 ,     1000 ,              900 ,            900 ,              900 ,         900
+Medium Supply 1-stage + visco clutch       ,           1 ,    1 ,    1 ,  0 ,             0 ,      850 ,              800 ,            800 ,              800 ,         750
+Medium Supply 1-stage + mech. clutch       ,           1 ,    1 ,    1 ,  0 ,             0 ,      600 ,              550 ,            550 ,              550 ,         600
+Medium Supply 1-stage + ESS + AMS          ,           1 ,    1 ,    1 ,  0 ,             0 ,      600 ,              700 ,            700 ,              700 ,         500
+Medium Supply 1-stage + visco clutch + AMS ,           1 ,    1 ,    1 ,  0 ,             0 ,      450 ,              600 ,            600 ,              600 ,         350
+Medium Supply 1-stage + mech. clutch + AMS ,           1 ,    1 ,    1 ,  0 ,             0 ,      200 ,              350 ,            350 ,              350 ,         200
+Medium Supply 2-stage                      ,           1 ,    1 ,    1 ,  0 ,             0 ,     2100 ,             1750 ,           1700 ,             1700 ,        2100
+Medium Supply 2-stage + ESS                ,           1 ,    1 ,    1 ,  0 ,             0 ,     1100 ,             1050 ,           1000 ,             1000 ,        1000
+Medium Supply 2-stage + visco clutch       ,           1 ,    1 ,    1 ,  0 ,             0 ,     1000 ,              850 ,            800 ,              800 ,         900
+Medium Supply 2-stage + mech. clutch       ,           1 ,    1 ,    1 ,  0 ,             0 ,      700 ,              650 ,            600 ,              600 ,         800
+Medium Supply 2-stage + ESS + AMS          ,           1 ,    1 ,    1 ,  0 ,             0 ,      700 ,              850 ,            800 ,              800 ,         500
+Medium Supply 2-stage + visco clutch + AMS ,           1 ,    1 ,    1 ,  0 ,             0 ,      600 ,              650 ,            600 ,              600 ,         400
+Medium Supply 2-stage + mech. clutch + AMS ,           1 ,    1 ,    1 ,  0 ,             0 ,      300 ,              450 ,            400 ,              400 ,         300
+Large Supply                               ,           1 ,    1 ,    1 ,  0 ,             0 ,     4300 ,             3600 ,           3500 ,             3500 ,        4100
+Large Supply + ESS                         ,           1 ,    1 ,    1 ,  0 ,             0 ,     1600 ,             1300 ,           1200 ,             1200 ,        1500
+Large Supply + visco clutch                ,           1 ,    1 ,    1 ,  0 ,             0 ,     1300 ,             1100 ,           1000 ,             1000 ,        1200
+Large Supply + mech. clutch                ,           1 ,    1 ,    1 ,  0 ,             0 ,      800 ,              800 ,            700 ,              700 ,         900
+Large Supply + ESS + AMS                   ,           1 ,    1 ,    1 ,  0 ,             0 ,     1100 ,             1000 ,           1000 ,             1000 ,        1000
+Large Supply + visco clutch + AMS          ,           1 ,    1 ,    1 ,  0 ,             0 ,      800 ,              800 ,            800 ,              800 ,         700
+Large Supply + mech. clutch + AMS          ,           1 ,    1 ,    1 ,  0 ,             0 ,      300 ,              500 ,            500 ,              500 ,         400
+Vacuum pump                                ,           1 ,    1 ,    1 ,  0 ,             0 ,      190 ,              160 ,            130 ,              130 ,         130
+Small + elec. driven                       ,           1 ,    1 ,    1 ,  1 ,             1 ,     1071 ,             1071 ,           1161 ,             1161 ,        1071
+Small + elec. driven + AMS                 ,           1 ,    1 ,    1 ,  1 ,             1 ,      357 ,              357 ,            625 ,              625 ,         357
+Medium supply 1 stage + elec. driven       ,           1 ,    1 ,    1 ,  1 ,             1 ,     1071 ,              982 ,            982 ,              982 ,        1071
+Medium supply 1 stage + elec. driven + AMS ,           1 ,    1 ,    1 ,  1 ,             1 ,      357 ,              625 ,            625 ,              625 ,         357
+Medium supply 2 stage + elec. driven       ,           1 ,    1 ,    1 ,  1 ,             1 ,     1250 ,             1161 ,           1071 ,             1071 ,        1429
+Medium supply 2 stage + elec. driven + AMS ,           1 ,    1 ,    1 ,  1 ,             1 ,      536 ,              804 ,            714 ,              714 ,         536
+Large supply + elec. driven                ,           1 ,    1 ,    1 ,  1 ,             1 ,     1429 ,             1429 ,           1250 ,             1250 ,        1607
+Large supply + elec. driven + AMS          ,           1 ,    1 ,    1 ,  1 ,             1 ,      536 ,              893 ,            893 ,              893 ,         714
+Vacuum pump + elec. driven                 ,           1 ,    1 ,    1 ,  1 ,             1 ,      339 ,              286 ,            232 ,              232 ,         232
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Tech.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Tech.csv
index d832a757a1..284398d7e6 100644
--- a/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Tech.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Tech.csv
@@ -1,9 +1,9 @@
-Technology                             , UF    , B     , S
-Fixed displacement                     , 1     , 1     , 1
-Fixed displacement with elec. control  , 0.95  , 1     , 1
-Dual displacement                      , 0.85  , 0.85  , 0.85
-Variable displacement mech. controlled , 0.75  , 0.75  , 0.75
-Variable displacement elec. controlled , 0.6   , 0.6   , 0.6
-Electric                               , 0     , 2.143 , 1.429
-Electric driven pump                   , 0.857 , 0.857 , 0.857
-Full electric steering gear            , 0     , 0.143 , 1.429
\ No newline at end of file
+Technology                             ,conventional ,P-HEV ,S-HEV ,PEV ,fully electric ,UF    ,B     ,S
+Fixed displacement                     ,           1 ,    1 ,    1 ,  0 ,             0 ,1     ,1     ,1
+Fixed displacement with elec. control  ,           1 ,    1 ,    1 ,  0 ,             0 ,0.95  ,1     ,1
+Dual displacement                      ,           1 ,    1 ,    1 ,  0 ,             0 ,0.85  ,0.85  ,0.85
+Variable displacement mech. controlled ,           1 ,    1 ,    1 ,  0 ,             0 ,0.75  ,0.75  ,0.75
+Variable displacement elec. controlled ,           1 ,    1 ,    1 ,  0 ,             0 ,0.6   ,0.6   ,0.6
+Electric                               ,           1 ,    1 ,    1 ,  0 ,             0 ,0     ,2.143 ,1.429
+Electric driven pump                   ,           1 ,    1 ,    1 ,  1 ,             1 ,0.857 ,0.857 ,0.857
+Full electric steering gear            ,           1 ,    1 ,    1 ,  1 ,             1 ,0     ,0.143 ,1.429
\ No newline at end of file
-- 
GitLab