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

minor bugfix and major version upgrade

Browse Source
This commit is contained in:
Roland Hollós 2019-02-13 08:10:35 +01:00
parent 587faa7804
commit d00d513949
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RBBGCMuso/DESCRIPTION
View File

@ -1,6 +1,6 @@
Package: RBBGCMuso Package: RBBGCMuso
Title: An R package for BiomeBGC-MuSo ecosystem modelling 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")) Authors@R: person("Roland", "Hollo's", , "hollorol@gmail.com", role = c("aut", "cre"))
Description: What the package does (one paragraph). Description: What the package does (one paragraph).
Depends: R (>= 3.3.2) Depends: R (>= 3.3.2)
@ -25,7 +25,8 @@ Imports:
tidyr, tidyr,
tcltk, tcltk,
digest, digest,
data.table data.table,
gridExtra
LinkingTo: Rcpp LinkingTo: Rcpp
SystemRequirements: C++11 SystemRequirements: C++11
Maintainer: Roland Hollo's <hollorol@gmail.com> Maintainer: Roland Hollo's <hollorol@gmail.com>

4
RBBGCMuso/NAMESPACE
View File

@ -43,10 +43,6 @@ importFrom(dplyr,mutate)
importFrom(dplyr,select) importFrom(dplyr,select)
importFrom(dplyr,summarize) importFrom(dplyr,summarize)
importFrom(dplyr,tbl_df) importFrom(dplyr,tbl_df)
importFrom(ggplot,aes_string)
importFrom(ggplot,geom_point)
importFrom(ggplot,ggplot)
importFrom(ggplot,ggsave)
importFrom(ggplot2,aes) importFrom(ggplot2,aes)
importFrom(ggplot2,aes_string) importFrom(ggplot2,aes_string)
importFrom(ggplot2,element_blank) importFrom(ggplot2,element_blank)

2
RBBGCMuso/R/calibration.R
View File

@ -22,7 +22,7 @@
#' @param settings e #' @param settings e
#' @param leapYear b #' @param leapYear b
#' @param plotName u #' @param plotName u
#' @importFrom ggplot ggplot aes_string geom_point ggsave #' @importFrom ggplot2 ggplot aes_string geom_point ggsave
#' @importFrom magrittr '%>%' #' @importFrom magrittr '%>%'
#' @importFrom gridExtra grid.arrange #' @importFrom gridExtra grid.arrange
#' @export #' @export

12
RBBGCMuso/man/optiMuso.Rd
View File

@ -5,12 +5,12 @@
\title{optiMuso} \title{optiMuso}
\usage{ \usage{
optiMuso(measuredDataFile, parameters = NULL, sep = ",", startDate, optiMuso(measuredDataFile, parameters = NULL, sep = ",", startDate,
endDate, formatString, naString = NULL, leapYear = TRUE, endDate, formatString = "\%Y-\%m-\%d", naString = NULL,
filterCol = NULL, filterVal = 1, selVar, outLoc = "./calib", leapYear = TRUE, filterCol = NULL, filterVal = 1, selVar,
preTag = "cal-", settings = NULL, outVars = NULL, outLoc = "./calib", preTag = "cal-", settings = NULL,
iterations = 30, skipSpinup = TRUE, constrains = NULL, outVars = NULL, iterations = 30, skipSpinup = TRUE,
plotName = "calib.jpg", likelihood = function(x, y) { constrains = NULL, plotName = "calib.jpg", likelihood = function(x,
exp(-sqrt(mean((x - y)^2))) }, calPar = 3009) y) { exp(-sqrt(mean((x - y)^2))) }, calPar = 3009)
} }
\arguments{ \arguments{
\item{measuredDataFile}{a} \item{measuredDataFile}{a}