Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch monetary unit to base 2017 #88

Merged
merged 2 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .buildlibrary
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ValidationKey: '4047211'
ValidationKey: '5995800'
AutocreateReadme: yes
AcceptedWarnings:
- 'Warning: package ''.*'' was built under R version'
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repos:
- id: mixed-line-ending

- repo: https://github.com/lorenzwalthert/precommit
rev: 7910e0323d7213f34275a7a562b9ef0fde8ce1b9 # frozen: v0.4.2
rev: bae853d82da476eee0e0a57960ee6b741a3b3fb7 # frozen: v0.4.3
hooks:
- id: parsable-R
- id: deps-in-desc
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -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: 'mrdrivers: Create GDP and Population Scenarios'
version: 2.0.3
date-released: '2024-08-02'
version: 3.0.0
date-released: '2024-09-20'
abstract: Create GDP and population scenarios This package constructs the GDP and
population scenarios used as drivers in both the REMIND and MAgPIE models.
authors:
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: mrdrivers
Type: Package
Title: Create GDP and Population Scenarios
Version: 2.0.3
Version: 3.0.0
Authors@R: c(person(given = "Johannes",
family = "Koch",
email = "jokoch@pik-potsdam.de",
Expand Down Expand Up @@ -48,6 +48,6 @@ Suggests:
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.2
Date: 2024-08-02
Date: 2024-09-20
Config/testthat/edition: 3
VignetteBuilder: knitr
2 changes: 1 addition & 1 deletion R/calcGDP.R
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#' }
#'
calcGDP <- function(scenario = c("SSPs", "SDPs", "SSP2EU"),
unit = "constant 2005 Int$PPP",
unit = "constant 2017 Int$PPP",
average2020 = TRUE,
...) {
# Check user input
Expand Down
2 changes: 1 addition & 1 deletion R/calcGDPPast.R
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#' @inheritParams calcGDP
#' @inheritSection calcScenarioConstructor Combining data sources with "-"
#' @keywords internal
calcGDPPast <- function(GDPPast = "WDI-MI", unit = "constant 2005 Int$PPP") { # nolint
calcGDPPast <- function(GDPPast = "WDI-MI", unit = "constant 2017 Int$PPP") { # nolint
# Check user input
toolCheckUserInput("GDPPast", as.list(environment()))
# Call calcInternalGDPPast function the appropriate number of times (map) and combine (reduce)
Expand Down
2 changes: 1 addition & 1 deletion R/calcGDPpc.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#' }
#'
calcGDPpc <- function(scenario = c("SSPs", "SDPs", "SSP2EU"),
unit = "constant 2005 Int$PPP",
unit = "constant 2017 Int$PPP",
average2020 = TRUE,
...) {
# Check user input
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Create GDP and Population Scenarios

R package **mrdrivers**, version **2.0.3**
R package **mrdrivers**, version **3.0.0**

[![CRAN status](https://www.r-pkg.org/badges/version/mrdrivers)](https://cran.r-project.org/package=mrdrivers) [![R build status](https://pik-piam.github.io/mrdrivers/workflows/check/badge.svg)](https://pik-piam.github.io/mrdrivers/actions) [![codecov](https://codecov.io/gh/mrdrivers/branch/master/graph/badge.svg)](https://app.codecov.io/gh/mrdrivers) [![r-universe](https://pik-piam.r-universe.dev/badges/mrdrivers)](https://pik-piam.r-universe.dev/builds)

Expand Down Expand Up @@ -103,7 +103,7 @@ In case of questions / problems please contact Johannes Koch <jokoch@pik-potsdam

To cite package **mrdrivers** in publications use:

Koch J, Soergel B, Leip D, Benke F, Dietrich J (2024). _mrdrivers: Create GDP and Population Scenarios_. R package version 2.0.3, <https://pik-piam.github.io/mrdrivershttps://github.com/pik-piam/mrdrivers>.
Koch J, Soergel B, Leip D, Benke F, Dietrich J (2024). _mrdrivers: Create GDP and Population Scenarios_. R package version 3.0.0, <https://pik-piam.github.io/mrdrivershttps://github.com/pik-piam/mrdrivers>.

A BibTeX entry for LaTeX users is

Expand All @@ -112,7 +112,7 @@ A BibTeX entry for LaTeX users is
title = {mrdrivers: Create GDP and Population Scenarios},
author = {Johannes Koch and Bjoern Soergel and Deborra Leip and Falk Benke and Jan Philipp Dietrich},
year = {2024},
note = {R package version 2.0.3},
note = {R package version 3.0.0},
url = {https://pik-piam.github.io/mrdrivers},
url = {https://github.com/pik-piam/mrdrivers},
}
Expand Down
4 changes: 2 additions & 2 deletions man/calcGDP.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/calcGDPPast.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions man/toolGetUnitDollar.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading