nastrings
This commit is contained in:
parent
59da27d5ef
commit
3c7f47dd19
@ -164,7 +164,7 @@ readObservedData <- function(inFile,
|
||||
baseData <- as.data.frame(baseData)
|
||||
baseData[baseData[,selVar] == naString,selVar] <- NA
|
||||
} else {
|
||||
baseData <- fread(file = inFile, sep=sep, naString = naString)
|
||||
baseData <- fread(file = inFile, sep=sep, na.strings = naString)
|
||||
baseData <- as.data.frame(baseData)
|
||||
}
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
#' @importFrom tidyr separate
|
||||
#' @export
|
||||
|
||||
musoQuickEffect <- function(settings = NULL,calibrationPar = NULL, startVal, endVal, nSteps = 1, fileToChange="epc",modifyOriginal=TRUE, outVar, parName = "parVal"){
|
||||
musoQuickEffect <- function(settings = NULL, calibrationPar = NULL, startVal, endVal, nSteps = 1, fileToChange="epc",modifyOriginal=TRUE, outVar, parName = "parVal"){
|
||||
|
||||
if(is.character(outVar)){
|
||||
varNames <- as.data.frame(musoMappingFind(outVar))
|
||||
|
||||
@ -108,8 +108,11 @@ setupMuso <- function(executable=NULL,
|
||||
normals<-grep("n.ini$",list.files(inputLoc),value=TRUE)
|
||||
|
||||
if(length(spinups)==1){
|
||||
iniInput[1]<-file.path(inputLoc,spinups)
|
||||
} else {stop("There are multiple or no spinup ini files, please choose")}
|
||||
iniInput[1] <- file.path(inputLoc,spinups)
|
||||
} else {
|
||||
iniInput[1] <- "no spinup"
|
||||
# stop("There are multiple or no spinup ini files, please choose")
|
||||
}
|
||||
|
||||
|
||||
if(length(normals)==1){
|
||||
|
||||
Loading…
Reference in New Issue
Block a user