Merge pull request #80 from johanneskoch94/main

Fix naming of function for caching purposes

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '2976210'
+ValidationKey: '2996376'
 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: 'mrdrivers: Create GDP and Population Scenarios'
-version: 1.5.1
-date-released: '2023-12-19'
+version: 1.5.2
+date-released: '2023-12-22'
 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:

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: mrdrivers
 Type: Package
 Title: Create GDP and Population Scenarios
-Version: 1.5.1
+Version: 1.5.2
 Authors@R: c(person(given = "Johannes", 
                     family = "Koch", 
                     email = "[email protected]", 
@@ -48,6 +48,6 @@ Suggests:
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
 RoxygenNote: 7.2.3
-Date: 2023-12-19
+Date: 2023-12-22
 Config/testthat/edition: 3
 VignetteBuilder: knitr

R/toolExtend2150.R

@@ -4,7 +4,7 @@ toolExtend2150 <- function(data, extension2150) {
     # The bezier extension is only possible if there is data until 2100, and only affects years between 2100 and 2150.
     # It extends the time series in such a way as for the slope in 2105 to be half of that in 2100.
     if (extension2150 == "bezier" && "y2100" %in% getYears(data)) {
-      data <- bezierExtension(data, seq(2105, 2150, 5))
+      data <- toolBezierExtension(data, seq(2105, 2150, 5))
     } else {
       helper <- getSets(data)
       data <- time_interpolate(data,
@@ -19,7 +19,7 @@ toolExtend2150 <- function(data, extension2150) {
 }
 
 
-bezierExtension <- function(data, timeExtend) {
+toolBezierExtension <- function(data, timeExtend) {
   # Define bezier coordinates
   bc <- new.magpie(getItems(data, 1), c(2100, 2110, 2140, 2150), getNames(data), fill = 0)
 

README.md

@@ -1,6 +1,6 @@
 # Create GDP and Population Scenarios
 
-R package **mrdrivers**, version **1.5.1**
+R package **mrdrivers**, version **1.5.2**
 
 [![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)
 
@@ -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 (2023). _mrdrivers: Create GDP and Population Scenarios_. R package version 1.5.1, <https://pik-piam.github.io/mrdrivershttps://github.com/pik-piam/mrdrivers>.
+Koch J, Soergel B, Leip D, Benke F, Dietrich J (2023). _mrdrivers: Create GDP and Population Scenarios_. R package version 1.5.2, <https://pik-piam.github.io/mrdrivershttps://github.com/pik-piam/mrdrivers>.
 
 A BibTeX entry for LaTeX users is
 
@@ -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 = {2023},
-  note = {R package version 1.5.1},
+  note = {R package version 1.5.2},
   url = {https://pik-piam.github.io/mrdrivers},
   url = {https://github.com/pik-piam/mrdrivers},
 }