fix typo in calibration.R
This commit is contained in:
parent
2bfe5d6dba
commit
59cd97679c
@ -93,14 +93,14 @@ optiMuso <- function(measuredData, parameters = NULL, startDate,
|
|||||||
|
|
||||||
pretag <- file.path(outLoc,preTag)
|
pretag <- file.path(outLoc,preTag)
|
||||||
|
|
||||||
## Creating function for generating separate
|
## Creating function for generating separate
|
||||||
## csv files for each run
|
## csv files for each run
|
||||||
|
|
||||||
progBar <- txtProgressBar(1,iterations,style=3)
|
progBar <- txtProgressBar(1,iterations,style=3)
|
||||||
colNumb <- which(settings$dailyVarCodes == modelVar)
|
colNumb <- which(settings$dailyVarCodes == modelVar)
|
||||||
settings$iniInput[2] %>%
|
settings$iniInput[2] %>%
|
||||||
(function(x) paste0(dirname(x),"/",tools::file_path_sans_ext(basename(x)),"-tmp.",tools::file_ext(x))) %>%
|
(function(x) paste0(dirname(x),"/",tools::file_path_sans_ext(basename(x)),"-tmp.",tools::file_ext(x))) %>%
|
||||||
unlink
|
unlink
|
||||||
randValues <- randVals[[2]]
|
randValues <- randVals[[2]]
|
||||||
settings$calibrationPar <- randVals[[1]]
|
settings$calibrationPar <- randVals[[1]]
|
||||||
list2env(alignData(measuredData,dataCol = dataCol,modellSettings = settings,startDate = startDate,endDate = endDate,leapYear = leapYearHandling, continious = continious),envir=environment())
|
list2env(alignData(measuredData,dataCol = dataCol,modellSettings = settings,startDate = startDate,endDate = endDate,leapYear = leapYearHandling, continious = continious),envir=environment())
|
||||||
@ -129,29 +129,32 @@ optiMuso <- function(measuredData, parameters = NULL, startDate,
|
|||||||
write.csv(x=tmp, file=paste0(pretag,(i+1),".csv"))
|
write.csv(x=tmp, file=paste0(pretag,(i+1),".csv"))
|
||||||
setTxtProgressBar(progBar,i)
|
setTxtProgressBar(progBar,i)
|
||||||
}
|
}
|
||||||
paramLines <- parameters[,2]
|
paramLines <- parameters[,2]
|
||||||
paramLines <- order(paramLines)
|
paramLines <- order(paramLines)
|
||||||
randInd <- randVals[[1]][(randVals[[1]] %in% parameters[,2])]
|
randInd <- randVals[[1]][(randVals[[1]] %in% parameters[,2])]
|
||||||
randInd <- order(randInd)
|
randInd <- order(randInd)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
epcStrip <- rbind(origEpc[order(parameters[,2])],
|
epcStrip <- rbind(origEpc[order(parameters[,2])],
|
||||||
randValues[,randVals[[1]] %in% parameters[,2]][,randInd])
|
randValues[,randVals[[1]] %in% parameters[,2]][,randInd])
|
||||||
|
|
||||||
|
|
||||||
preservedCalib <- cbind(epcStrip,rmsr,
|
preservedCalib <- cbind(epcStrip,rmse,
|
||||||
modellOut)
|
modellOut)
|
||||||
colnames(preservedCalib) <- c(parameterNames[paramLines], "likelihood")
|
columNames <- c(parameterNames[paramLines],"rmse", "likelihood")
|
||||||
p<-list()
|
colnames(preservedCalib) <- columNames
|
||||||
|
write.csv(preservedCalib,"preservedCalib.csv")
|
||||||
|
p<-list()
|
||||||
|
preservedCalib <- preservedCalib[-1,]
|
||||||
|
dontInclude <-c((ncol(preservedCalib)-1),ncol(preservedCalib))
|
||||||
|
for(i in seq_along(colnames(preservedCalib)[-dontInclude])){
|
||||||
|
p[[i]] <- ggplot(as.data.frame(preservedCalib),aes_string(colnames(preservedCalib)[i],"likelihood"))+geom_point(size=0.9)
|
||||||
|
}
|
||||||
|
|
||||||
for(i in seq_along(colnames(preservedCalib)[-ncol(preservedCalib)])){
|
ggsave(plotName,grid.arrange(grobs = p, ncol = floor(sqrt(ncol(preservedCalib)-1))),dpi = 3000)
|
||||||
p[[i]] <- ggplot(as.data.frame(preservedCalib),aes_string(colnames(preservedCalib)[i],"likelihood"))+geom_point(size=0.9)
|
|
||||||
}
|
|
||||||
|
|
||||||
ggsave(plotName,grid.arrange(grobs = p, ncol = floor(sqrt(ncol(preservedCalib)-1))),dpi = 3000)
|
return(preservedCalib[preservedCalib[,"likelihood"]==max(preservedCalib[,"likelihood"],na.rm = TRUE),])
|
||||||
write.csv(preservedCalib,"preservedCalib.csv")
|
|
||||||
return(preservedCalib[preservedCalib[,"likelihood"]==max(preservedCalib[,"likelihood"]),])
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user