diff --git a/RBBGCMuso/DESCRIPTION b/RBBGCMuso/DESCRIPTION index aba7b41..d8e2bc1 100644 --- a/RBBGCMuso/DESCRIPTION +++ b/RBBGCMuso/DESCRIPTION @@ -32,7 +32,11 @@ Imports: ncdf4, future, httr, - tcltk + tcltk, + Boruta, + rpart, + rpart.plot + Maintainer: Roland Hollo's RoxygenNote: 7.1.0 Suggests: knitr, diff --git a/RBBGCMuso/R/multiSite.R b/RBBGCMuso/R/multiSite.R index 5643046..4dbee12 100644 --- a/RBBGCMuso/R/multiSite.R +++ b/RBBGCMuso/R/multiSite.R @@ -554,43 +554,6 @@ compareCalibratedWithOriginal <- function(key, modOld, modNew, mes, return(data.frame(original = original, calibrated = calibrated,measured=measured$mean)) } -# plotDiff(key="grainDM", -# modOld=origModOut, -# modNew=tmp, -# # mes=measuredData, -# mes=mes, -# likelihoods=likelihood, -# alignIndexes=alignIndexes, -# musoCodeToIndex = musoCodeToIndex,nameGroupTable = nameGroupTable, mean) -# -# -# comp <- compareCalibratedWithOriginal(key="grainDM", -# modOld=origModOut, -# modNew=tmp, -# # mes=measuredData, -# mes=mes, -# likelihoods=likelihood, -# alignIndexes=alignIndexes, -# musoCodeToIndex = musoCodeToIndex,nameGroupTable = nameGroupTable, mean) -# -# -# -# -# -# plotDiff <- function(key, modOld, modNew, mes, -# likelihoods, alignIndexes, musoCodeToIndex, nameGroupTable, -# groupFun){ -# compme <- compareCalibratedWithOriginal(key,modOld,modNew,mes, -# likelihoods,alignIndexes,musoCodeToIndex,nameGroupTable,groupFun) -# -# with(data=compme, { -# plot(measured,original,ylim=c(min(measured),max(measured))) -# points(measured,calibrated,pch=20) -# abline(0,1) -# })} -# -# likelihood <- list(grainDM=function(x,y){exp(-1./2.*sqrt(mean((x-y$mean)^2.)))}) -# likelihood <- list(grainDM=agroLikelihood) spatialRun <- function(settingsProto,calibrationPar, parameters, calTable){ resIterate <- 1:nrow(calTable)