move helpers to piamutils

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '99145'
+ValidationKey: '118980'
 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: 'piamPlotComparison: Create comparison plots for your model results'
-version: 0.0.5
-date-released: '2024-04-16'
+version: 0.0.6
+date-released: '2024-04-17'
 abstract: A frameworks to create comparison plots for your model results.
 authors:
 - family-names: Benke

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: piamPlotComparison
 Title: Create comparison plots for your model results
-Version: 0.0.5
-Date: 2024-04-16
+Version: 0.0.6
+Date: 2024-04-17
 Authors@R: c(
     person("Falk", "Benke", , "[email protected]", role = c("aut", "cre")),
     person("Christof", "Schoetz", role = "aut")
@@ -15,6 +15,7 @@ Imports:
     knitr,
     magclass,
     mip (>= 0.148.11),
+    piamutils,
     quitte,
     rlang,
     rmarkdown,

NAMESPACE

@@ -2,9 +2,7 @@
 
 export(calcTimeSeriesStats)
 export(compareScenarios)
-export(deletePlus)
 export(showStatsTable)
-export(substitutePlaceholder)
 importFrom(dplyr,"%>%")
 importFrom(dplyr,across)
 importFrom(dplyr,all_of)
@@ -17,12 +15,6 @@ importFrom(dplyr,left_join)
 importFrom(dplyr,mutate)
 importFrom(dplyr,select)
 importFrom(dplyr,summarize)
-importFrom(magclass,"getNames<-")
-importFrom(magclass,getNames)
-importFrom(magclass,is.magpie)
-importFrom(magclass,read.report)
 importFrom(rlang,.data)
 importFrom(rlang,.env)
 importFrom(tidyr,pivot_wider)
-importFrom(utils,read.csv)
-importFrom(utils,write.table)

README.md

@@ -1,6 +1,6 @@
 # Create comparison plots for your model results
 
-R package **piamPlotComparison**, version **0.0.5**
+R package **piamPlotComparison**, version **0.0.6**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/piamPlotComparison)](https://cran.r-project.org/package=piamPlotComparison)  [![R build status](https://github.com/pik-piam/piamPlotComparison/workflows/check/badge.svg)](https://github.com/pik-piam/piamPlotComparison/actions) [![codecov](https://codecov.io/gh/pik-piam/piamPlotComparison/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/piamPlotComparison) [![r-universe](https://pik-piam.r-universe.dev/badges/piamPlotComparison)](https://pik-piam.r-universe.dev/builds)
 
@@ -46,7 +46,7 @@ In case of questions / problems please contact Falk Benke <[email protected]>
 
 To cite package **piamPlotComparison** in publications use:
 
-Benke F, Schoetz C (2024). _piamPlotComparison: Create comparison plots for your model results_. R package version 0.0.5, <https://github.com/pik-piam/piamPlotComparison>.
+Benke F, Schoetz C (2024). _piamPlotComparison: Create comparison plots for your model results_. R package version 0.0.6, <https://github.com/pik-piam/piamPlotComparison>.
 
 A BibTeX entry for LaTeX users is
 
@@ -55,7 +55,7 @@ A BibTeX entry for LaTeX users is
   title = {piamPlotComparison: Create comparison plots for your model results},
   author = {Falk Benke and Christof Schoetz},
   year = {2024},
-  note = {R package version 0.0.5},
+  note = {R package version 0.0.6},
   url = {https://github.com/pik-piam/piamPlotComparison},
 }
 ```

inst/compareScenarios/cs_main.Rmd

@@ -90,6 +90,7 @@ library(tidyverse)
 suppressMessages(library(kableExtra))
 library(quitte)
 library(mip)
+library(piamUtils)
 ```
 
 
@@ -210,11 +211,11 @@ data <-
   data %>%
   # In the variable names, replace `$dot$` by `.`.
   mutate(
-    variable = substitutePlaceholder(variable)) %>%
+    variable = piamUtils::substitutePlaceholder(variable)) %>%
   # In the variable names, replace `|+|`, `|++|`, `|+++|`, ... by `|`.
   mutate(
     varplus = as.character(variable),
-    variable = deletePlus(variable))
+    variable = piamUtils::removePlus(variable))
 
 # Filter regions.
 if (!is.null(params$reg)) {