Skip to content

Commit

Permalink
Merge pull request #308 from ahagen-pik/master
Browse files Browse the repository at this point in the history 
adjust SW SSP2 pass|road
  • Loading branch information
@ahagen-pik
ahagen-pik authored Nov 29, 2024
2 parents 57b75c6 + 35ed961 commit 735b4b8
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions inst/extdata/genParBaselinePrefTrends.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7155,7 +7155,7 @@ SSP2;CAZ;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t
SSP2;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
SSP2;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
SSP2;CHA;;;;;Cycle;trn_pass;S1S;0.09454;0.04412;0.03782;0.04848;0.04848
SSP2;CHA;;;;;Domestic Aviation;trn_pass;S1S;0.12;0.02712;0.0175;0.003357;0.00335
SSP2;CHA;;;;;Domestic Aviation;trn_pass;S1S;0.12;0.02712;0.01745;0.003357;0.003357
SSP2;CHA;;;;;Domestic Ship;trn_freight;S1S;0.01847;0.01922;0.02232;0.02232;0.02232
SSP2;CHA;;;;;Freight Rail;trn_freight;S1S;0.03204;0.0357;0.03795;0.03795;0.03795
SSP2;CHA;;;;;HSR;trn_pass;S1S;0.2402;0.08143;0.01916;0.003695;0.003695
Expand Down Expand Up @@ -7767,12 +7767,12 @@ SSP2;IND;;;;;HSR;trn_pass;S1S;0;0.0003175;0.0005093;0.0003;0.0003
SSP2;IND;;;;;International Aviation;trn_aviation_intl;S1S;1;1;1;1;1
SSP2;IND;;;;;International Ship;trn_shipping_intl;S1S;1;1;1;1;1
SSP2;IND;;;;;Passenger Rail;trn_pass;S1S;0.004978;0.00582;0.005556;0.004;0.004
SSP2;IND;;;;;Walk;trn_pass;S1S;0.9573;0.6879;0.926;1;1
SSP2;IND;;;;;Walk;trn_pass;S1S;1.053;0.6879;0.926;1;1
SSP2;IND;;;;;trn_freight_road;trn_freight;S1S;1;1;1;1;1
SSP2;IND;;;;;trn_pass_road;trn_pass;S1S;1;1;1;0.2945;0.2945
SSP2;IND;;;;Bus;trn_pass_road;trn_pass;S2S1;1;0.36;0.165;0.09872;0.09872
SSP2;IND;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;0.918;1;1;1;1
SSP2;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
SSP2;IND;;;;Bus;trn_pass_road;trn_pass;S2S1;1;0.3638;0.1645;0.09872;0.09872
SSP2;IND;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;0.7344;1;1;1;1
SSP2;IND;;;trn_pass_road_LDV_2W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;0.072;0.06;0.05108;0.05108;0.05108
SSP2;IND;;;trn_pass_road_LDV_4W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;1;1;1;1;1
SSP2;IND;;Compact Car;trn_pass_road_LDV_4W;trn_pass_road_LDV;trn_pass_road;trn_pass;VS3;1;1;1;1;1
SSP2;IND;;Large Car and SUV;trn_pass_road_LDV_4W;trn_pass_road_LDV;trn_pass_road;trn_pass;VS3;1;1;1;1;1
Expand Down Expand Up @@ -7905,7 +7905,7 @@ SSP2;LAM;;;;;Walk;trn_pass;S1S;1;1;1;1;1
SSP2;LAM;;;;;trn_freight_road;trn_freight;S1S;1;1;1;1;1
SSP2;LAM;;;;;trn_pass_road;trn_pass;S1S;0.655;0.6942;0.6942;0.8099;0.8099
SSP2;LAM;;;;Bus;trn_pass_road;trn_pass;S2S1;0.2647;0.1654;0.1323;0.1323;0.1323
SSP2;LAM;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;1;1;1;1;1
SSP2;LAM;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;0.8;1;1;1;1
SSP2;LAM;;;trn_pass_road_LDV_2W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;0.35;0.3;0.25;0.25;0.25
SSP2;LAM;;;trn_pass_road_LDV_4W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;1;1;1;1;1
SSP2;LAM;;Compact Car;trn_pass_road_LDV_4W;trn_pass_road_LDV;trn_pass_road;trn_pass;VS3;1;1;1;1;1
Expand Down Expand Up @@ -7976,7 +7976,7 @@ SSP2;MEA;;;;;trn_freight_road;trn_freight;S1S;1;1;1;1;1
SSP2;MEA;;;;;trn_pass_road;trn_pass;S1S;0.3767;0.4239;0.3815;0.3815;0.3815
SSP2;MEA;;;;Bus;trn_pass_road;trn_pass;S2S1;0.2676;0.1873;0.09367;0.07493;0.07493
SSP2;MEA;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;1;1;1;1;1
SSP2;MEA;;;trn_pass_road_LDV_2W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;0.01502;0.01502;0.02;0.01502;0.01502
SSP2;MEA;;;trn_pass_road_LDV_2W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;0.01502;0.01502;0.01502;0.01502;0.01502
SSP2;MEA;;;trn_pass_road_LDV_4W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;1;1;1;1;1
SSP2;MEA;;Compact Car;trn_pass_road_LDV_4W;trn_pass_road_LDV;trn_pass_road;trn_pass;VS3;0.5257;0.4732;0.4337;0.3943;0.3943
SSP2;MEA;;Large Car and SUV;trn_pass_road_LDV_4W;trn_pass_road_LDV;trn_pass_road;trn_pass;VS3;1;1;1;1;1
Expand Down Expand Up @@ -8177,7 +8177,7 @@ SSP2;OAS;;;;;Walk;trn_pass;S1S;1;1;1;1;1
SSP2;OAS;;;;;trn_freight_road;trn_freight;S1S;1;1;1;1;1
SSP2;OAS;;;;;trn_pass_road;trn_pass;S1S;0.4452;0.5697;0.5697;0.7121;0.7121
SSP2;OAS;;;;Bus;trn_pass_road;trn_pass;S2S1;0.4352;0.2571;0.1122;0.0962;0.0962
SSP2;OAS;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;1;1;1;1;1
SSP2;OAS;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;1.2;1;1;1;1
SSP2;OAS;;;trn_pass_road_LDV_2W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;0.8;0.5;0.3;0.2;0.2
SSP2;OAS;;;trn_pass_road_LDV_4W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;1;1;1;1;1
SSP2;OAS;;Compact Car;trn_pass_road_LDV_4W;trn_pass_road_LDV;trn_pass_road;trn_pass;VS3;0.002698;0.002811;0.004216;0.005621;0.005621
Expand Down Expand Up @@ -8314,7 +8314,7 @@ SSP2;SSA;;;;;Passenger Rail;trn_pass;S1S;0.0006024;0.001725;0.00253;0.0005693;0.
SSP2;SSA;;;;;Walk;trn_pass;S1S;1;1;1;1;1
SSP2;SSA;;;;;trn_freight_road;trn_freight;S1S;1;1;1;1;1
SSP2;SSA;;;;;trn_pass_road;trn_pass;S1S;0.2622;0.326;0.2869;0.04781;0.04781
SSP2;SSA;;;;Bus;trn_pass_road;trn_pass;S2S1;0.7568;0.323;0.16;0.09703;0.09703
SSP2;SSA;;;;Bus;trn_pass_road;trn_pass;S2S1;0.7568;0.3234;0.1493;0.09703;0.09703
SSP2;SSA;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;1;1;1;1;1
SSP2;SSA;;;trn_pass_road_LDV_2W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;0.02619;0.02619;0.02619;0.03928;0.03928
SSP2;SSA;;;trn_pass_road_LDV_4W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;1;1;1;1;1
Expand Down Expand Up @@ -8450,7 +8450,7 @@ SSP2;USA;;;;;International Ship;trn_shipping_intl;S1S;1;1;1;1;1
SSP2;USA;;;;;Passenger Rail;trn_pass;S1S;0.001933;0.001933;0.001933;0.0009665;0.0009665
SSP2;USA;;;;;Walk;trn_pass;S1S;1;1;1;1;1
SSP2;USA;;;;;trn_freight_road;trn_freight;S1S;1;1;1;1;1
SSP2;USA;;;;;trn_pass_road;trn_pass;S1S;0.1305;0.1305;0.1253;0.06526;0.06526
SSP2;USA;;;;;trn_pass_road;trn_pass;S1S;0.1305;0.1436;0.1253;0.06526;0.06526
SSP2;USA;;;;Bus;trn_pass_road;trn_pass;S2S1;0.0872;0.109;0.109;0.1235;0.1235
SSP2;USA;;;;trn_pass_road_LDV;trn_pass_road;trn_pass;S2S1;1;1;1;1;1
SSP2;USA;;;trn_pass_road_LDV_2W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;0.06;0.06;0.06;0.05;0.05
Expand Down

0 comments on commit 735b4b8

Please sign in to comment.