Merge pull request #589 from fbenke-pik/master

move deletePlus to piamUtils package

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '225642640'
+ValidationKey: '225696611'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'

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: 'remind2: The REMIND R package (2nd generation)'
-version: 1.138.0
-date-released: '2024-04-15'
+version: 1.138.1
+date-released: '2024-04-18'
 abstract: Contains the REMIND-specific routines for data and model output manipulation.
 authors:
 - family-names: Rodrigues

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: remind2
 Title: The REMIND R package (2nd generation)
-Version: 1.138.0
-Date: 2024-04-15
+Version: 1.138.1
+Date: 2024-04-18
 Authors@R: c(
     person("Renato", "Rodrigues", , "[email protected]", role = c("aut", "cre")),
     person("Lavinia", "Baumstark", role = "aut"),
@@ -61,6 +61,7 @@ Imports:
     mip (>= 0.148.9),
     openxlsx,
     piamInterfaces (>= 0.17.11),
+    piamutils,
     plotly (>= 4.10.4),
     quitte,
     readr,

NAMESPACE

@@ -76,7 +76,6 @@ export(reportTechnology)
 export(reportTrade)
 export(runEmployment)
 export(showStatsTable)
-export(substituePlaceholder)
 export(switchValuesScenConf)
 export(toolRegionSubsets)
 export(variablesAsList)
@@ -210,6 +209,7 @@ importFrom(openxlsx,saveWorkbook)
 importFrom(openxlsx,writeData)
 importFrom(piamInterfaces,checkSummations)
 importFrom(piamInterfaces,checkVarNames)
+importFrom(piamutils,deletePlus)
 importFrom(plotly,config)
 importFrom(plotly,ggplotly)
 importFrom(plotly,hide_legend)

R/convGDX2MIF.R

@@ -24,6 +24,7 @@
 #' @importFrom gdx readGDX
 #' @importFrom magclass mbind write.report
 #' @importFrom piamInterfaces checkSummations checkVarNames
+#' @importFrom piamutils deletePlus
 #' @importFrom utils write.csv capture.output
 
 convGDX2MIF <- function(gdx, gdx_ref = NULL, file = NULL, scenario = "default",

R/convGDX2MIF_LCOE.R

@@ -1,9 +1,9 @@
 #' Read in GDX and write LCOE .mif reporting
-#' 
+#'
 #' Read in all information from GDX file, calculate the LCOE for pe2se technologies and create
 #' the LCOE .mif reporting
-#' 
-#' 
+#'
+#'
 #' @param gdx a GDX as created by readGDX, or the file name of a gdx
 #' @param gdx_ref a GDX as created by readGDX of the reference run
 #' @param file name of the mif file which will be written, if no name is
@@ -14,25 +14,25 @@
 #' t=c(seq(2005,2060,5),seq(2070,2110,10),2030,2050)
 #' @author Lavinia Baumstark
 #' @examples
-#' 
-#' \dontrun{convGDX2MIF(gdx,gdx_ref,file="REMIND_generic_LCOE.csv",scenario="default")}
-#' 
+#' \dontrun{
+#' convGDX2MIF(gdx, gdx_ref, file = "REMIND_generic_LCOE.csv", scenario = "default")
+#' }
+#'
 #' @export
 #' @importFrom gdx readGDX
 #' @importFrom magclass mbind write.report
+#' @importFrom utils write.table
 
-convGDX2MIF_LCOE <- function(gdx,gdx_ref,file=NULL,scenario="default",t=c(seq(2005,2060,5),seq(2070,2110,10),2130,2150)) {
-
-
+convGDX2MIF_LCOE <- function(gdx, gdx_ref, file = NULL, scenario = "default",
+                             t = c(seq(2005, 2060, 5), seq(2070, 2110, 10), 2130, 2150)) {
   # make the reporting
   output <- NULL
-  output <- mbind(output,reportLCOE(gdx)[,t,])   
+  output <- mbind(output, reportLCOE(gdx)[, t, ])
 
   # write the LCOE.mif or give back the magpie opject output
-  if(!is.null(file)) {
-    write.report(output,model="REMIND",scenario=scenario,file=file,ndigit=7)
+  if (!is.null(file)) {
+    write.report(output, model = "REMIND", scenario = scenario, file = file, ndigit = 7)
   } else {
     return(output)
   }
-
 }

R/reexport.R

@@ -0,0 +1,3 @@
+#' @importFrom piamutils deletePlus
+#' @export
+piamutils::deletePlus

R/reportDIETER.R

@@ -15,6 +15,7 @@
 #' @importFrom rlang .data
 #' @importFrom dplyr %>% left_join filter select rename mutate arrange ungroup across mutate_all coalesce group_by if_else
 #' @importFrom tidyr complete
+#' @importFrom utils write.table
 #' @export
 reportDIETER <- function(dieterDatafile = "report_DIETER.gdx", outputDir = ".") {
   datapath <- function(fname) {

R/reportEmi.R

@@ -23,7 +23,7 @@
 #' @importFrom magclass mselect mselect<- collapseDim getItems getRegions getYears
 #' @importFrom madrat toolAggregate
 #' @importFrom tibble as_tibble
-
+#' @importFrom piamutils deletePlus
 
 reportEmi <- function(gdx, output = NULL, regionSubsetList = NULL,
                       t = c(seq(2005, 2060, 5), seq(2070, 2110, 10), 2130, 2150)) {

README.md

@@ -1,6 +1,6 @@
 # The REMIND R package (2nd generation)
 
-R package **remind2**, version **1.138.0**
+R package **remind2**, version **1.138.1**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/remind2)](https://cran.r-project.org/package=remind2)  [![R build status](https://github.com/pik-piam/remind2/workflows/check/badge.svg)](https://github.com/pik-piam/remind2/actions) [![codecov](https://codecov.io/gh/pik-piam/remind2/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/remind2) [![r-universe](https://pik-piam.r-universe.dev/badges/remind2)](https://pik-piam.r-universe.dev/builds)
 
@@ -49,7 +49,7 @@ In case of questions / problems please contact Renato Rodrigues <renato.rodrigue
 
 To cite package **remind2** in publications use:
 
-Rodrigues R, Baumstark L, Benke F, Dietrich J, Dirnaichner A, Duerrwaechter J, Führlich P, Giannousakis A, Hasse R, Hilaire J, Klein D, Koch J, Kowalczyk K, Levesque A, Malik A, Merfort A, Merfort L, Morena-Leiva S, Pehl M, Pietzcker R, Rauner S, Richters O, Rottoli M, Schötz C, Schreyer F, Siala K, Sörgel B, Spahr M, Strefler J, Verpoort P, Weigmann P (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.138.0, <URL: https://github.com/pik-piam/remind2>.
+Rodrigues R, Baumstark L, Benke F, Dietrich J, Dirnaichner A, Duerrwaechter J, Führlich P, Giannousakis A, Hasse R, Hilaire J, Klein D, Koch J, Kowalczyk K, Levesque A, Malik A, Merfort A, Merfort L, Morena-Leiva S, Pehl M, Pietzcker R, Rauner S, Richters O, Rottoli M, Schötz C, Schreyer F, Siala K, Sörgel B, Spahr M, Strefler J, Verpoort P, Weigmann P (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.138.1, <https://github.com/pik-piam/remind2>.
 
 A BibTeX entry for LaTeX users is
 
@@ -58,7 +58,7 @@ A BibTeX entry for LaTeX users is
   title = {remind2: The REMIND R package (2nd generation)},
   author = {Renato Rodrigues and Lavinia Baumstark and Falk Benke and Jan Philipp Dietrich and Alois Dirnaichner and Jakob Duerrwaechter and Pascal Führlich and Anastasis Giannousakis and Robin Hasse and Jérome Hilaire and David Klein and Johannes Koch and Katarzyna Kowalczyk and Antoine Levesque and Aman Malik and Anne Merfort and Leon Merfort and Simón Morena-Leiva and Michaja Pehl and Robert Pietzcker and Sebastian Rauner and Oliver Richters and Marianna Rottoli and Christof Schötz and Felix Schreyer and Kais Siala and Björn Sörgel and Mike Spahr and Jessica Strefler and Philipp Verpoort and Pascal Weigmann},
   year = {2024},
-  note = {R package version 1.138.0},
+  note = {R package version 1.138.1},
   url = {https://github.com/pik-piam/remind2},
 }
 ```