From 10a032a707438e397d218cb24e55e7b40e4f44d8 Mon Sep 17 00:00:00 2001 From: ahagen Date: Thu, 28 Nov 2024 10:07:33 +0100 Subject: [PATCH 1/4] Tuned SSP1: JPN, IND, CAZ --- inst/extdata/genParBaselinePrefTrends.csv | 28 +++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/inst/extdata/genParBaselinePrefTrends.csv b/inst/extdata/genParBaselinePrefTrends.csv index bde7e70..adec744 100644 --- a/inst/extdata/genParBaselinePrefTrends.csv +++ b/inst/extdata/genParBaselinePrefTrends.csv @@ -5677,9 +5677,9 @@ SSP1;CAZ;;;;;International Ship;trn_shipping_intl;S1S;1;1;1;1;1 SSP1;CAZ;;;;;Passenger Rail;trn_pass;S1S;0.0008785;0.001757;0.001757;0.001757;0.001757 SSP1;CAZ;;;;;Walk;trn_pass;S1S;1;0.8;1;1;1 SSP1;CAZ;;;;;trn_freight_road;trn_freight;S1S;1;1;1;1;1 -SSP1;CAZ;;;;;trn_pass_road;trn_pass;S1S;0.1509;0.07545;0.07545;0.07545;0.07545 +SSP1;CAZ;;;;;trn_pass_road;trn_pass;S1S;0.1509;0.1056;0.06036;0.07545;0.07545 SSP1;CAZ;;;;Bus;trn_pass_road;trn_pass;S2S1;0.08852;0.1328;0.1661;0.2103;0.2103 -SSP1;CAZ;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;1;1;1;1;1 +SSP1;CAZ;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;1;1.2;1;1;1 SSP1;CAZ;;;trn_pass_road_LDV_2W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;0.04;0.034;0.03;0.02;0.02 SSP1;CAZ;;;trn_pass_road_LDV_4W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;1;1;1;1;1 SSP1;CAZ;;Compact Car;trn_pass_road_LDV_4W;trn_pass_road_LDV;trn_pass_road;trn_pass;VS3;0.1291;0.1936;0.2582;0.3873;0.3873 @@ -5805,7 +5805,7 @@ SSP1;CHA;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;CHA;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;0.6711;0.56;0.56 SSP1;CHA;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;0.5703;0.5703 SSP1;DEU;;;;;Cycle;trn_pass;S1S;0.042;0.025;0.025;0.1875;0.1875 -SSP1;DEU;;;;;Domestic Aviation;trn_pass;S1S;6.6E-05;2.0E-05;1.49E-05;1.49E-05;1.49E-05 +SSP1;DEU;;;;;Domestic Aviation;trn_pass;S1S;6.6E-05;2E-05;1.49E-05;1.49E-05;1.49E-05 SSP1;DEU;;;;;Domestic Ship;trn_freight;S1S;0.004;0.002127;0.002127;0.002127;0.002127 SSP1;DEU;;;;;Freight Rail;trn_freight;S1S;0.032;0.042;0.042;0.042;0.042 SSP1;DEU;;;;;HSR;trn_pass;S1S;0.00018;0.00025;0.000625;0.000625;0.000625 @@ -6006,7 +6006,7 @@ SSP1;ECS;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;ECS;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;ECS;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;ENC;;;;;Cycle;trn_pass;S1S;0.025;0.025;0.05556;0.1;0.1 -SSP1;ENC;;;;;Domestic Aviation;trn_pass;S1S;5.97E-05;2.0E-05;1.33E-05;5.97E-06;5.97E-06 +SSP1;ENC;;;;;Domestic Aviation;trn_pass;S1S;5.97E-05;2E-05;1.33E-05;5.97E-06;5.97E-06 SSP1;ENC;;;;;Domestic Ship;trn_freight;S1S;0.01246;0.01246;0.01246;0.01246;0.01246 SSP1;ENC;;;;;Freight Rail;trn_freight;S1S;0.02928;0.04392;0.04392;0.04392;0.04392 SSP1;ENC;;;;;HSR;trn_pass;S1S;0.000125;0.00025;0.0002222;0.0002;0.0002 @@ -6276,7 +6276,7 @@ SSP1;EWN;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;EWN;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;0.5708;0.5708 SSP1;EWN;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;0.7806;0.5536;0.5536 SSP1;FRA;;;;;Cycle;trn_pass;S1S;0.01942;0.02184;0.03641;0.1019;0.1019 -SSP1;FRA;;;;;Domestic Aviation;trn_pass;S1S;0.0001169;3.0E-05;1.1E-05;5.48E-06;5.48E-06 +SSP1;FRA;;;;;Domestic Aviation;trn_pass;S1S;0.0001169;3E-05;1.1E-05;5.48E-06;5.48E-06 SSP1;FRA;;;;;Domestic Ship;trn_freight;S1S;0.003419;0.003419;0.003419;0.003419;0.003419 SSP1;FRA;;;;;Freight Rail;trn_freight;S1S;0.01799;0.02698;0.02698;0.02698;0.02698 SSP1;FRA;;;;;HSR;trn_pass;S1S;0.0003359;0.0002267;0.0002015;0.0002015;0.0002015 @@ -6349,11 +6349,11 @@ SSP1;IND;;;;;Freight Rail;trn_freight;S1S;0.1924;0.2886;0.2361;0.1998;0.1998 SSP1;IND;;;;;HSR;trn_pass;S1S;0;0.0004615;0.00055;0.0003;0.0003 SSP1;IND;;;;;International Aviation;trn_aviation_intl;S1S;1;1;1;1;1 SSP1;IND;;;;;International Ship;trn_shipping_intl;S1S;1;1;1;1;1 -SSP1;IND;;;;;Passenger Rail;trn_pass;S1S;0.004978;0.01692;0.012;0.008;0.008 -SSP1;IND;;;;;Walk;trn_pass;S1S;0.9573;1;1;1;1 +SSP1;IND;;;;;Passenger Rail;trn_pass;S1S;0.004978;0.01354;0.012;0.008;0.008 +SSP1;IND;;;;;Walk;trn_pass;S1S;0.9573;0.8;1;1;1 SSP1;IND;;;;;trn_freight_road;trn_freight;S1S;1;1;1;1;1 -SSP1;IND;;;;;trn_pass_road;trn_pass;S1S;1;0.7268;0.54;0.1472;0.1472 -SSP1;IND;;;;Bus;trn_pass_road;trn_pass;S2S1;1;0.5457;0.4935;0.3949;0.3949 +SSP1;IND;;;;;trn_pass_road;trn_pass;S1S;1;1.09;0.54;0.1472;0.1472 +SSP1;IND;;;;Bus;trn_pass_road;trn_pass;S2S1;1;0.5457;0.3948;0.3949;0.3949 SSP1;IND;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;0.918;1;1;1;1 SSP1;IND;;;trn_pass_road_LDV_2W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;0.09;0.06;0.05108;0.05108;0.05108 SSP1;IND;;;trn_pass_road_LDV_4W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;1;1;1;1;1 @@ -6410,16 +6410,16 @@ SSP1;IND;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;IND;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;0.9164;0.4277;1;1;1 SSP1;IND;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;JPN;;;;;Cycle;trn_pass;S1S;0.01743;0.01743;0.03486;0.01961;0.01961 -SSP1;JPN;;;;;Domestic Aviation;trn_pass;S1S;0.0001729;8.114E-05;7.78E-05;2.19E-05;2.19E-05 +SSP1;JPN;;;;;Domestic Aviation;trn_pass;S1S;0.0001729;0.0001623;0.0002334;6.57E-05;6.57E-05 SSP1;JPN;;;;;Domestic Ship;trn_freight;S1S;0.01167;0.01111;0.01167;0.01167;0.01167 SSP1;JPN;;;;;Freight Rail;trn_freight;S1S;0.002833;0.004047;0.004249;0.004249;0.004249 -SSP1;JPN;;;;;HSR;trn_pass;S1S;0.0004081;0.0004081;0.0004591;0.0001291;0.0001291 +SSP1;JPN;;;;;HSR;trn_pass;S1S;0.0004081;0.0002857;0.0003673;0.0001033;0.0001033 SSP1;JPN;;;;;International Aviation;trn_aviation_intl;S1S;1;1;1;1;1 SSP1;JPN;;;;;International Ship;trn_shipping_intl;S1S;1;1;1;1;1 -SSP1;JPN;;;;;Passenger Rail;trn_pass;S1S;0.006084;0.01217;0.014;0.004562;0.004562 -SSP1;JPN;;;;;Walk;trn_pass;S1S;1;1;1;1;1 +SSP1;JPN;;;;;Passenger Rail;trn_pass;S1S;0.006084;0.00426;0.0056;0.001825;0.001825 +SSP1;JPN;;;;;Walk;trn_pass;S1S;1;0.35;1;1;1 SSP1;JPN;;;;;trn_freight_road;trn_freight;S1S;1;1;1;1;1 -SSP1;JPN;;;;;trn_pass_road;trn_pass;S1S;0.07113;0.03814;0.03814;0.01073;0.01073 +SSP1;JPN;;;;;trn_pass_road;trn_pass;S1S;0.07113;0.0534;0.0534;0.01502;0.01502 SSP1;JPN;;;;Bus;trn_pass_road;trn_pass;S2S1;0.06081;0.09122;0.09122;0.09122;0.09122 SSP1;JPN;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;1;1;1;1;1 SSP1;JPN;;;trn_pass_road_LDV_2W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;0.07;0.06;0.05491;0.05491;0.05491 From bf5cb532be250aace5d49e5dbee5e90da6cc3e4d Mon Sep 17 00:00:00 2001 From: ahagen Date: Thu, 28 Nov 2024 15:56:16 +0100 Subject: [PATCH 2/4] Tuned SSP1: JPN --- inst/extdata/genParBaselinePrefTrends.csv | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inst/extdata/genParBaselinePrefTrends.csv b/inst/extdata/genParBaselinePrefTrends.csv index adec744..06b6114 100644 --- a/inst/extdata/genParBaselinePrefTrends.csv +++ b/inst/extdata/genParBaselinePrefTrends.csv @@ -6416,10 +6416,10 @@ SSP1;JPN;;;;;Freight Rail;trn_freight;S1S;0.002833;0.004047;0.004249;0.004249;0. SSP1;JPN;;;;;HSR;trn_pass;S1S;0.0004081;0.0002857;0.0003673;0.0001033;0.0001033 SSP1;JPN;;;;;International Aviation;trn_aviation_intl;S1S;1;1;1;1;1 SSP1;JPN;;;;;International Ship;trn_shipping_intl;S1S;1;1;1;1;1 -SSP1;JPN;;;;;Passenger Rail;trn_pass;S1S;0.006084;0.00426;0.0056;0.001825;0.001825 -SSP1;JPN;;;;;Walk;trn_pass;S1S;1;0.35;1;1;1 +SSP1;JPN;;;;;Passenger Rail;trn_pass;S1S;0.006084;0.006085;0.0084;0.00365;0.00365 +SSP1;JPN;;;;;Walk;trn_pass;S1S;1;0.5;1;1;1 SSP1;JPN;;;;;trn_freight_road;trn_freight;S1S;1;1;1;1;1 -SSP1;JPN;;;;;trn_pass_road;trn_pass;S1S;0.07113;0.0534;0.0534;0.01502;0.01502 +SSP1;JPN;;;;;trn_pass_road;trn_pass;S1S;0.07113;0.04195;0.04195;0.0118;0.0118 SSP1;JPN;;;;Bus;trn_pass_road;trn_pass;S2S1;0.06081;0.09122;0.09122;0.09122;0.09122 SSP1;JPN;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;1;1;1;1;1 SSP1;JPN;;;trn_pass_road_LDV_2W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;0.07;0.06;0.05491;0.05491;0.05491 From bec235027f8f6980a14325feddfb4762574b4c5c Mon Sep 17 00:00:00 2001 From: ahagen Date: Thu, 28 Nov 2024 16:06:17 +0100 Subject: [PATCH 3/4] Tuned SSP1 SSA --- inst/extdata/genParBaselinePrefTrends.csv | 40 +++++++++++------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/inst/extdata/genParBaselinePrefTrends.csv b/inst/extdata/genParBaselinePrefTrends.csv index 06b6114..c7ab84a 100644 --- a/inst/extdata/genParBaselinePrefTrends.csv +++ b/inst/extdata/genParBaselinePrefTrends.csv @@ -5677,9 +5677,9 @@ SSP1;CAZ;;;;;International Ship;trn_shipping_intl;S1S;1;1;1;1;1 SSP1;CAZ;;;;;Passenger Rail;trn_pass;S1S;0.0008785;0.001757;0.001757;0.001757;0.001757 SSP1;CAZ;;;;;Walk;trn_pass;S1S;1;0.8;1;1;1 SSP1;CAZ;;;;;trn_freight_road;trn_freight;S1S;1;1;1;1;1 -SSP1;CAZ;;;;;trn_pass_road;trn_pass;S1S;0.1509;0.1056;0.06036;0.07545;0.07545 +SSP1;CAZ;;;;;trn_pass_road;trn_pass;S1S;0.1509;0.07545;0.07545;0.07545;0.07545 SSP1;CAZ;;;;Bus;trn_pass_road;trn_pass;S2S1;0.08852;0.1328;0.1661;0.2103;0.2103 -SSP1;CAZ;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;1;1.2;1;1;1 +SSP1;CAZ;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;1;1;1;1;1 SSP1;CAZ;;;trn_pass_road_LDV_2W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;0.04;0.034;0.03;0.02;0.02 SSP1;CAZ;;;trn_pass_road_LDV_4W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;1;1;1;1;1 SSP1;CAZ;;Compact Car;trn_pass_road_LDV_4W;trn_pass_road_LDV;trn_pass_road;trn_pass;VS3;0.1291;0.1936;0.2582;0.3873;0.3873 @@ -5738,7 +5738,7 @@ SSP1;CAZ;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;CAZ;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;CAZ;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;CHA;;;;;Cycle;trn_pass;S1S;0.09454;0.04412;0.03782;0.04848;0.04848 -SSP1;CHA;;;;;Domestic Aviation;trn_pass;S1S;0.12;0.01;0.004363;0.0008393;0.0008393 +SSP1;CHA;;;;;Domestic Aviation;trn_pass;S1S;0.12;0.006102;0.004363;0.0008393;0.0008393 SSP1;CHA;;;;;Domestic Ship;trn_freight;S1S;0.01847;0.01922;0.02232;0.02232;0.02232 SSP1;CHA;;;;;Freight Rail;trn_freight;S1S;0.03204;0.05355;0.05693;0.05693;0.05693 SSP1;CHA;;;;;HSR;trn_pass;S1S;0.2402;0.08143;0.01916;0.003695;0.003695 @@ -5805,7 +5805,7 @@ SSP1;CHA;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;CHA;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;0.6711;0.56;0.56 SSP1;CHA;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;0.5703;0.5703 SSP1;DEU;;;;;Cycle;trn_pass;S1S;0.042;0.025;0.025;0.1875;0.1875 -SSP1;DEU;;;;;Domestic Aviation;trn_pass;S1S;6.6E-05;2E-05;1.49E-05;1.49E-05;1.49E-05 +SSP1;DEU;;;;;Domestic Aviation;trn_pass;S1S;6.6E-05;1.49E-05;1.49E-05;1.49E-05;1.49E-05 SSP1;DEU;;;;;Domestic Ship;trn_freight;S1S;0.004;0.002127;0.002127;0.002127;0.002127 SSP1;DEU;;;;;Freight Rail;trn_freight;S1S;0.032;0.042;0.042;0.042;0.042 SSP1;DEU;;;;;HSR;trn_pass;S1S;0.00018;0.00025;0.000625;0.000625;0.000625 @@ -6006,7 +6006,7 @@ SSP1;ECS;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;ECS;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;ECS;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;ENC;;;;;Cycle;trn_pass;S1S;0.025;0.025;0.05556;0.1;0.1 -SSP1;ENC;;;;;Domestic Aviation;trn_pass;S1S;5.97E-05;2E-05;1.33E-05;5.97E-06;5.97E-06 +SSP1;ENC;;;;;Domestic Aviation;trn_pass;S1S;5.97E-05;1.49E-05;1.33E-05;5.97E-06;5.97E-06 SSP1;ENC;;;;;Domestic Ship;trn_freight;S1S;0.01246;0.01246;0.01246;0.01246;0.01246 SSP1;ENC;;;;;Freight Rail;trn_freight;S1S;0.02928;0.04392;0.04392;0.04392;0.04392 SSP1;ENC;;;;;HSR;trn_pass;S1S;0.000125;0.00025;0.0002222;0.0002;0.0002 @@ -6075,7 +6075,7 @@ SSP1;ENC;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;ENC;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;0.5549;0.5549 SSP1;ENC;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;0.783;0.5383;0.5383 SSP1;ESC;;;;;Cycle;trn_pass;S1S;0.01942;0.02184;0.04369;0.1638;0.1638 -SSP1;ESC;;;;;Domestic Aviation;trn_pass;S1S;0.0001286;7.04E-06;9.04E-06;1.81E-05;1.81E-05 +SSP1;ESC;;;;;Domestic Aviation;trn_pass;S1S;0.0001286;9.04E-06;9.04E-06;1.81E-05;1.81E-05 SSP1;ESC;;;;;Domestic Ship;trn_freight;S1S;0.01209;0.01209;0.01209;0.01209;0.01209 SSP1;ESC;;;;;Freight Rail;trn_freight;S1S;0.004094;0.006141;0.006141;0.006141;0.006141 SSP1;ESC;;;;;HSR;trn_pass;S1S;0.0006613;0.000186;0.00062;0.00062;0.00062 @@ -6209,7 +6209,7 @@ SSP1;ESW;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;ESW;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;0.481;0.481 SSP1;ESW;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;0.7273;0.4666;0.4666 SSP1;EWN;;;;;Cycle;trn_pass;S1S;0.01;0.01;0.05;0.1;0.1 -SSP1;EWN;;;;;Domestic Aviation;trn_pass;S1S;4.77E-05;2.19E-05;1.19E-05;1.19E-06;1.19E-06 +SSP1;EWN;;;;;Domestic Aviation;trn_pass;S1S;4.77E-05;1.19E-05;1.19E-05;1.19E-06;1.19E-06 SSP1;EWN;;;;;Domestic Ship;trn_freight;S1S;0.006261;0.006957;0.006261;0.006261;0.006261 SSP1;EWN;;;;;Freight Rail;trn_freight;S1S;0.0127;0.02116;0.01905;0.01905;0.01905 SSP1;EWN;;;;;HSR;trn_pass;S1S;0.0001;0.0001;0.0004;0.0002;0.0002 @@ -6276,7 +6276,7 @@ SSP1;EWN;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;EWN;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;0.5708;0.5708 SSP1;EWN;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;0.7806;0.5536;0.5536 SSP1;FRA;;;;;Cycle;trn_pass;S1S;0.01942;0.02184;0.03641;0.1019;0.1019 -SSP1;FRA;;;;;Domestic Aviation;trn_pass;S1S;0.0001169;3E-05;1.1E-05;5.48E-06;5.48E-06 +SSP1;FRA;;;;;Domestic Aviation;trn_pass;S1S;0.0001169;1.64E-05;1.1E-05;5.48E-06;5.48E-06 SSP1;FRA;;;;;Domestic Ship;trn_freight;S1S;0.003419;0.003419;0.003419;0.003419;0.003419 SSP1;FRA;;;;;Freight Rail;trn_freight;S1S;0.01799;0.02698;0.02698;0.02698;0.02698 SSP1;FRA;;;;;HSR;trn_pass;S1S;0.0003359;0.0002267;0.0002015;0.0002015;0.0002015 @@ -6349,11 +6349,11 @@ SSP1;IND;;;;;Freight Rail;trn_freight;S1S;0.1924;0.2886;0.2361;0.1998;0.1998 SSP1;IND;;;;;HSR;trn_pass;S1S;0;0.0004615;0.00055;0.0003;0.0003 SSP1;IND;;;;;International Aviation;trn_aviation_intl;S1S;1;1;1;1;1 SSP1;IND;;;;;International Ship;trn_shipping_intl;S1S;1;1;1;1;1 -SSP1;IND;;;;;Passenger Rail;trn_pass;S1S;0.004978;0.01354;0.012;0.008;0.008 -SSP1;IND;;;;;Walk;trn_pass;S1S;0.9573;0.8;1;1;1 +SSP1;IND;;;;;Passenger Rail;trn_pass;S1S;0.004978;0.01692;0.012;0.008;0.008 +SSP1;IND;;;;;Walk;trn_pass;S1S;0.9573;1;1;1;1 SSP1;IND;;;;;trn_freight_road;trn_freight;S1S;1;1;1;1;1 -SSP1;IND;;;;;trn_pass_road;trn_pass;S1S;1;1.09;0.54;0.1472;0.1472 -SSP1;IND;;;;Bus;trn_pass_road;trn_pass;S2S1;1;0.5457;0.3948;0.3949;0.3949 +SSP1;IND;;;;;trn_pass_road;trn_pass;S1S;1;0.7268;0.54;0.1472;0.1472 +SSP1;IND;;;;Bus;trn_pass_road;trn_pass;S2S1;1;0.5457;0.4935;0.3949;0.3949 SSP1;IND;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;0.918;1;1;1;1 SSP1;IND;;;trn_pass_road_LDV_2W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;0.09;0.06;0.05108;0.05108;0.05108 SSP1;IND;;;trn_pass_road_LDV_4W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;1;1;1;1;1 @@ -6410,16 +6410,16 @@ SSP1;IND;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;IND;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;0.9164;0.4277;1;1;1 SSP1;IND;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;JPN;;;;;Cycle;trn_pass;S1S;0.01743;0.01743;0.03486;0.01961;0.01961 -SSP1;JPN;;;;;Domestic Aviation;trn_pass;S1S;0.0001729;0.0001623;0.0002334;6.57E-05;6.57E-05 +SSP1;JPN;;;;;Domestic Aviation;trn_pass;S1S;0.0001729;3.114E-05;7.78E-05;2.19E-05;2.19E-05 SSP1;JPN;;;;;Domestic Ship;trn_freight;S1S;0.01167;0.01111;0.01167;0.01167;0.01167 SSP1;JPN;;;;;Freight Rail;trn_freight;S1S;0.002833;0.004047;0.004249;0.004249;0.004249 -SSP1;JPN;;;;;HSR;trn_pass;S1S;0.0004081;0.0002857;0.0003673;0.0001033;0.0001033 +SSP1;JPN;;;;;HSR;trn_pass;S1S;0.0004081;0.0004081;0.0004591;0.0001291;0.0001291 SSP1;JPN;;;;;International Aviation;trn_aviation_intl;S1S;1;1;1;1;1 SSP1;JPN;;;;;International Ship;trn_shipping_intl;S1S;1;1;1;1;1 -SSP1;JPN;;;;;Passenger Rail;trn_pass;S1S;0.006084;0.006085;0.0084;0.00365;0.00365 -SSP1;JPN;;;;;Walk;trn_pass;S1S;1;0.5;1;1;1 +SSP1;JPN;;;;;Passenger Rail;trn_pass;S1S;0.006084;0.01217;0.014;0.004562;0.004562 +SSP1;JPN;;;;;Walk;trn_pass;S1S;1;1;1;1;1 SSP1;JPN;;;;;trn_freight_road;trn_freight;S1S;1;1;1;1;1 -SSP1;JPN;;;;;trn_pass_road;trn_pass;S1S;0.07113;0.04195;0.04195;0.0118;0.0118 +SSP1;JPN;;;;;trn_pass_road;trn_pass;S1S;0.07113;0.03814;0.03814;0.01073;0.01073 SSP1;JPN;;;;Bus;trn_pass_road;trn_pass;S2S1;0.06081;0.09122;0.09122;0.09122;0.09122 SSP1;JPN;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;1;1;1;1;1 SSP1;JPN;;;trn_pass_road_LDV_2W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;0.07;0.06;0.05491;0.05491;0.05491 @@ -6547,7 +6547,7 @@ SSP1;LAM;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;LAM;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;LAM;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;MEA;;;;;Cycle;trn_pass;S1S;0.0166;0.0166;0.0166;0.04149;0.04149 -SSP1;MEA;;;;;Domestic Aviation;trn_pass;S1S;0.008522;0.00282;0.00426;0.00625;0.00625 +SSP1;MEA;;;;;Domestic Aviation;trn_pass;S1S;0.008522;0.00142;0.00426;0.00625;0.00625 SSP1;MEA;;;;;Domestic Ship;trn_freight;S1S;0.00206;0.00206;0.00206;0.00206;0.00206 SSP1;MEA;;;;;Freight Rail;trn_freight;S1S;0.003202;0.004803;0.004803;0.004803;0.004803 SSP1;MEA;;;;;HSR;trn_pass;S1S;0;0.01667;0.01667;0.01667;0.01667 @@ -6611,7 +6611,7 @@ SSP1;MEA;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;MEA;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;0.9164;0.2857;1;1;1 SSP1;MEA;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;NEN;;;;;Cycle;trn_pass;S1S;0.003033;0.003024;0.002621;0.0182;0.0182 -SSP1;NEN;;;;;Domestic Aviation;trn_pass;S1S;7.21E-06;1.4E-06;6.12E-07;3.57E-07;3.57E-07 +SSP1;NEN;;;;;Domestic Aviation;trn_pass;S1S;7.21E-06;9.4E-07;6.12E-07;3.57E-07;3.57E-07 SSP1;NEN;;;;;Domestic Ship;trn_freight;S1S;0.03175;0.03175;0.03175;0.03175;0.03175 SSP1;NEN;;;;;Freight Rail;trn_freight;S1S;0.01925;0.02888;0.02888;0.02888;0.02888 SSP1;NEN;;;;;HSR;trn_pass;S1S;2E-05;4.53E-05;7.36E-06;5.52E-06;5.52E-06 @@ -6819,7 +6819,7 @@ SSP1;OAS;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;OAS;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;OAS;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;REF;;;;;Cycle;trn_pass;S1S;0.01379;0.0149;0.0745;0.07824;0.07824 -SSP1;REF;;;;;Domestic Aviation;trn_pass;S1S;0.03574;0.01163;0.01156;0.003468;0.003468 +SSP1;REF;;;;;Domestic Aviation;trn_pass;S1S;0.03574;0.004163;0.01156;0.003468;0.003468 SSP1;REF;;;;;Domestic Ship;trn_freight;S1S;0.007227;0.007227;0.007227;0.007227;0.007227 SSP1;REF;;;;;Freight Rail;trn_freight;S1S;0.1296;0.1944;0.1944;0.1944;0.1944 SSP1;REF;;;;;HSR;trn_pass;S1S;0;0.002516;0.002516;0.000755;0.000755 From a4263d8803a7a99fcecfe9cf440e329f87eb493e Mon Sep 17 00:00:00 2001 From: ahagen Date: Fri, 29 Nov 2024 10:34:00 +0100 Subject: [PATCH 4/4] revert commit bec2350, update PRtest script --- inst/extdata/genParBaselinePrefTrends.csv | 40 ++++++++++----------- tests/PRtest/PRtestEDGET.R | 8 +++++ tests/PRtest/compScenPR.R | 42 +++++++++++++++++++++++ 3 files changed, 70 insertions(+), 20 deletions(-) diff --git a/inst/extdata/genParBaselinePrefTrends.csv b/inst/extdata/genParBaselinePrefTrends.csv index c7ab84a..06b6114 100644 --- a/inst/extdata/genParBaselinePrefTrends.csv +++ b/inst/extdata/genParBaselinePrefTrends.csv @@ -5677,9 +5677,9 @@ SSP1;CAZ;;;;;International Ship;trn_shipping_intl;S1S;1;1;1;1;1 SSP1;CAZ;;;;;Passenger Rail;trn_pass;S1S;0.0008785;0.001757;0.001757;0.001757;0.001757 SSP1;CAZ;;;;;Walk;trn_pass;S1S;1;0.8;1;1;1 SSP1;CAZ;;;;;trn_freight_road;trn_freight;S1S;1;1;1;1;1 -SSP1;CAZ;;;;;trn_pass_road;trn_pass;S1S;0.1509;0.07545;0.07545;0.07545;0.07545 +SSP1;CAZ;;;;;trn_pass_road;trn_pass;S1S;0.1509;0.1056;0.06036;0.07545;0.07545 SSP1;CAZ;;;;Bus;trn_pass_road;trn_pass;S2S1;0.08852;0.1328;0.1661;0.2103;0.2103 -SSP1;CAZ;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;1;1;1;1;1 +SSP1;CAZ;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;1;1.2;1;1;1 SSP1;CAZ;;;trn_pass_road_LDV_2W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;0.04;0.034;0.03;0.02;0.02 SSP1;CAZ;;;trn_pass_road_LDV_4W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;1;1;1;1;1 SSP1;CAZ;;Compact Car;trn_pass_road_LDV_4W;trn_pass_road_LDV;trn_pass_road;trn_pass;VS3;0.1291;0.1936;0.2582;0.3873;0.3873 @@ -5738,7 +5738,7 @@ SSP1;CAZ;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;CAZ;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;CAZ;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;CHA;;;;;Cycle;trn_pass;S1S;0.09454;0.04412;0.03782;0.04848;0.04848 -SSP1;CHA;;;;;Domestic Aviation;trn_pass;S1S;0.12;0.006102;0.004363;0.0008393;0.0008393 +SSP1;CHA;;;;;Domestic Aviation;trn_pass;S1S;0.12;0.01;0.004363;0.0008393;0.0008393 SSP1;CHA;;;;;Domestic Ship;trn_freight;S1S;0.01847;0.01922;0.02232;0.02232;0.02232 SSP1;CHA;;;;;Freight Rail;trn_freight;S1S;0.03204;0.05355;0.05693;0.05693;0.05693 SSP1;CHA;;;;;HSR;trn_pass;S1S;0.2402;0.08143;0.01916;0.003695;0.003695 @@ -5805,7 +5805,7 @@ SSP1;CHA;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;CHA;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;0.6711;0.56;0.56 SSP1;CHA;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;0.5703;0.5703 SSP1;DEU;;;;;Cycle;trn_pass;S1S;0.042;0.025;0.025;0.1875;0.1875 -SSP1;DEU;;;;;Domestic Aviation;trn_pass;S1S;6.6E-05;1.49E-05;1.49E-05;1.49E-05;1.49E-05 +SSP1;DEU;;;;;Domestic Aviation;trn_pass;S1S;6.6E-05;2E-05;1.49E-05;1.49E-05;1.49E-05 SSP1;DEU;;;;;Domestic Ship;trn_freight;S1S;0.004;0.002127;0.002127;0.002127;0.002127 SSP1;DEU;;;;;Freight Rail;trn_freight;S1S;0.032;0.042;0.042;0.042;0.042 SSP1;DEU;;;;;HSR;trn_pass;S1S;0.00018;0.00025;0.000625;0.000625;0.000625 @@ -6006,7 +6006,7 @@ SSP1;ECS;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;ECS;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;ECS;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;ENC;;;;;Cycle;trn_pass;S1S;0.025;0.025;0.05556;0.1;0.1 -SSP1;ENC;;;;;Domestic Aviation;trn_pass;S1S;5.97E-05;1.49E-05;1.33E-05;5.97E-06;5.97E-06 +SSP1;ENC;;;;;Domestic Aviation;trn_pass;S1S;5.97E-05;2E-05;1.33E-05;5.97E-06;5.97E-06 SSP1;ENC;;;;;Domestic Ship;trn_freight;S1S;0.01246;0.01246;0.01246;0.01246;0.01246 SSP1;ENC;;;;;Freight Rail;trn_freight;S1S;0.02928;0.04392;0.04392;0.04392;0.04392 SSP1;ENC;;;;;HSR;trn_pass;S1S;0.000125;0.00025;0.0002222;0.0002;0.0002 @@ -6075,7 +6075,7 @@ SSP1;ENC;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;ENC;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;0.5549;0.5549 SSP1;ENC;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;0.783;0.5383;0.5383 SSP1;ESC;;;;;Cycle;trn_pass;S1S;0.01942;0.02184;0.04369;0.1638;0.1638 -SSP1;ESC;;;;;Domestic Aviation;trn_pass;S1S;0.0001286;9.04E-06;9.04E-06;1.81E-05;1.81E-05 +SSP1;ESC;;;;;Domestic Aviation;trn_pass;S1S;0.0001286;7.04E-06;9.04E-06;1.81E-05;1.81E-05 SSP1;ESC;;;;;Domestic Ship;trn_freight;S1S;0.01209;0.01209;0.01209;0.01209;0.01209 SSP1;ESC;;;;;Freight Rail;trn_freight;S1S;0.004094;0.006141;0.006141;0.006141;0.006141 SSP1;ESC;;;;;HSR;trn_pass;S1S;0.0006613;0.000186;0.00062;0.00062;0.00062 @@ -6209,7 +6209,7 @@ SSP1;ESW;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;ESW;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;0.481;0.481 SSP1;ESW;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;0.7273;0.4666;0.4666 SSP1;EWN;;;;;Cycle;trn_pass;S1S;0.01;0.01;0.05;0.1;0.1 -SSP1;EWN;;;;;Domestic Aviation;trn_pass;S1S;4.77E-05;1.19E-05;1.19E-05;1.19E-06;1.19E-06 +SSP1;EWN;;;;;Domestic Aviation;trn_pass;S1S;4.77E-05;2.19E-05;1.19E-05;1.19E-06;1.19E-06 SSP1;EWN;;;;;Domestic Ship;trn_freight;S1S;0.006261;0.006957;0.006261;0.006261;0.006261 SSP1;EWN;;;;;Freight Rail;trn_freight;S1S;0.0127;0.02116;0.01905;0.01905;0.01905 SSP1;EWN;;;;;HSR;trn_pass;S1S;0.0001;0.0001;0.0004;0.0002;0.0002 @@ -6276,7 +6276,7 @@ SSP1;EWN;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;EWN;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;0.5708;0.5708 SSP1;EWN;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;0.7806;0.5536;0.5536 SSP1;FRA;;;;;Cycle;trn_pass;S1S;0.01942;0.02184;0.03641;0.1019;0.1019 -SSP1;FRA;;;;;Domestic Aviation;trn_pass;S1S;0.0001169;1.64E-05;1.1E-05;5.48E-06;5.48E-06 +SSP1;FRA;;;;;Domestic Aviation;trn_pass;S1S;0.0001169;3E-05;1.1E-05;5.48E-06;5.48E-06 SSP1;FRA;;;;;Domestic Ship;trn_freight;S1S;0.003419;0.003419;0.003419;0.003419;0.003419 SSP1;FRA;;;;;Freight Rail;trn_freight;S1S;0.01799;0.02698;0.02698;0.02698;0.02698 SSP1;FRA;;;;;HSR;trn_pass;S1S;0.0003359;0.0002267;0.0002015;0.0002015;0.0002015 @@ -6349,11 +6349,11 @@ SSP1;IND;;;;;Freight Rail;trn_freight;S1S;0.1924;0.2886;0.2361;0.1998;0.1998 SSP1;IND;;;;;HSR;trn_pass;S1S;0;0.0004615;0.00055;0.0003;0.0003 SSP1;IND;;;;;International Aviation;trn_aviation_intl;S1S;1;1;1;1;1 SSP1;IND;;;;;International Ship;trn_shipping_intl;S1S;1;1;1;1;1 -SSP1;IND;;;;;Passenger Rail;trn_pass;S1S;0.004978;0.01692;0.012;0.008;0.008 -SSP1;IND;;;;;Walk;trn_pass;S1S;0.9573;1;1;1;1 +SSP1;IND;;;;;Passenger Rail;trn_pass;S1S;0.004978;0.01354;0.012;0.008;0.008 +SSP1;IND;;;;;Walk;trn_pass;S1S;0.9573;0.8;1;1;1 SSP1;IND;;;;;trn_freight_road;trn_freight;S1S;1;1;1;1;1 -SSP1;IND;;;;;trn_pass_road;trn_pass;S1S;1;0.7268;0.54;0.1472;0.1472 -SSP1;IND;;;;Bus;trn_pass_road;trn_pass;S2S1;1;0.5457;0.4935;0.3949;0.3949 +SSP1;IND;;;;;trn_pass_road;trn_pass;S1S;1;1.09;0.54;0.1472;0.1472 +SSP1;IND;;;;Bus;trn_pass_road;trn_pass;S2S1;1;0.5457;0.3948;0.3949;0.3949 SSP1;IND;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;0.918;1;1;1;1 SSP1;IND;;;trn_pass_road_LDV_2W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;0.09;0.06;0.05108;0.05108;0.05108 SSP1;IND;;;trn_pass_road_LDV_4W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;1;1;1;1;1 @@ -6410,16 +6410,16 @@ SSP1;IND;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;IND;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;0.9164;0.4277;1;1;1 SSP1;IND;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;JPN;;;;;Cycle;trn_pass;S1S;0.01743;0.01743;0.03486;0.01961;0.01961 -SSP1;JPN;;;;;Domestic Aviation;trn_pass;S1S;0.0001729;3.114E-05;7.78E-05;2.19E-05;2.19E-05 +SSP1;JPN;;;;;Domestic Aviation;trn_pass;S1S;0.0001729;0.0001623;0.0002334;6.57E-05;6.57E-05 SSP1;JPN;;;;;Domestic Ship;trn_freight;S1S;0.01167;0.01111;0.01167;0.01167;0.01167 SSP1;JPN;;;;;Freight Rail;trn_freight;S1S;0.002833;0.004047;0.004249;0.004249;0.004249 -SSP1;JPN;;;;;HSR;trn_pass;S1S;0.0004081;0.0004081;0.0004591;0.0001291;0.0001291 +SSP1;JPN;;;;;HSR;trn_pass;S1S;0.0004081;0.0002857;0.0003673;0.0001033;0.0001033 SSP1;JPN;;;;;International Aviation;trn_aviation_intl;S1S;1;1;1;1;1 SSP1;JPN;;;;;International Ship;trn_shipping_intl;S1S;1;1;1;1;1 -SSP1;JPN;;;;;Passenger Rail;trn_pass;S1S;0.006084;0.01217;0.014;0.004562;0.004562 -SSP1;JPN;;;;;Walk;trn_pass;S1S;1;1;1;1;1 +SSP1;JPN;;;;;Passenger Rail;trn_pass;S1S;0.006084;0.006085;0.0084;0.00365;0.00365 +SSP1;JPN;;;;;Walk;trn_pass;S1S;1;0.5;1;1;1 SSP1;JPN;;;;;trn_freight_road;trn_freight;S1S;1;1;1;1;1 -SSP1;JPN;;;;;trn_pass_road;trn_pass;S1S;0.07113;0.03814;0.03814;0.01073;0.01073 +SSP1;JPN;;;;;trn_pass_road;trn_pass;S1S;0.07113;0.04195;0.04195;0.0118;0.0118 SSP1;JPN;;;;Bus;trn_pass_road;trn_pass;S2S1;0.06081;0.09122;0.09122;0.09122;0.09122 SSP1;JPN;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;1;1;1;1;1 SSP1;JPN;;;trn_pass_road_LDV_2W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;0.07;0.06;0.05491;0.05491;0.05491 @@ -6547,7 +6547,7 @@ SSP1;LAM;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;LAM;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;LAM;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;MEA;;;;;Cycle;trn_pass;S1S;0.0166;0.0166;0.0166;0.04149;0.04149 -SSP1;MEA;;;;;Domestic Aviation;trn_pass;S1S;0.008522;0.00142;0.00426;0.00625;0.00625 +SSP1;MEA;;;;;Domestic Aviation;trn_pass;S1S;0.008522;0.00282;0.00426;0.00625;0.00625 SSP1;MEA;;;;;Domestic Ship;trn_freight;S1S;0.00206;0.00206;0.00206;0.00206;0.00206 SSP1;MEA;;;;;Freight Rail;trn_freight;S1S;0.003202;0.004803;0.004803;0.004803;0.004803 SSP1;MEA;;;;;HSR;trn_pass;S1S;0;0.01667;0.01667;0.01667;0.01667 @@ -6611,7 +6611,7 @@ SSP1;MEA;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;MEA;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;0.9164;0.2857;1;1;1 SSP1;MEA;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;NEN;;;;;Cycle;trn_pass;S1S;0.003033;0.003024;0.002621;0.0182;0.0182 -SSP1;NEN;;;;;Domestic Aviation;trn_pass;S1S;7.21E-06;9.4E-07;6.12E-07;3.57E-07;3.57E-07 +SSP1;NEN;;;;;Domestic Aviation;trn_pass;S1S;7.21E-06;1.4E-06;6.12E-07;3.57E-07;3.57E-07 SSP1;NEN;;;;;Domestic Ship;trn_freight;S1S;0.03175;0.03175;0.03175;0.03175;0.03175 SSP1;NEN;;;;;Freight Rail;trn_freight;S1S;0.01925;0.02888;0.02888;0.02888;0.02888 SSP1;NEN;;;;;HSR;trn_pass;S1S;2E-05;4.53E-05;7.36E-06;5.52E-06;5.52E-06 @@ -6819,7 +6819,7 @@ SSP1;OAS;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP1;OAS;Liquids;Truck (40t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;OAS;Liquids;Truck (7_5t);trn_freight_road_tmp_subsectorL3;trn_freight_road_tmp_subsectorL2;trn_freight_road;trn_freight;FV;1;1;1;1;1 SSP1;REF;;;;;Cycle;trn_pass;S1S;0.01379;0.0149;0.0745;0.07824;0.07824 -SSP1;REF;;;;;Domestic Aviation;trn_pass;S1S;0.03574;0.004163;0.01156;0.003468;0.003468 +SSP1;REF;;;;;Domestic Aviation;trn_pass;S1S;0.03574;0.01163;0.01156;0.003468;0.003468 SSP1;REF;;;;;Domestic Ship;trn_freight;S1S;0.007227;0.007227;0.007227;0.007227;0.007227 SSP1;REF;;;;;Freight Rail;trn_freight;S1S;0.1296;0.1944;0.1944;0.1944;0.1944 SSP1;REF;;;;;HSR;trn_pass;S1S;0;0.002516;0.002516;0.000755;0.000755 diff --git a/tests/PRtest/PRtestEDGET.R b/tests/PRtest/PRtestEDGET.R index 9348b46..6a37552 100644 --- a/tests/PRtest/PRtestEDGET.R +++ b/tests/PRtest/PRtestEDGET.R @@ -81,6 +81,14 @@ plotStandardScenarios <- function(folderNameD, defScenN, refFolderD = NULL){ mifs <- list.files(testDirs, "Transport.mif", full.names = TRUE, recursive = TRUE) mifs <- mifs[grep(allScens$transportPolScen[n], mifs)] + mifs <- mifs[grep("SSP2", mifs)] + mifs <- mifs[grep("demRed", mifs, invert = TRUE)] + if (2 != length(mifs)) { + cat("ERROR: Wrong number of mifs selected.") + cat(mifs) + cat(" ") + quit(save = 'no', status = 1) + } scenNames <- c(allScens$scenName1[n], allScens$scenName2[n]) filename <- allScens$filename[n] outDir <- file.path(folderNameD, filename) diff --git a/tests/PRtest/compScenPR.R b/tests/PRtest/compScenPR.R index 2c3ed5c..28ef233 100644 --- a/tests/PRtest/compScenPR.R +++ b/tests/PRtest/compScenPR.R @@ -56,6 +56,14 @@ plotStandardScenarios <- function(refFolderD, defScenN = 2){ mifs <- list.files(testDirs, "Transport.mif", full.names = TRUE, recursive = TRUE) mifs <- mifs[grep(allScens$transportPolScen[n], mifs)] + mifs <- mifs[grep("SSP2", mifs)] + mifs <- mifs[grep("demRed", mifs, invert = TRUE)] + if (2 != length(mifs)) { + cat("ERROR: Wrong number of mifs selected.") + cat(mifs) + cat(" ") + quit(save = 'no', status = 1) + } scenNames <- c(allScens$scenName1[n], allScens$scenName2[n]) filename <- allScens$filename[n] outDir <- file.path(current_path, filename) @@ -63,6 +71,40 @@ plotStandardScenarios <- function(refFolderD, defScenN = 2){ sec <- c("00_info", "01_energy_demand","02_energy_services","03_energy_intensity", "04_stock_and_sales", "05_emissions", "06_input_parameters", "08_transportRemindInputfiles") + #EU21 + piamPlotComparison::compareScenarios( + projectLibrary = "reporttransport", + mifs, + mifHist, + outDir, + outputFile = paste0(format(Sys.time(), "%Y-%m-%d_%H.%M.%S"), "_", filename, "EUR-short.pdf"), + outputFormat = "pdf", + mifScenNames = scenNames, + sections = sec, + yearsScen = c(seq(2005, 2050, 5)), + yearsHist = c(seq(1960, 2020, 1), seq(2025, 2050, 5)), + yearsBarPlot = c(2020, 2030, 2040, 2050), + reg = c("ENC","EWN","ECS","ESC","ECE","FRA","DEU","UKI","ESW","EUR"), + mainReg = "EUR" + ) + + #H12 + piamPlotComparison::compareScenarios( + projectLibrary = "reporttransport", + mifs, + mifHist, + outDir, + outputFile = paste0(format(Sys.time(), "%Y-%m-%d_%H.%M.%S"), "_", filename, "H12-short.pdf"), + outputFormat = "pdf", + mifScenNames = scenNames, + sections = sec, + reg = c("OAS","MEA","SSA","LAM","REF","CAZ","CHA","IND","JPN","USA","NEU","EUR","World"), + yearsScen = c(seq(2005, 2050, 5)), + yearsHist = c(seq(1960, 2020, 1), seq(2025, 2050, 5)), + yearsBarPlot = c(2020, 2030, 2040, 2050), + mainReg = "World" + ) + #EU21 piamPlotComparison::compareScenarios( projectLibrary = "reporttransport",