From 74b33b702abe5f4dfefd8cb052b1db058afa9656 Mon Sep 17 00:00:00 2001 From: Johannes Koch Date: Thu, 5 Sep 2024 13:57:20 +0200 Subject: [PATCH] Prepare for unit change --- DESCRIPTION | 2 +- R/calcGDP.R | 2 +- R/calcGDPPast.R | 2 +- R/calcGDPpc.R | 2 +- man/calcGDP.Rd | 4 ++-- man/calcGDPPast.Rd | 2 +- man/toolGetUnitDollar.Rd | 6 +++--- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 9a3dbda..c69bcbf 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: mrdrivers Type: Package Title: Create GDP and Population Scenarios -Version: 2.0.3 +Version: 2.0.3.9001 Authors@R: c(person(given = "Johannes", family = "Koch", email = "jokoch@pik-potsdam.de", diff --git a/R/calcGDP.R b/R/calcGDP.R index 21eea90..52fb770 100644 --- a/R/calcGDP.R +++ b/R/calcGDP.R @@ -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 diff --git a/R/calcGDPPast.R b/R/calcGDPPast.R index eb59cf2..64d24ea 100644 --- a/R/calcGDPPast.R +++ b/R/calcGDPPast.R @@ -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) diff --git a/R/calcGDPpc.R b/R/calcGDPpc.R index 30ba965..4ab93a6 100644 --- a/R/calcGDPpc.R +++ b/R/calcGDPpc.R @@ -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 diff --git a/man/calcGDP.Rd b/man/calcGDP.Rd index 4edd2a3..a63d02a 100644 --- a/man/calcGDP.Rd +++ b/man/calcGDP.Rd @@ -7,14 +7,14 @@ \usage{ calcGDP( scenario = c("SSPs", "SDPs", "SSP2EU"), - unit = "constant 2005 Int$PPP", + unit = "constant 2017 Int$PPP", average2020 = TRUE, ... ) calcGDPpc( scenario = c("SSPs", "SDPs", "SSP2EU"), - unit = "constant 2005 Int$PPP", + unit = "constant 2017 Int$PPP", average2020 = TRUE, ... ) diff --git a/man/calcGDPPast.Rd b/man/calcGDPPast.Rd index 3542a48..4ed72b0 100644 --- a/man/calcGDPPast.Rd +++ b/man/calcGDPPast.Rd @@ -10,7 +10,7 @@ \usage{ calcGDPFuture(GDPFuture, unit) -calcGDPPast(GDPPast = "WDI-MI", unit = "constant 2005 Int$PPP") +calcGDPPast(GDPPast = "WDI-MI", unit = "constant 2017 Int$PPP") calcGDPpcFuture(GDPpcFuture, unit) diff --git a/man/toolGetUnitDollar.Rd b/man/toolGetUnitDollar.Rd index 24c2059..b050b3b 100644 --- a/man/toolGetUnitDollar.Rd +++ b/man/toolGetUnitDollar.Rd @@ -2,7 +2,7 @@ % Please edit documentation in R/toolGetUnitDollar.R \name{toolGetUnitDollar} \alias{toolGetUnitDollar} -\title{Get unit used for monetary values} +\title{Get monetary unit} \usage{ toolGetUnitDollar(returnOnlyBase = FALSE, inPPP = FALSE) } @@ -12,10 +12,10 @@ toolGetUnitDollar(returnOnlyBase = FALSE, inPPP = FALSE) \item{inPPP}{TRUE or FALSE (default). If TRUE the the string ends in 'Int$PPP', instead of 'Int$MER'.} } \value{ -A string with the unit used for monetary values: 'constant 2017 US$MER'. +A string with the monetary unit: 'constant 2017 US$MER'. } \description{ -toolGetUnitDollar returns the unit used for monetary values. +toolGetUnitDollar returns unit used for monetary values. } \examples{ toolGetUnitDollar()