Merge pull request #279 from ahagen-pik/updateScenarios

update scenarios SSP3, SSP2

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '5214258'
+ValidationKey: '5235546'
 AutocreateReadme: yes
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'

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.6.1
-date-released: '2024-09-12'
+version: 2.6.2
+date-released: '2024-09-17'
 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

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: edgeTransport
 Title: Prepare EDGE Transport Data for the REMIND model
-Version: 2.6.1
+Version: 2.6.2
 Authors@R: c(
     person("Johanna", "Hoppe", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0009-0004-6753-5090")),
@@ -18,7 +18,7 @@ Encoding: UTF-8
 LazyData: true
 RoxygenNote: 7.3.2
 VignetteBuilder: knitr
-Date: 2024-09-12
+Date: 2024-09-17
 Config/testthat/edition: 3
 Imports:
     rmndt,

README.md

@@ -1,6 +1,6 @@
 # Prepare EDGE Transport Data for the REMIND model
 
-R package **edgeTransport**, version **2.6.1**
+R package **edgeTransport**, version **2.6.2**
 
 [![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 <johanna.hoppe@pik-
 
 To cite package **edgeTransport** in publications use:
 
-Hoppe J, Dirnaichner A, Rottoli M, Muessel J (2024). _edgeTransport: Prepare EDGE Transport Data for the REMIND model_. R package version 2.6.1, <https://github.com/pik-piam/edgeTransport>.
+Hoppe J, Dirnaichner A, Rottoli M, Muessel J (2024). _edgeTransport: Prepare EDGE Transport Data for the REMIND model_. R package version 2.6.2, <https://github.com/pik-piam/edgeTransport>.
 
 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.6.1},
+  note = {R package version 2.6.2},
   url = {https://github.com/pik-piam/edgeTransport},
 }
 ```

inst/extdata/scenParDemRegression.csv

@@ -1,129 +1,129 @@
 SSPscen;variable;sector;GDPpcPPP;value
-SSP1;Income elasticity;trn_pass;10000;0.8
-SSP1;Income elasticity;trn_pass;20000;0.75
-SSP1;Income elasticity;trn_pass;30000;0.5
-SSP1;Income elasticity;trn_pass;40000;0.1
-SSP1;Income elasticity;trn_aviation_intl;10000;1.1
-SSP1;Income elasticity;trn_aviation_intl;20000;1.3
-SSP1;Income elasticity;trn_aviation_intl;30000;0.8
-SSP1;Income elasticity;trn_aviation_intl;40000;0.3
-SSP1;Income elasticity;trn_freight;10000;1.5
-SSP1;Income elasticity;trn_freight;20000;0.9
-SSP1;Income elasticity;trn_freight;30000;0.4
-SSP1;Income elasticity;trn_freight;40000;0.16
-SSP1;Income elasticity;trn_shipping_intl;10000;0.5
-SSP1;Income elasticity;trn_shipping_intl;20000;0.3
-SSP1;Income elasticity;trn_shipping_intl;30000;0.2
-SSP1;Income elasticity;trn_shipping_intl;40000;0.1
-SSP2;Income elasticity;trn_pass;10000;0.8
-SSP2;Income elasticity;trn_pass;20000;0.75
-SSP2;Income elasticity;trn_pass;30000;0.5
-SSP2;Income elasticity;trn_pass;40000;0.1
-SSP2;Income elasticity;trn_aviation_intl;10000;1.1
-SSP2;Income elasticity;trn_aviation_intl;20000;1.3
-SSP2;Income elasticity;trn_aviation_intl;30000;0.8
-SSP2;Income elasticity;trn_aviation_intl;40000;0.3
-SSP2;Income elasticity;trn_freight;10000;1.5
-SSP2;Income elasticity;trn_freight;20000;0.9
-SSP2;Income elasticity;trn_freight;30000;0.4
-SSP2;Income elasticity;trn_freight;40000;0.16
-SSP2;Income elasticity;trn_shipping_intl;10000;0.5
-SSP2;Income elasticity;trn_shipping_intl;20000;0.3
-SSP2;Income elasticity;trn_shipping_intl;30000;0.2
-SSP2;Income elasticity;trn_shipping_intl;40000;0.1
-SSP5;Income elasticity;trn_pass;10000;0.8
-SSP5;Income elasticity;trn_pass;20000;0.75
-SSP5;Income elasticity;trn_pass;30000;0.5
-SSP5;Income elasticity;trn_pass;40000;0.1
-SSP5;Income elasticity;trn_aviation_intl;10000;1.1
-SSP5;Income elasticity;trn_aviation_intl;20000;1.3
-SSP5;Income elasticity;trn_aviation_intl;30000;0.8
-SSP5;Income elasticity;trn_aviation_intl;40000;0.3
-SSP5;Income elasticity;trn_freight;10000;1.5
-SSP5;Income elasticity;trn_freight;20000;0.9
-SSP5;Income elasticity;trn_freight;30000;0.4
-SSP5;Income elasticity;trn_freight;40000;0.16
-SSP5;Income elasticity;trn_shipping_intl;10000;0.5
-SSP5;Income elasticity;trn_shipping_intl;20000;0.3
-SSP5;Income elasticity;trn_shipping_intl;30000;0.2
-SSP5;Income elasticity;trn_shipping_intl;40000;0.1
-SSP2EU;Income elasticity;trn_pass;10000;0.8
-SSP2EU;Income elasticity;trn_pass;20000;0.75
-SSP2EU;Income elasticity;trn_pass;30000;0.5
-SSP2EU;Income elasticity;trn_pass;40000;0.1
-SSP2EU;Income elasticity;trn_aviation_intl;10000;1.1
-SSP2EU;Income elasticity;trn_aviation_intl;20000;1.3
-SSP2EU;Income elasticity;trn_aviation_intl;30000;0.8
-SSP2EU;Income elasticity;trn_aviation_intl;40000;0.3
-SSP2EU;Income elasticity;trn_freight;10000;1.5
-SSP2EU;Income elasticity;trn_freight;20000;0.9
-SSP2EU;Income elasticity;trn_freight;30000;0.4
-SSP2EU;Income elasticity;trn_freight;40000;0.16
-SSP2EU;Income elasticity;trn_shipping_intl;10000;0.5
-SSP2EU;Income elasticity;trn_shipping_intl;20000;0.3
-SSP2EU;Income elasticity;trn_shipping_intl;30000;0.2
-SSP2EU;Income elasticity;trn_shipping_intl;40000;0.1
-SDP;Income elasticity;trn_pass;10000;0.8
-SDP;Income elasticity;trn_pass;20000;0.75
-SDP;Income elasticity;trn_pass;30000;0.5
-SDP;Income elasticity;trn_pass;40000;-0.2
-SDP;Income elasticity;trn_aviation_intl;10000;1.2
-SDP;Income elasticity;trn_aviation_intl;20000;0.7
-SDP;Income elasticity;trn_aviation_intl;30000;0
-SDP;Income elasticity;trn_aviation_intl;40000;-0.2
-SDP;Income elasticity;trn_freight;10000;1.5
-SDP;Income elasticity;trn_freight;20000;0.9
-SDP;Income elasticity;trn_freight;30000;0.4
-SDP;Income elasticity;trn_freight;40000;0.1
-SDP;Income elasticity;trn_shipping_intl;10000;0.4
-SDP;Income elasticity;trn_shipping_intl;20000;0.3
-SDP;Income elasticity;trn_shipping_intl;30000;0.2
-SDP;Income elasticity;trn_shipping_intl;40000;0.1
-SDP_RC;Income elasticity;trn_pass;10000;0.8
-SDP_RC;Income elasticity;trn_pass;20000;0.75
-SDP_RC;Income elasticity;trn_pass;30000;0.5
-SDP_RC;Income elasticity;trn_pass;40000;-0.2
-SDP_RC;Income elasticity;trn_aviation_intl;10000;1.2
-SDP_RC;Income elasticity;trn_aviation_intl;20000;0.7
-SDP_RC;Income elasticity;trn_aviation_intl;30000;0
-SDP_RC;Income elasticity;trn_aviation_intl;40000;-0.2
-SDP_RC;Income elasticity;trn_freight;10000;1.5
-SDP_RC;Income elasticity;trn_freight;20000;0.9
-SDP_RC;Income elasticity;trn_freight;30000;0.4
-SDP_RC;Income elasticity;trn_freight;40000;0.1
-SDP_RC;Income elasticity;trn_shipping_intl;10000;0.4
-SDP_RC;Income elasticity;trn_shipping_intl;20000;0.3
-SDP_RC;Income elasticity;trn_shipping_intl;30000;0.2
-SDP_RC;Income elasticity;trn_shipping_intl;40000;0.1
-SDP_MC;Income elasticity;trn_pass;10000;0.8
-SDP_MC;Income elasticity;trn_pass;20000;0.75
-SDP_MC;Income elasticity;trn_pass;30000;0.5
-SDP_MC;Income elasticity;trn_pass;40000;-0.1
-SDP_MC;Income elasticity;trn_aviation_intl;10000;1.1
-SDP_MC;Income elasticity;trn_aviation_intl;20000;1.3
-SDP_MC;Income elasticity;trn_aviation_intl;30000;0.5
-SDP_MC;Income elasticity;trn_aviation_intl;40000;-0.1
-SDP_MC;Income elasticity;trn_freight;10000;1.5
-SDP_MC;Income elasticity;trn_freight;20000;0.9
-SDP_MC;Income elasticity;trn_freight;30000;0.4
-SDP_MC;Income elasticity;trn_freight;40000;0.16
-SDP_MC;Income elasticity;trn_shipping_intl;10000;0.5
-SDP_MC;Income elasticity;trn_shipping_intl;20000;0.3
-SDP_MC;Income elasticity;trn_shipping_intl;30000;0.2
-SDP_MC;Income elasticity;trn_shipping_intl;40000;0.1
-SDP_EI;Income elasticity;trn_pass;10000;0.8
-SDP_EI;Income elasticity;trn_pass;20000;0.75
-SDP_EI;Income elasticity;trn_pass;30000;0.5
-SDP_EI;Income elasticity;trn_pass;40000;0.1
-SDP_EI;Income elasticity;trn_aviation_intl;10000;1.1
-SDP_EI;Income elasticity;trn_aviation_intl;20000;1.3
-SDP_EI;Income elasticity;trn_aviation_intl;30000;0.8
-SDP_EI;Income elasticity;trn_aviation_intl;40000;0.3
-SDP_EI;Income elasticity;trn_freight;10000;1.5
-SDP_EI;Income elasticity;trn_freight;20000;0.9
-SDP_EI;Income elasticity;trn_freight;30000;0.4
-SDP_EI;Income elasticity;trn_freight;40000;0.16
-SDP_EI;Income elasticity;trn_shipping_intl;10000;0.5
-SDP_EI;Income elasticity;trn_shipping_intl;20000;0.3
-SDP_EI;Income elasticity;trn_shipping_intl;30000;0.2
-SDP_EI;Income elasticity;trn_shipping_intl;40000;0.1
+SSP1;Income elasticity;trn_pass;1E+04;0.8
+SSP1;Income elasticity;trn_pass;2E+04;0.75
+SSP1;Income elasticity;trn_pass;3E+04;0.5
+SSP1;Income elasticity;trn_pass;4E+04;0.1
+SSP1;Income elasticity;trn_aviation_intl;1E+04;1.1
+SSP1;Income elasticity;trn_aviation_intl;2E+04;1.3
+SSP1;Income elasticity;trn_aviation_intl;3E+04;0.8
+SSP1;Income elasticity;trn_aviation_intl;4E+04;0.3
+SSP1;Income elasticity;trn_freight;1E+04;1.5
+SSP1;Income elasticity;trn_freight;2E+04;0.9
+SSP1;Income elasticity;trn_freight;3E+04;0.4
+SSP1;Income elasticity;trn_freight;4E+04;0.16
+SSP1;Income elasticity;trn_shipping_intl;1E+04;0.5
+SSP1;Income elasticity;trn_shipping_intl;2E+04;0.3
+SSP1;Income elasticity;trn_shipping_intl;3E+04;0.2
+SSP1;Income elasticity;trn_shipping_intl;4E+04;0.1
+SSP5;Income elasticity;trn_pass;1E+04;0.8
+SSP5;Income elasticity;trn_pass;2E+04;0.75
+SSP5;Income elasticity;trn_pass;3E+04;0.5
+SSP5;Income elasticity;trn_pass;4E+04;0.1
+SSP5;Income elasticity;trn_aviation_intl;1E+04;1.1
+SSP5;Income elasticity;trn_aviation_intl;2E+04;1.3
+SSP5;Income elasticity;trn_aviation_intl;3E+04;0.8
+SSP5;Income elasticity;trn_aviation_intl;4E+04;0.3
+SSP5;Income elasticity;trn_freight;1E+04;1.5
+SSP5;Income elasticity;trn_freight;2E+04;0.9
+SSP5;Income elasticity;trn_freight;3E+04;0.4
+SSP5;Income elasticity;trn_freight;4E+04;0.16
+SSP5;Income elasticity;trn_shipping_intl;1E+04;0.5
+SSP5;Income elasticity;trn_shipping_intl;2E+04;0.3
+SSP5;Income elasticity;trn_shipping_intl;3E+04;0.2
+SSP5;Income elasticity;trn_shipping_intl;4E+04;0.1
+SSP2;Income elasticity;trn_pass;1E+04;0.8
+SSP2;Income elasticity;trn_pass;2E+04;0.75
+SSP2;Income elasticity;trn_pass;3E+04;0.5
+SSP2;Income elasticity;trn_pass;4E+04;0.1
+SSP2;Income elasticity;trn_aviation_intl;1E+04;1.1
+SSP2;Income elasticity;trn_aviation_intl;2E+04;1.3
+SSP2;Income elasticity;trn_aviation_intl;3E+04;0.8
+SSP2;Income elasticity;trn_aviation_intl;4E+04;0.3
+SSP2;Income elasticity;trn_freight;1E+04;1.5
+SSP2;Income elasticity;trn_freight;2E+04;0.9
+SSP2;Income elasticity;trn_freight;3E+04;0.4
+SSP2;Income elasticity;trn_freight;4E+04;0.16
+SSP2;Income elasticity;trn_shipping_intl;1E+04;0.5
+SSP2;Income elasticity;trn_shipping_intl;2E+04;0.3
+SSP2;Income elasticity;trn_shipping_intl;3E+04;0.2
+SSP2;Income elasticity;trn_shipping_intl;4E+04;0.1
+SDP;Income elasticity;trn_pass;1E+04;0.8
+SDP;Income elasticity;trn_pass;2E+04;0.75
+SDP;Income elasticity;trn_pass;3E+04;0.5
+SDP;Income elasticity;trn_pass;4E+04;-0.2
+SDP;Income elasticity;trn_aviation_intl;1E+04;1.2
+SDP;Income elasticity;trn_aviation_intl;2E+04;0.7
+SDP;Income elasticity;trn_aviation_intl;3E+04;0
+SDP;Income elasticity;trn_aviation_intl;4E+04;-0.2
+SDP;Income elasticity;trn_freight;1E+04;1.5
+SDP;Income elasticity;trn_freight;2E+04;0.9
+SDP;Income elasticity;trn_freight;3E+04;0.4
+SDP;Income elasticity;trn_freight;4E+04;0.1
+SDP;Income elasticity;trn_shipping_intl;1E+04;0.4
+SDP;Income elasticity;trn_shipping_intl;2E+04;0.3
+SDP;Income elasticity;trn_shipping_intl;3E+04;0.2
+SDP;Income elasticity;trn_shipping_intl;4E+04;0.1
+SDP_RC;Income elasticity;trn_pass;1E+04;0.8
+SDP_RC;Income elasticity;trn_pass;2E+04;0.75
+SDP_RC;Income elasticity;trn_pass;3E+04;0.5
+SDP_RC;Income elasticity;trn_pass;4E+04;-0.2
+SDP_RC;Income elasticity;trn_aviation_intl;1E+04;1.2
+SDP_RC;Income elasticity;trn_aviation_intl;2E+04;0.7
+SDP_RC;Income elasticity;trn_aviation_intl;3E+04;0
+SDP_RC;Income elasticity;trn_aviation_intl;4E+04;-0.2
+SDP_RC;Income elasticity;trn_freight;1E+04;1.5
+SDP_RC;Income elasticity;trn_freight;2E+04;0.9
+SDP_RC;Income elasticity;trn_freight;3E+04;0.4
+SDP_RC;Income elasticity;trn_freight;4E+04;0.1
+SDP_RC;Income elasticity;trn_shipping_intl;1E+04;0.4
+SDP_RC;Income elasticity;trn_shipping_intl;2E+04;0.3
+SDP_RC;Income elasticity;trn_shipping_intl;3E+04;0.2
+SDP_RC;Income elasticity;trn_shipping_intl;4E+04;0.1
+SDP_MC;Income elasticity;trn_pass;1E+04;0.8
+SDP_MC;Income elasticity;trn_pass;2E+04;0.75
+SDP_MC;Income elasticity;trn_pass;3E+04;0.5
+SDP_MC;Income elasticity;trn_pass;4E+04;-0.1
+SDP_MC;Income elasticity;trn_aviation_intl;1E+04;1.1
+SDP_MC;Income elasticity;trn_aviation_intl;2E+04;1.3
+SDP_MC;Income elasticity;trn_aviation_intl;3E+04;0.5
+SDP_MC;Income elasticity;trn_aviation_intl;4E+04;-0.1
+SDP_MC;Income elasticity;trn_freight;1E+04;1.5
+SDP_MC;Income elasticity;trn_freight;2E+04;0.9
+SDP_MC;Income elasticity;trn_freight;3E+04;0.4
+SDP_MC;Income elasticity;trn_freight;4E+04;0.16
+SDP_MC;Income elasticity;trn_shipping_intl;1E+04;0.5
+SDP_MC;Income elasticity;trn_shipping_intl;2E+04;0.3
+SDP_MC;Income elasticity;trn_shipping_intl;3E+04;0.2
+SDP_MC;Income elasticity;trn_shipping_intl;4E+04;0.1
+SDP_EI;Income elasticity;trn_pass;1E+04;0.8
+SDP_EI;Income elasticity;trn_pass;2E+04;0.75
+SDP_EI;Income elasticity;trn_pass;3E+04;0.5
+SDP_EI;Income elasticity;trn_pass;4E+04;0.1
+SDP_EI;Income elasticity;trn_aviation_intl;1E+04;1.1
+SDP_EI;Income elasticity;trn_aviation_intl;2E+04;1.3
+SDP_EI;Income elasticity;trn_aviation_intl;3E+04;0.8
+SDP_EI;Income elasticity;trn_aviation_intl;4E+04;0.3
+SDP_EI;Income elasticity;trn_freight;1E+04;1.5
+SDP_EI;Income elasticity;trn_freight;2E+04;0.9
+SDP_EI;Income elasticity;trn_freight;3E+04;0.4
+SDP_EI;Income elasticity;trn_freight;4E+04;0.16
+SDP_EI;Income elasticity;trn_shipping_intl;1E+04;0.5
+SDP_EI;Income elasticity;trn_shipping_intl;2E+04;0.3
+SDP_EI;Income elasticity;trn_shipping_intl;3E+04;0.2
+SDP_EI;Income elasticity;trn_shipping_intl;4E+04;0.1
+SSP3;Income elasticity;trn_pass;1E+04;0.8
+SSP3;Income elasticity;trn_pass;2E+04;0.75
+SSP3;Income elasticity;trn_pass;3E+04;0.5
+SSP3;Income elasticity;trn_pass;4E+04;0.1
+SSP3;Income elasticity;trn_aviation_intl;1E+04;1.1
+SSP3;Income elasticity;trn_aviation_intl;2E+04;1.3
+SSP3;Income elasticity;trn_aviation_intl;3E+04;0.8
+SSP3;Income elasticity;trn_aviation_intl;4E+04;0.3
+SSP3;Income elasticity;trn_freight;1E+04;1.5
+SSP3;Income elasticity;trn_freight;2E+04;0.9
+SSP3;Income elasticity;trn_freight;3E+04;0.4
+SSP3;Income elasticity;trn_freight;4E+04;0.16
+SSP3;Income elasticity;trn_shipping_intl;1E+04;0.5
+SSP3;Income elasticity;trn_shipping_intl;2E+04;0.3
+SSP3;Income elasticity;trn_shipping_intl;3E+04;0.2
+SSP3;Income elasticity;trn_shipping_intl;4E+04;0.1