From 7002cb8e96301f1062c185f48a82061c79e4770c Mon Sep 17 00:00:00 2001 From: Clemens Zagler Date: Thu, 5 Dec 2024 11:29:19 +0100 Subject: [PATCH] #38 update coefficients for 2023 and set as new default --- .../model/input/fc_info.csv | 65 +++++++++---------- .../model/input/fc_info_2023.csv | 30 +++++++++ 2 files changed, 59 insertions(+), 36 deletions(-) create mode 100644 pollution_v2/src/pollution_connector/model/input/fc_info_2023.csv diff --git a/pollution_v2/src/pollution_connector/model/input/fc_info.csv b/pollution_v2/src/pollution_connector/model/input/fc_info.csv index b86d9c7..c6a4076 100644 --- a/pollution_v2/src/pollution_connector/model/input/fc_info.csv +++ b/pollution_v2/src/pollution_connector/model/input/fc_info.csv @@ -1,37 +1,30 @@ Category,Fuel,ID_Euro,PercvsADT -LIGHT_VEHICLES,Diesel,0,0.000214379897703485 -LIGHT_VEHICLES,Diesel,1,0.00030929189098316 -LIGHT_VEHICLES,Diesel,2,0.00402282118551279 -LIGHT_VEHICLES,Diesel,3,0.0242902313228293 -LIGHT_VEHICLES,Diesel,4,0.0870397089471497 -LIGHT_VEHICLES,Diesel,5,0.188240528403159 -LIGHT_VEHICLES,Diesel,6,0.426867683998488 -LIGHT_VEHICLES,Electric,E,0.0142447404350185 -LIGHT_VEHICLES,Other,0,3.29383334975955e-05 -LIGHT_VEHICLES,Other,1,6.80478350335431e-05 -LIGHT_VEHICLES,Other,2,0.000425401723337025 -LIGHT_VEHICLES,Other,3,0.000527820654786011 -LIGHT_VEHICLES,Other,4,0.00776119609384922 -LIGHT_VEHICLES,Other,5,0.00687157532437525 -LIGHT_VEHICLES,Other,6,0.0761055685684141 -LIGHT_VEHICLES,Petrol,0,0.000219357475119462 -LIGHT_VEHICLES,Petrol,1,0.000269275987941962 -LIGHT_VEHICLES,Petrol,2,0.0030096255051663 -LIGHT_VEHICLES,Petrol,3,0.00476009262192492 -LIGHT_VEHICLES,Petrol,4,0.0319028047554449 -LIGHT_VEHICLES,Petrol,5,0.0280720733660881 -LIGHT_VEHICLES,Petrol,6,0.0947448356741777 -HEAVY_VEHICLES,Diesel,0,0.00079110663417399 -HEAVY_VEHICLES,Diesel,1,0.00264772203607586 -HEAVY_VEHICLES,Diesel,2,0.00602078694161981 -HEAVY_VEHICLES,Diesel,3,0.0331587554028517 -HEAVY_VEHICLES,Diesel,4,0.0136138190032933 -HEAVY_VEHICLES,Diesel,5,0.0979810419342262 -HEAVY_VEHICLES,Diesel,6,0.845781804103869 -BUSES,Diesel,0,0.00079110663417399 -BUSES,Diesel,1,0.00264772203607586 -BUSES,Diesel,2,0.00602078694161981 -BUSES,Diesel,3,0.0331587554028517 -BUSES,Diesel,4,0.0136138190032933 -BUSES,Diesel,5,0.0979810419342262 -BUSES,Diesel,6,0.845781804103869 +LIGHT_VEHICLES,Diesel,0,0.00207696928182103 +LIGHT_VEHICLES,Diesel,1,0.00115530543733769 +LIGHT_VEHICLES,Diesel,2,0.00643028224144704 +LIGHT_VEHICLES,Diesel,3,0.0182555869231024 +LIGHT_VEHICLES,Diesel,4,0.0815180093082136 +LIGHT_VEHICLES,Diesel,5,0.131777656409883 +LIGHT_VEHICLES,Diesel,6,0.485929209087442 +LIGHT_VEHICLES,Petrol,0,0.000722151485805641 +LIGHT_VEHICLES,Petrol,1,0.000401693730107195 +LIGHT_VEHICLES,Petrol,2,0.00223577590456186 +LIGHT_VEHICLES,Petrol,3,0.00634737323087115 +LIGHT_VEHICLES,Petrol,4,0.0283433905629218 +LIGHT_VEHICLES,Petrol,5,0.0458184101254237 +LIGHT_VEHICLES,Petrol,6,0.16895507478627 +LIGHT_VEHICLES,Electric,E,0.0100672303054072 +BUSES,Diesel,0,0.00521515727019008 +BUSES,Diesel,1,0.00615644974431477 +BUSES,Diesel,2,0.00942472419823441 +BUSES,Diesel,3,0.0252681271665162 +BUSES,Diesel,4,0.00778342373128998 +BUSES,Diesel,5,0.0595427403289646 +BUSES,Diesel,6,0.886613488197773 +HEAVY_VEHICLES,Diesel,0,0.00521515727019008 +HEAVY_VEHICLES,Diesel,1,0.00615644974431477 +HEAVY_VEHICLES,Diesel,2,0.00942472419823441 +HEAVY_VEHICLES,Diesel,3,0.0252681271665162 +HEAVY_VEHICLES,Diesel,4,0.00778342373128998 +HEAVY_VEHICLES,Diesel,5,0.0595427403289646 +HEAVY_VEHICLES,Diesel,6,0.886613488197773 diff --git a/pollution_v2/src/pollution_connector/model/input/fc_info_2023.csv b/pollution_v2/src/pollution_connector/model/input/fc_info_2023.csv new file mode 100644 index 0000000..c6a4076 --- /dev/null +++ b/pollution_v2/src/pollution_connector/model/input/fc_info_2023.csv @@ -0,0 +1,30 @@ +Category,Fuel,ID_Euro,PercvsADT +LIGHT_VEHICLES,Diesel,0,0.00207696928182103 +LIGHT_VEHICLES,Diesel,1,0.00115530543733769 +LIGHT_VEHICLES,Diesel,2,0.00643028224144704 +LIGHT_VEHICLES,Diesel,3,0.0182555869231024 +LIGHT_VEHICLES,Diesel,4,0.0815180093082136 +LIGHT_VEHICLES,Diesel,5,0.131777656409883 +LIGHT_VEHICLES,Diesel,6,0.485929209087442 +LIGHT_VEHICLES,Petrol,0,0.000722151485805641 +LIGHT_VEHICLES,Petrol,1,0.000401693730107195 +LIGHT_VEHICLES,Petrol,2,0.00223577590456186 +LIGHT_VEHICLES,Petrol,3,0.00634737323087115 +LIGHT_VEHICLES,Petrol,4,0.0283433905629218 +LIGHT_VEHICLES,Petrol,5,0.0458184101254237 +LIGHT_VEHICLES,Petrol,6,0.16895507478627 +LIGHT_VEHICLES,Electric,E,0.0100672303054072 +BUSES,Diesel,0,0.00521515727019008 +BUSES,Diesel,1,0.00615644974431477 +BUSES,Diesel,2,0.00942472419823441 +BUSES,Diesel,3,0.0252681271665162 +BUSES,Diesel,4,0.00778342373128998 +BUSES,Diesel,5,0.0595427403289646 +BUSES,Diesel,6,0.886613488197773 +HEAVY_VEHICLES,Diesel,0,0.00521515727019008 +HEAVY_VEHICLES,Diesel,1,0.00615644974431477 +HEAVY_VEHICLES,Diesel,2,0.00942472419823441 +HEAVY_VEHICLES,Diesel,3,0.0252681271665162 +HEAVY_VEHICLES,Diesel,4,0.00778342373128998 +HEAVY_VEHICLES,Diesel,5,0.0595427403289646 +HEAVY_VEHICLES,Diesel,6,0.886613488197773