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

really fix merge conflict

Browse Source
This commit is contained in:
Hollos Roland 2022-06-01 10:28:10 +02:00
parent d30776ffbf
commit e79e4e7014
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
RBBGCMuso/R/multiSite.R
View File

@ -171,15 +171,8 @@ multiSiteCalib <- function(measurements,
result <- multiSiteThread(measuredData = measurements, parameters = parameters, calTable=calTable, result <- multiSiteThread(measuredData = measurements, parameters = parameters, calTable=calTable,
dataVar = dataVar, iterations = threadCount[i], dataVar = dataVar, iterations = threadCount[i],
likelihood = likelihood, threadNumber= i, constraints=constraints, th=th) likelihood = likelihood, threadNumber= i, constraints=constraints, th=th)
<<<<<<< HEAD # setwd("../../")
##setwd("../") # return(result)
}
, error = function(e){
=======
setwd("../../")
return(result)
} }
, error = function(e){ , error = function(e){
@ -187,7 +180,6 @@ multiSiteCalib <- function(measurements,
sink("error.txt") sink("error.txt")
print(e) print(e)
sink() sink()
>>>>>>> origin/CIRM
saveRDS(e,"error.RDS") saveRDS(e,"error.RDS")
writeLines(as.character(iterations),"progress.txt") writeLines(as.character(iterations),"progress.txt")
}) })