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

Fixing some namespace bugs and using ByteCompilation...

Browse Source
This commit is contained in:
Roland Hollós 2019-01-15 17:20:06 +01:00
parent 55d79854b6
commit 5ba2f13127
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RBBGCMuso/DESCRIPTION
View File

@ -21,7 +21,9 @@ Imports:
ggplot2, ggplot2,
rmarkdown, rmarkdown,
tibble, tibble,
tidyr tidyr,
tcltk,
digest
LinkingTo: Rcpp LinkingTo: Rcpp
SystemRequirements: C++11 SystemRequirements: C++11
Maintainer: Roland Hollo's <hollorol@gmail.com> Maintainer: Roland Hollo's <hollorol@gmail.com>
@ -29,3 +31,4 @@ RoxygenNote: 6.1.0
Suggests: knitr, Suggests: knitr,
rmarkdown, rmarkdown,
VignetteBuilder: knitr VignetteBuilder: knitr
ByteCompile: true

12
RBBGCMuso/NAMESPACE
View File

@ -33,7 +33,9 @@ importFrom(dplyr,'%>%')
importFrom(dplyr,filter) importFrom(dplyr,filter)
importFrom(dplyr,group_by) importFrom(dplyr,group_by)
importFrom(dplyr,mutate) importFrom(dplyr,mutate)
importFrom(dplyr,select)
importFrom(dplyr,summarize) importFrom(dplyr,summarize)
importFrom(dplyr,tbl_df)
importFrom(ggplot2,aes) importFrom(ggplot2,aes)
importFrom(ggplot2,aes_string) importFrom(ggplot2,aes_string)
importFrom(ggplot2,element_blank) importFrom(ggplot2,element_blank)
@ -51,8 +53,18 @@ importFrom(ggplot2,theme)
importFrom(ggplot2,xlab) importFrom(ggplot2,xlab)
importFrom(ggplot2,ylab) importFrom(ggplot2,ylab)
importFrom(limSolve,xsample) importFrom(limSolve,xsample)
importFrom(magrittr,'%<>%')
importFrom(rmarkdown,render) importFrom(rmarkdown,render)
importFrom(scales,percent) importFrom(scales,percent)
importFrom(tcltk,tcl)
importFrom(tcltk,tclRequire)
importFrom(tcltk,tclVar)
importFrom(tcltk,tclvalue)
importFrom(tcltk,tk_choose.dir)
importFrom(tcltk,tk_choose.files)
importFrom(tcltk,tktitle)
importFrom(tcltk,tktoplevel)
importFrom(tcltk,tkwidget)
importFrom(tibble,rownames_to_column) importFrom(tibble,rownames_to_column)
importFrom(tidyr,separate) importFrom(tidyr,separate)
useDynLib(RBBGCMuso) useDynLib(RBBGCMuso)

2
RBBGCMuso/R/parametersweep.R
View File

@ -39,7 +39,7 @@ paramSweep <- function(inputDir="./",
if(is.null(parameters)){ if(is.null(parameters)){
parameters <- tk_choose.files(caption = "Please select a file with the parameters and the ranges") parameters <- tcltk::tk_choose.files(caption = "Please select a file with the parameters and the ranges")
} }
rmdFile <- "---\ntitle: \"ParameterSweep basic\"\n---\n```{r setup, include=FALSE}\nknitr::opts_chunk$set(echo = TRUE)\n```\n```{r, echo=FALSE}\nsuppressWarnings(library(RBBGCMuso))\n```\n```{r, echo=FALSE}\nparameters <- read.csv(\"parameters.csv\")\n```\n```{r,fig.width=10, fig.height=3, echo=FALSE}\nnumPar\nfor(i in 1:numPar){\n suppressWarnings(musoQuickEffect(calibrationPar=parameters[i,2],startVal = parameters[i,3], endVal = parameters[i,4],\nnSteps = 9,\noutVar = \"daily_gpp\",\nparName = parameters[i,1]))\n}\n```" rmdFile <- "---\ntitle: \"ParameterSweep basic\"\n---\n```{r setup, include=FALSE}\nknitr::opts_chunk$set(echo = TRUE)\n```\n```{r, echo=FALSE}\nsuppressWarnings(library(RBBGCMuso))\n```\n```{r, echo=FALSE}\nparameters <- read.csv(\"parameters.csv\")\n```\n```{r,fig.width=10, fig.height=3, echo=FALSE}\nnumPar\nfor(i in 1:numPar){\n suppressWarnings(musoQuickEffect(calibrationPar=parameters[i,2],startVal = parameters[i,3], endVal = parameters[i,4],\nnSteps = 9,\noutVar = \"daily_gpp\",\nparName = parameters[i,1]))\n}\n```"

5
RBBGCMuso/R/quickeffect.R
View File

@ -8,6 +8,11 @@
#' @param nSteps How many steps 'till you reach the endVal #' @param nSteps How many steps 'till you reach the endVal
#' @param fileTochange Please choose "epc" "ini" or "both". This is the place of the orininal variable. #' @param fileTochange Please choose "epc" "ini" or "both". This is the place of the orininal variable.
#' @return An effect plot #' @return An effect plot
#' @importFrom ggplot2 ggplot aes_string geom_line geom_point aes labs theme ggsave element_blank facet_wrap
#' @importFrom dplyr filter group_by summarize mutate '%>%' tbl_df select
#' @importFrom tibble rownames_to_column
#' @importFrom magrittr '%<>%'
#' @importFrom tidyr separate
#' @export #' @export
musoQuickEffect <- function(settings = NULL,calibrationPar = NULL, startVal, endVal, nSteps = 1, fileToChange="epc", outVar, parName = "parVal"){ musoQuickEffect <- function(settings = NULL,calibrationPar = NULL, startVal, endVal, nSteps = 1, fileToChange="epc", outVar, parName = "parVal"){