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

string handling

Browse Source
This commit is contained in:
hollorol 2019-02-17 13:40:21 +01:00
parent 5740544395
commit 2318804ea0
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
RBBGCMuso/R/assistantFunctions.R
View File

@ -147,7 +147,7 @@ readValuesFromFile <- function(epc, linums){
#' @export #' @export
readMeasuredMuso <- function(inFile, readMeasuredMuso <- function(inFile,
naString = getOption("datatable.na.strings","NA"), sep = ",", naString = NULL, sep = ",",
leapYearHandling = TRUE, leapYearHandling = TRUE,
convert.var = NULL, convert.var = NULL,
convert.scalar = 1, convert.scalar = 1,
@ -158,8 +158,23 @@ readMeasuredMuso <- function(inFile,
selVar = NULL selVar = NULL
){ ){
baseData <- fread(file = inFile, na.strings = as.character(naString), sep=sep) if(!is.null(naString)){
baseData <- as.data.frame(baseData) if(is.numeric(naString)){
baseData <- fread(file = inFile, sep=sep)
baseData <- as.data.frame(baseData)
baseData[baseData[,selVar] == naString,selVar] <- NA
} else {
baseData <- fread(file = inFile, sep=sep, naString = naString)
baseData <- as.data.frame(baseData)
}
} else {
baseData <- fread(file = inFile, sep=sep)
baseData <- as.data.frame(baseData)
}
if(!is.null(filterCol)){ if(!is.null(filterCol)){
filterVar<- colnames(baseData)[filterCol] filterVar<- colnames(baseData)[filterCol]
baseData[(baseData[,filterVar] == filterVal),selVar] <- NA baseData[(baseData[,filterVar] == filterVal),selVar] <- NA

5
RBBGCMuso/R/plotMuso.R
View File

@ -266,6 +266,11 @@ plotMusoWithData <- function(mdata, plotName=NULL,
baseData <- calibMuso(settings = settings, silent = silent, prettyOut = TRUE)[modIndex,] baseData <- calibMuso(settings = settings, silent = silent, prettyOut = TRUE)[modIndex,]
baseData[,1] <- as.Date(baseData[,1],format = "%d.%m.%Y") baseData[,1] <- as.Date(baseData[,1],format = "%d.%m.%Y")
selVarName <- colnames(baseData)[selVar] selVarName <- colnames(baseData)[selVar]
if(colnames(baseData) != unique(colnames(baseData))){
notUnique <- setdiff((unlist(settings$dailyVarCodes)),unique(unlist(settings$dailyVarCodes)))
stop(paste0("Error: daily output variable list in the ini file must contain unique numbers. Check your ini files! Not unique codes: ",notUnique))
}
p <- baseData %>% p <- baseData %>%
ggplot(aes_string("date",selVarName)) + ggplot(aes_string("date",selVarName)) +
geom_line(colour=colour[1]) + geom_line(colour=colour[1]) +