Merge branch 'master' into smallfix

pik-piam · Mar 14, 2024 · ea2ba23 · ea2ba23
2 parents a4ea0a7 + 1e50f6f
commit ea2ba23
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 137 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -81,7 +81,6 @@ export(showStatsTable)
 export(substituePlaceholder)
 export(switchValuesScenConf)
 export(toolRegionSubsets)
-export(validationREMIND)
 export(variablesAsList)
 import(magclass)
 importFrom(abind,abind)
@@ -163,18 +162,14 @@ importFrom(ggplot2,xlab)
 importFrom(gms,getLine)
 importFrom(gms,readDefaultConfig)
 importFrom(grDevices,colorRampPalette)
-importFrom(iamc,iamCheck)
 importFrom(knitr,knit)
 importFrom(lucode2,getScenNames)
 importFrom(luplot,magpie2ggplot2)
-importFrom(luplot,plotcountrymap)
 importFrom(luscale,speed_aggregate)
-importFrom(lusweave,swR)
 importFrom(lusweave,swclose)
 importFrom(lusweave,swfigure)
 importFrom(lusweave,swlatex)
 importFrom(lusweave,swopen)
-importFrom(lusweave,swtable)
 importFrom(madrat,calcOutput)
 importFrom(madrat,toolAggregate)
 importFrom(madrat,toolGetMapping)

diff --git a/R/convGDX2MIF.R b/R/convGDX2MIF.R
@@ -24,7 +24,7 @@
 #' @importFrom gdx readGDX
 #' @importFrom magclass mbind write.report
 #' @importFrom piamInterfaces checkSummations
-#' @importFrom utils write.csv
+#' @importFrom utils write.csv capture.output
 
 convGDX2MIF <- function(gdx, gdx_ref = NULL, file = NULL, scenario = "default",
                         t = c(seq(2005, 2060, 5), seq(2070, 2110, 10), 2130, 2150),

diff --git a/R/reportEDGETransport.R b/R/reportEDGETransport.R
@@ -20,6 +20,7 @@
 #' @importFrom data.table fread fwrite rbindlist copy CJ setnames := data.table as.data.table
 #' @importFrom dplyr %>%
 #' @importFrom quitte as.quitte
+#' @importFrom utils capture.output
 #' @export
 
 reportEDGETransport <- function(output_folder=".",

diff --git a/R/validationREMIND.R b/R/validationREMIND.R
diff --git a/man/validationREMIND.Rd b/man/validationREMIND.Rd