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

fix the cumyield hardcode bug

Browse Source
This commit is contained in:
Roland Hollós 2018-10-10 11:25:35 +02:00
parent 6a6fad0943
commit 4e338ac75b
1 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
RBBGCMuso/R/plotMuso.R
View File

@ -89,6 +89,16 @@ plotMuso <- function(settings=NULL,
musoData <-musoData %>% musoData <-musoData %>%
mutate(date=as.Date(as.character(date),"%d.%m.%Y")) mutate(date=as.Date(as.character(date),"%d.%m.%Y"))
} else { } else {
if(!is.element("cum_yieldC_HRV",unlist(settings$outputVars[[1]]))){
musoData <- calibMuso(settings,silent = TRUE,skipSpinup=skipSpinup) %>%
as.data.frame() %>%
tibble::rownames_to_column("date") %>%
mutate(date2=date,date=as.Date(date,"%d.%m.%Y")) %>%
tidyr::separate(date2,c("day","month","year"),sep="\\.")
if(timeFrame!="day"){
musoData <- tryCatch(groupByTimeFrame(data=musoData, timeFrame = timeFrame, groupFun = groupFun),
error=function(e){stop("The timeframe or the gropFun is not found")})
}} else {
musoData <- calibMuso(settings,silent = TRUE,skipSpinup=skipSpinup) %>% musoData <- calibMuso(settings,silent = TRUE,skipSpinup=skipSpinup) %>%
as.data.frame() %>% as.data.frame() %>%
tibble::rownames_to_column("date") %>% tibble::rownames_to_column("date") %>%
@ -99,6 +109,8 @@ plotMuso <- function(settings=NULL,
musoData <- tryCatch(groupByTimeFrame(data=musoData, timeFrame = timeFrame, groupFun = groupFun), musoData <- tryCatch(groupByTimeFrame(data=musoData, timeFrame = timeFrame, groupFun = groupFun),
error=function(e){stop("The timeframe or the gropFun is not found")}) error=function(e){stop("The timeframe or the gropFun is not found")})
} }
}
} }
## numVari <- ncol(musoData) ## numVari <- ncol(musoData)