From 03a28c372f84c7124eddb3dc3bb6032f0b2c8326 Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Wed, 17 Apr 2024 18:49:01 +0200 Subject: [PATCH 1/3] move deletePlus to piamUtils package --- .buildlibrary | 2 +- CITATION.cff | 4 +- DESCRIPTION | 5 +- NAMESPACE | 3 +- R/convGDX2MIF.R | 1 + R/convGDX2MIF_LCOE.R | 26 +++--- R/modifyVariableNames.R | 154 ------------------------------------ R/reportDIETER.R | 1 + R/reportEmi.R | 2 +- README.md | 6 +- man/convGDX2MIF_LCOE.Rd | 5 +- man/deletePlus.Rd | 36 --------- man/modifyVariableNames.Rd | 28 ------- man/substituePlaceholder.Rd | 32 -------- 14 files changed, 29 insertions(+), 276 deletions(-) delete mode 100644 R/modifyVariableNames.R delete mode 100644 man/deletePlus.Rd delete mode 100644 man/modifyVariableNames.Rd delete mode 100644 man/substituePlaceholder.Rd diff --git a/.buildlibrary b/.buildlibrary index ede32b06..210cc797 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '225642640' +ValidationKey: '225685230' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' diff --git a/CITATION.cff b/CITATION.cff index 483b6009..f2eabdb7 100644 --- a/CITATION.cff +++ b/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-17' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index ab2f31a4..8889fadb 100644 --- a/DESCRIPTION +++ b/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-17 Authors@R: c( person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", 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, diff --git a/NAMESPACE b/NAMESPACE index f818cab2..6a3866a1 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -16,7 +16,6 @@ export(convGDX2MIF) export(convGDX2MIF_LCOE) export(convGDX2MIF_REMIND2MAgPIE) export(createVarListHtml) -export(deletePlus) export(gdx.copy) export(getCfgDefaultPath) export(getCfgScenPath) @@ -76,7 +75,6 @@ export(reportTechnology) export(reportTrade) export(runEmployment) export(showStatsTable) -export(substituePlaceholder) export(switchValuesScenConf) export(toolRegionSubsets) export(variablesAsList) @@ -210,6 +208,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) diff --git a/R/convGDX2MIF.R b/R/convGDX2MIF.R index 1a4c565d..9bcb0795 100644 --- a/R/convGDX2MIF.R +++ b/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", diff --git a/R/convGDX2MIF_LCOE.R b/R/convGDX2MIF_LCOE.R index ead00d64..e0c31e53 100644 --- a/R/convGDX2MIF_LCOE.R +++ b/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) } - } diff --git a/R/modifyVariableNames.R b/R/modifyVariableNames.R deleted file mode 100644 index df5ae9b6..00000000 --- a/R/modifyVariableNames.R +++ /dev/null @@ -1,154 +0,0 @@ -#' Delete "+" in Variable Names. Optionally Save in File with Suffix -#' "_withoutPlus" -#' -#' The function can take a multiple of input formats. It replaces "|+|", "|++|", -#' "|+++|", ... by "|" in variable names and in this "deletes" the -#' "plus-notation". -#' -#' @param mif A path to a mif-file (might be created by confGDX2MIF), a magpie -#' object containing reporting, a quitte object, or a character vector or -#' factor of variable names. -#' @param writemif A single truth value. Only used when mif is a file path. -#' Should the new mif with the adjusted names be saved? If yes the new name -#' will have the suffix "_withoutPlus.mif". -#' @return If mif is a file path and \code{writemif} is \code{FALSE}, a MAgPIE -#' object. If mif is not a file path the result is the object \code{mif} with -#' replaced variable names. -#' -#' @examples -#' deletePlus(c( -#' "ab|cd", # "ab|cd" -#' "de|+|fgh", # "de|fgh" -#' "i|j|++|k|l|++++|mno|p", # "i|j|k|l|mno|p" -#' "++|q+|+r|+p+|u+v|+", # "++|q+|+r|+p+|u+v|+" -#' "w|+|+|x")) # "w|x" -#' @export -deletePlus <- function(mif, writemif = FALSE) { - modifyVariableNames( - mif, - modify = .deletePlusString, - writeMifSuffix = if (writemif) "_withoutPlus" else NULL - ) -} - -.deletePlusString <- function(s) { - pattern <- "\\|\\++\\|" - replacement <- "|" - while (any(grepl(pattern, s))) { - s <- gsub(pattern, replacement, s) - } - return(s) -} - -#' Substitute Placeholders in Variable Names. -#' -#' @param x A path to a mif-file (might be created by confGDX2MIF), a quitte -#' object, or a character vector or factor of variable names. -#' @param writeMifSuffix \code{NULL} or a suffix for the filename if the result -#' should be written as a mif-file. -#' @param substitutions A named character vector of placeholders with -#' replacements as names. -#' @return If \code{x} is not a file path the result is the object \code{x} with -#' replaced variable names. -#' @examples -#' substituePlaceholder(c( -#' "3$dot$5", # "3.5" -#' "3$dot5", # "3$dot5" -#' "3.5", # "3.5" -#' "$dot$dot$dot$dot$dot$")) # ".dot.dot." -#' @export -substituePlaceholder <- function( - x, writeMifSuffix = NULL, - substitutions = c( - "." = "$dot$" - )) { - modifyVariableNames( - x, - modify = .substituePlaceholderString, - writeMifSuffix = writeMifSuffix, - substitutions = substitutions - ) -} - -.substituePlaceholderString <- function(s, substitutions) { - for (i in seq_along(substitutions)) { - placeholder <- substitutions[i] - replacement <- names(substitutions)[i] - while (any(grepl(placeholder, s, fixed = TRUE))) { - s <- gsub(placeholder, replacement, s, fixed = TRUE) - } - } - - return(s) -} - -#'Modify Variable Names -#' -#' @param x A path to a mif-file (might be created by confGDX2MIF), a magpie -#' object containing reporting, a quitte object, or a character vector or -#' factor of variable names. -#' @param writeMifSuffix \code{NULL} or a suffix for the file name if the result -#' should be written as a mif-file. -#' @param modify A function that modifies a character vector. -#' @param ... Further arguments for the modify function. -#' @return If \code{x} is a file path and \code{writeMifSuffix} is \code{NULL}, -#' a MAgPIE object. If \code{x} is not a file path the result is the object -#' \code{x} with replaced variable names. -#' @importFrom utils write.table -modifyVariableNames <- function(x, modify, writeMifSuffix = NULL, ...) { - - # Does x refer to a file? - if (is.character(x) && length(x) == 1 && file.exists(x)) { - - # Should the output be written to a file? - if (is.character(writeMifSuffix) == TRUE) { - - # read in mif-reporting - mifData <- read.csv(x, sep = ";", check.names = FALSE) - - # drop the empty last column of .mif format - if (all(is.na(mifData[, ncol(mifData)]))) { - mifData[, ncol(mifData)] <- "" - } - - mifData$Variable <- modify(mifData$Variable, ...) - - # save reporting with new names under a new name - oldName <- gsub("\\.mif$", "", x) - newName <- paste0(oldName, writeMifSuffix, ".mif") - write.table(mifData, file = newName, quote = FALSE, sep = ";", row.names = FALSE) - - } else { - - # read in mif-reporting - mifData <- read.report(x, as.list = FALSE) - getNames(mifData) <- modify(getNames(mifData), ...) - return(mifData) - } - - } else { # x does not refer to a file. - - if (is.magpie(x)) { - getNames(x) <- modify(getNames(x), ...) - return(x) - } - - if (quitte::is.quitte(x)) { - levels(x$variable) <- modify(levels(x$variable), ...) - return(x) - } - - if (is.factor(x)) { - levels(x) <- modify(levels(x), ...) - return(x) - } - - if (is.character(x)) { - x <- modify(x, ...) - return(x) - } - - stop("Cannot handle input format.") - } -} - diff --git a/R/reportDIETER.R b/R/reportDIETER.R index 3c2f56c2..9ba40571 100644 --- a/R/reportDIETER.R +++ b/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) { diff --git a/R/reportEmi.R b/R/reportEmi.R index 27b78c1b..09949990 100644 --- a/R/reportEmi.R +++ b/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)) { diff --git a/README.md b/README.md index d06b5c86..15254b33 100644 --- a/README.md +++ b/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 . +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, . 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}, } ``` diff --git a/man/convGDX2MIF_LCOE.Rd b/man/convGDX2MIF_LCOE.Rd index 27c3621e..83c3216c 100644 --- a/man/convGDX2MIF_LCOE.Rd +++ b/man/convGDX2MIF_LCOE.Rd @@ -31,8 +31,9 @@ Read in all information from GDX file, calculate the LCOE for pe2se technologies the LCOE .mif reporting } \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") +} } \author{ diff --git a/man/deletePlus.Rd b/man/deletePlus.Rd deleted file mode 100644 index a0466748..00000000 --- a/man/deletePlus.Rd +++ /dev/null @@ -1,36 +0,0 @@ -% Generated by roxygen2: do not edit by hand -% Please edit documentation in R/modifyVariableNames.R -\name{deletePlus} -\alias{deletePlus} -\title{Delete "+" in Variable Names. Optionally Save in File with Suffix -"_withoutPlus"} -\usage{ -deletePlus(mif, writemif = FALSE) -} -\arguments{ -\item{mif}{A path to a mif-file (might be created by confGDX2MIF), a magpie -object containing reporting, a quitte object, or a character vector or -factor of variable names.} - -\item{writemif}{A single truth value. Only used when mif is a file path. -Should the new mif with the adjusted names be saved? If yes the new name -will have the suffix "_withoutPlus.mif".} -} -\value{ -If mif is a file path and \code{writemif} is \code{FALSE}, a MAgPIE - object. If mif is not a file path the result is the object \code{mif} with - replaced variable names. -} -\description{ -The function can take a multiple of input formats. It replaces "|+|", "|++|", -"|+++|", ... by "|" in variable names and in this "deletes" the -"plus-notation". -} -\examples{ -deletePlus(c( - "ab|cd", # "ab|cd" - "de|+|fgh", # "de|fgh" - "i|j|++|k|l|++++|mno|p", # "i|j|k|l|mno|p" - "++|q+|+r|+p+|u+v|+", # "++|q+|+r|+p+|u+v|+" - "w|+|+|x")) # "w|x" -} diff --git a/man/modifyVariableNames.Rd b/man/modifyVariableNames.Rd deleted file mode 100644 index 322f83f0..00000000 --- a/man/modifyVariableNames.Rd +++ /dev/null @@ -1,28 +0,0 @@ -% Generated by roxygen2: do not edit by hand -% Please edit documentation in R/modifyVariableNames.R -\name{modifyVariableNames} -\alias{modifyVariableNames} -\title{Modify Variable Names} -\usage{ -modifyVariableNames(x, modify, writeMifSuffix = NULL, ...) -} -\arguments{ -\item{x}{A path to a mif-file (might be created by confGDX2MIF), a magpie -object containing reporting, a quitte object, or a character vector or -factor of variable names.} - -\item{modify}{A function that modifies a character vector.} - -\item{writeMifSuffix}{\code{NULL} or a suffix for the file name if the result -should be written as a mif-file.} - -\item{...}{Further arguments for the modify function.} -} -\value{ -If \code{x} is a file path and \code{writeMifSuffix} is \code{NULL}, - a MAgPIE object. If \code{x} is not a file path the result is the object - \code{x} with replaced variable names. -} -\description{ -Modify Variable Names -} diff --git a/man/substituePlaceholder.Rd b/man/substituePlaceholder.Rd deleted file mode 100644 index 41f164dd..00000000 --- a/man/substituePlaceholder.Rd +++ /dev/null @@ -1,32 +0,0 @@ -% Generated by roxygen2: do not edit by hand -% Please edit documentation in R/modifyVariableNames.R -\name{substituePlaceholder} -\alias{substituePlaceholder} -\title{Substitute Placeholders in Variable Names.} -\usage{ -substituePlaceholder(x, writeMifSuffix = NULL, substitutions = c(. = "$dot$")) -} -\arguments{ -\item{x}{A path to a mif-file (might be created by confGDX2MIF), a quitte -object, or a character vector or factor of variable names.} - -\item{writeMifSuffix}{\code{NULL} or a suffix for the filename if the result -should be written as a mif-file.} - -\item{substitutions}{A named character vector of placeholders with -replacements as names.} -} -\value{ -If \code{x} is not a file path the result is the object \code{x} with - replaced variable names. -} -\description{ -Substitute Placeholders in Variable Names. -} -\examples{ -substituePlaceholder(c( - "3$dot$5", # "3.5" - "3$dot5", # "3$dot5" - "3.5", # "3.5" - "$dot$dot$dot$dot$dot$")) # ".dot.dot." -} From 5ccfffb1dda80d164590747c3eb8a38cefbb2ada Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Thu, 18 Apr 2024 11:31:58 +0200 Subject: [PATCH 2/3] reexport deletePlus for backwards compatibility --- .buildlibrary | 2 +- CITATION.cff | 2 +- DESCRIPTION | 2 +- NAMESPACE | 3 +++ R/reexport.R | 8 ++++++++ man/reexports.Rd | 17 +++++++++++++++++ 6 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 R/reexport.R create mode 100644 man/reexports.Rd diff --git a/.buildlibrary b/.buildlibrary index 210cc797..ca11fa56 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '225685230' +ValidationKey: '225696611' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' diff --git a/CITATION.cff b/CITATION.cff index f2eabdb7..a757d792 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -3,7 +3,7 @@ message: If you use this software, please cite it using the metadata from this f type: software title: 'remind2: The REMIND R package (2nd generation)' version: 1.138.1 -date-released: '2024-04-17' +date-released: '2024-04-18' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index 8889fadb..a98626b2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,7 +2,7 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) Version: 1.138.1 -Date: 2024-04-17 +Date: 2024-04-18 Authors@R: c( person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", role = c("aut", "cre")), person("Lavinia", "Baumstark", role = "aut"), diff --git a/NAMESPACE b/NAMESPACE index 6a3866a1..2f8de18e 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -16,6 +16,7 @@ export(convGDX2MIF) export(convGDX2MIF_LCOE) export(convGDX2MIF_REMIND2MAgPIE) export(createVarListHtml) +export(deletePlus) export(gdx.copy) export(getCfgDefaultPath) export(getCfgScenPath) @@ -75,6 +76,7 @@ export(reportTechnology) export(reportTrade) export(runEmployment) export(showStatsTable) +export(substitutePlaceholder) export(switchValuesScenConf) export(toolRegionSubsets) export(variablesAsList) @@ -209,6 +211,7 @@ importFrom(openxlsx,writeData) importFrom(piamInterfaces,checkSummations) importFrom(piamInterfaces,checkVarNames) importFrom(piamutils,deletePlus) +importFrom(piamutils,substitutePlaceholder) importFrom(plotly,config) importFrom(plotly,ggplotly) importFrom(plotly,hide_legend) diff --git a/R/reexport.R b/R/reexport.R new file mode 100644 index 00000000..e83e8b75 --- /dev/null +++ b/R/reexport.R @@ -0,0 +1,8 @@ +#' @importFrom piamutils substitutePlaceholder +#' @export +piamutils::substitutePlaceholder + + +#' @importFrom piamutils deletePlus +#' @export +piamutils::deletePlus diff --git a/man/reexports.Rd b/man/reexports.Rd new file mode 100644 index 00000000..c7d55a3c --- /dev/null +++ b/man/reexports.Rd @@ -0,0 +1,17 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/reexport.R +\docType{import} +\name{reexports} +\alias{reexports} +\alias{substitutePlaceholder} +\alias{deletePlus} +\title{Objects exported from other packages} +\keyword{internal} +\description{ +These objects are imported from other packages. Follow the links +below to see their documentation. + +\describe{ + \item{piamutils}{\code{\link[piamutils]{deletePlus}}, \code{\link[piamutils]{substitutePlaceholder}}} +}} + From 3b1c83ec9af3fcd554bf1f65bd67db80d439dd6d Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Thu, 18 Apr 2024 12:11:07 +0200 Subject: [PATCH 3/3] remove substitutePlacefolder from reexports --- NAMESPACE | 2 -- R/reexport.R | 5 ----- man/reexports.Rd | 3 +-- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/NAMESPACE b/NAMESPACE index 2f8de18e..96613f20 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -76,7 +76,6 @@ export(reportTechnology) export(reportTrade) export(runEmployment) export(showStatsTable) -export(substitutePlaceholder) export(switchValuesScenConf) export(toolRegionSubsets) export(variablesAsList) @@ -211,7 +210,6 @@ importFrom(openxlsx,writeData) importFrom(piamInterfaces,checkSummations) importFrom(piamInterfaces,checkVarNames) importFrom(piamutils,deletePlus) -importFrom(piamutils,substitutePlaceholder) importFrom(plotly,config) importFrom(plotly,ggplotly) importFrom(plotly,hide_legend) diff --git a/R/reexport.R b/R/reexport.R index e83e8b75..7c8ead7d 100644 --- a/R/reexport.R +++ b/R/reexport.R @@ -1,8 +1,3 @@ -#' @importFrom piamutils substitutePlaceholder -#' @export -piamutils::substitutePlaceholder - - #' @importFrom piamutils deletePlus #' @export piamutils::deletePlus diff --git a/man/reexports.Rd b/man/reexports.Rd index c7d55a3c..643d2071 100644 --- a/man/reexports.Rd +++ b/man/reexports.Rd @@ -3,7 +3,6 @@ \docType{import} \name{reexports} \alias{reexports} -\alias{substitutePlaceholder} \alias{deletePlus} \title{Objects exported from other packages} \keyword{internal} @@ -12,6 +11,6 @@ These objects are imported from other packages. Follow the links below to see their documentation. \describe{ - \item{piamutils}{\code{\link[piamutils]{deletePlus}}, \code{\link[piamutils]{substitutePlaceholder}}} + \item{piamutils}{\code{\link[piamutils]{deletePlus}}} }}