From d00d513949c0eb61b41807f483a32e709e8c2c90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Holl=C3=B3s?= Date: Wed, 13 Feb 2019 08:10:35 +0100 Subject: [PATCH] minor bugfix and major version upgrade --- RBBGCMuso/DESCRIPTION | 5 +++-- RBBGCMuso/NAMESPACE | 4 ---- RBBGCMuso/R/calibration.R | 2 +- RBBGCMuso/man/optiMuso.Rd | 12 ++++++------ 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/RBBGCMuso/DESCRIPTION b/RBBGCMuso/DESCRIPTION index 42e5060..cc75f13 100644 --- a/RBBGCMuso/DESCRIPTION +++ b/RBBGCMuso/DESCRIPTION @@ -1,6 +1,6 @@ Package: RBBGCMuso Title: An R package for BiomeBGC-MuSo ecosystem modelling -Version: 0.6.3.0 +Version: 0.7.0.0 Authors@R: person("Roland", "Hollo's", , "hollorol@gmail.com", role = c("aut", "cre")) Description: What the package does (one paragraph). Depends: R (>= 3.3.2) @@ -25,7 +25,8 @@ Imports: tidyr, tcltk, digest, - data.table + data.table, + gridExtra LinkingTo: Rcpp SystemRequirements: C++11 Maintainer: Roland Hollo's diff --git a/RBBGCMuso/NAMESPACE b/RBBGCMuso/NAMESPACE index c50660c..080f02f 100644 --- a/RBBGCMuso/NAMESPACE +++ b/RBBGCMuso/NAMESPACE @@ -43,10 +43,6 @@ importFrom(dplyr,mutate) importFrom(dplyr,select) importFrom(dplyr,summarize) importFrom(dplyr,tbl_df) -importFrom(ggplot,aes_string) -importFrom(ggplot,geom_point) -importFrom(ggplot,ggplot) -importFrom(ggplot,ggsave) importFrom(ggplot2,aes) importFrom(ggplot2,aes_string) importFrom(ggplot2,element_blank) diff --git a/RBBGCMuso/R/calibration.R b/RBBGCMuso/R/calibration.R index 69f1c17..0456bb2 100644 --- a/RBBGCMuso/R/calibration.R +++ b/RBBGCMuso/R/calibration.R @@ -22,7 +22,7 @@ #' @param settings e #' @param leapYear b #' @param plotName u -#' @importFrom ggplot ggplot aes_string geom_point ggsave +#' @importFrom ggplot2 ggplot aes_string geom_point ggsave #' @importFrom magrittr '%>%' #' @importFrom gridExtra grid.arrange #' @export diff --git a/RBBGCMuso/man/optiMuso.Rd b/RBBGCMuso/man/optiMuso.Rd index 1db9db9..1decc2c 100644 --- a/RBBGCMuso/man/optiMuso.Rd +++ b/RBBGCMuso/man/optiMuso.Rd @@ -5,12 +5,12 @@ \title{optiMuso} \usage{ optiMuso(measuredDataFile, parameters = NULL, sep = ",", startDate, - endDate, formatString, naString = NULL, leapYear = TRUE, - filterCol = NULL, filterVal = 1, selVar, outLoc = "./calib", - preTag = "cal-", settings = NULL, outVars = NULL, - iterations = 30, skipSpinup = TRUE, constrains = NULL, - plotName = "calib.jpg", likelihood = function(x, y) { - exp(-sqrt(mean((x - y)^2))) }, calPar = 3009) + endDate, formatString = "\%Y-\%m-\%d", naString = NULL, + leapYear = TRUE, filterCol = NULL, filterVal = 1, selVar, + outLoc = "./calib", preTag = "cal-", settings = NULL, + outVars = NULL, iterations = 30, skipSpinup = TRUE, + constrains = NULL, plotName = "calib.jpg", likelihood = function(x, + y) { exp(-sqrt(mean((x - y)^2))) }, calPar = 3009) } \arguments{ \item{measuredDataFile}{a}