hollorol/RBBGCMuso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Error handling for pandoc usage and using shell ins stead of system

Browse Source
This commit is contained in:
hollorol 2019-01-15 22:07:52 +01:00
parent 9e6a565282
commit 019030e686
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
RBBGCMuso/R/parametersweep.R
View File

@ -8,7 +8,7 @@
#' @param iterations The number of changes in the parameter #' @param iterations The number of changes in the parameter
#' @param outVar The name of the output variable to plot, of the MuSo code of it. #' @param outVar The name of the output variable to plot, of the MuSo code of it.
#' @param htmlOutName The name of the rendered html file #' @param htmlOutName The name of the rendered html file
#' @importFrom rmarkdown render #' @importFrom rmarkdown render pandoc_version
#' @importFrom digest digest #' @importFrom digest digest
#' @importFrom tcltk tk_choose.files #' @importFrom tcltk tk_choose.files
#' @export #' @export
@ -19,6 +19,11 @@ paramSweep <- function(inputDir="./",
iterations=10, iterations=10,
outVar="daily_gpp", outVar="daily_gpp",
htmlOutName = "paramsweep.html"){ htmlOutName = "paramsweep.html"){
if(is.null(pandoc_version())){
stop("In order to use parameterSweep you have to have pandoc (1.12.3+) installed or run this function from Rstudio\n
You can download pandoc from here: 'https://pandoc.org/', or Rstudio from here: 'https://www.rstudio.com/'")
}
currDir <- getwd() currDir <- getwd()
opSystem <- Sys.info()[[1]] opSystem <- Sys.info()[[1]]
if(is.character(outVar)){ if(is.character(outVar)){
@ -62,7 +67,7 @@ paramSweep <- function(inputDir="./",
system(paste0("xdg-open ",htmlOutName)) system(paste0("xdg-open ",htmlOutName))
} else { } else {
if(opSystem == "Windows"){ if(opSystem == "Windows"){
system(paste0("start ",htmlOutName)) shell(paste0("start ",htmlOutName))
} else { } else {
system(paste0("open ",htmlOutName)) system(paste0("open ",htmlOutName))
} }