From ea35b2bdf850fe2287d2307d23c2e8f3210ff74e Mon Sep 17 00:00:00 2001 From: jmuessel <54351036+jmuessel@users.noreply.github.com> Date: Fri, 22 Nov 2024 22:55:58 +0100 Subject: [PATCH] Master (#303) * update SSP2 * Update SSP2 SWs * buildLIb * blib --- .buildlibrary | 2 +- .pre-commit-config.yaml | 4 +--- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- inst/extdata/genParBaselinePrefTrends.csv | 10 +++++----- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index f590492..4738eb1 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '5811600' +ValidationKey: '42122949' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5cdee1a..7ccf77e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,8 +1,6 @@ # testthat snapshots are machine-generated regression tests that # have to be preserved exactly as they are -# PRtest is a routine manually generated and is used independetly -# but stored in edgeTRansport package for versioning -exclude: '^(tests/testthat/_snaps/.*$|tests/PRtest/)' +exclude: '^tests/testthat/_snaps/.*$' repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: 2c9f875913ee60ca25ce70243dc24d5b6415598c # frozen: v4.6.0 diff --git a/CITATION.cff b/CITATION.cff index 4fdd231..58975b1 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,8 +2,8 @@ cff-version: 1.2.0 message: If you use this software, please cite it using the metadata from this file. type: software title: 'edgeTransport: Prepare EDGE Transport Data for the REMIND model' -version: 2.9.0 -date-released: '2024-11-13' +version: 2.10.1 +date-released: '2024-11-22' abstract: EDGE-T is a fork of the GCAM transport module https://jgcri.github.io/gcam-doc/energy.html#transportation with a high level of detail in its representation of technological and modal options. It is a partial equilibrium model with a nested multinomial logit structure and diff --git a/DESCRIPTION b/DESCRIPTION index a702d62..a72e722 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: edgeTransport Title: Prepare EDGE Transport Data for the REMIND model -Version: 2.9.0 +Version: 2.10.1 Authors@R: c( person("Johanna", "Hoppe", , "johanna.hoppe@pik-potsdam.de", role = c("aut", "cre"), comment = c(ORCID = "0009-0004-6753-5090")), @@ -19,7 +19,7 @@ Encoding: UTF-8 LazyData: true RoxygenNote: 7.3.2 VignetteBuilder: knitr -Date: 2024-11-13 +Date: 2024-11-22 Config/testthat/edition: 3 Imports: rmndt, diff --git a/README.md b/README.md index 93887d6..f117218 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Prepare EDGE Transport Data for the REMIND model -R package **edgeTransport**, version **2.9.0** +R package **edgeTransport**, version **2.10.1** [![CRAN status](https://www.r-pkg.org/badges/version/edgeTransport)](https://cran.r-project.org/package=edgeTransport) [![R build status](https://github.com/pik-piam/edgeTransport/workflows/check/badge.svg)](https://github.com/pik-piam/edgeTransport/actions) [![codecov](https://codecov.io/gh/pik-piam/edgeTransport/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/edgeTransport) [![r-universe](https://pik-piam.r-universe.dev/badges/edgeTransport)](https://pik-piam.r-universe.dev/builds) @@ -46,7 +46,7 @@ In case of questions / problems please contact Johanna Hoppe . +Hoppe J, Dirnaichner A, Rottoli M, Muessel J (2024). _edgeTransport: Prepare EDGE Transport Data for the REMIND model_. R package version 2.10.1, . A BibTeX entry for LaTeX users is @@ -55,7 +55,7 @@ A BibTeX entry for LaTeX users is title = {edgeTransport: Prepare EDGE Transport Data for the REMIND model}, author = {Johanna Hoppe and Alois Dirnaichner and Marianna Rottoli and Jarusch Muessel}, year = {2024}, - note = {R package version 2.9.0}, + note = {R package version 2.10.1}, url = {https://github.com/pik-piam/edgeTransport}, } ``` diff --git a/inst/extdata/genParBaselinePrefTrends.csv b/inst/extdata/genParBaselinePrefTrends.csv index 715ba1f..bde7e70 100644 --- a/inst/extdata/genParBaselinePrefTrends.csv +++ b/inst/extdata/genParBaselinePrefTrends.csv @@ -7760,7 +7760,7 @@ SSP2;FRA;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP2;FRA;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;FRA;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;IND;;;;;Cycle;trn_pass;S1S;0.01915;0.03175;0.0463;0.1;0.1 -SSP2;IND;;;;;Domestic Aviation;trn_pass;S1S;0.6659;0.7575;0.4861;0.1909;0.1909 +SSP2;IND;;;;;Domestic Aviation;trn_pass;S1S;0.75;0.7575;0.4861;0.1909;0.1909 SSP2;IND;;;;;Domestic Ship;trn_freight;S1S;0.001202;0.001202;0.001092;0.0009244;0.0009244 SSP2;IND;;;;;Freight Rail;trn_freight;S1S;0.1924;0.1924;0.1574;0.1332;0.1332 SSP2;IND;;;;;HSR;trn_pass;S1S;0;0.0003175;0.0005093;0.0003;0.0003 @@ -7770,7 +7770,7 @@ 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;;;;;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.3638;0.1645;0.09872;0.09872 +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;;;trn_pass_road_LDV_4W;trn_pass_road_LDV;trn_pass_road;trn_pass;S3S2;1;1;1;1;1 @@ -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.01502;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.02;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 @@ -8304,7 +8304,7 @@ SSP2;REF;Liquids;Truck (26t);trn_freight_road_tmp_subsectorL3;trn_freight_road_t SSP2;REF;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;REF;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;SSA;;;;;Cycle;trn_pass;S1S;0.01388;0.01987;0.02915;0.03279;0.03279 -SSP2;SSA;;;;;Domestic Aviation;trn_pass;S1S;0.008602;0.05387;0.03951;0.005926;0.005926 +SSP2;SSA;;;;;Domestic Aviation;trn_pass;S1S;0.027;0.05387;0.03951;0.005926;0.005926 SSP2;SSA;;;;;Domestic Ship;trn_freight;S1S;0.001495;0.001495;0.001495;0.001495;0.001495 SSP2;SSA;;;;;Freight Rail;trn_freight;S1S;0.01665;0.01665;0.01665;0.01498;0.01498 SSP2;SSA;;;;;HSR;trn_pass;S1S;1.48E-05;2.22E-05;0.06504;0.009756;0.009756 @@ -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.3234;0.1493;0.09703;0.09703 +SSP2;SSA;;;;Bus;trn_pass_road;trn_pass;S2S1;0.7568;0.323;0.16;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