From 02dfa703096d3e0857f3ba88ed24751471dabe45 Mon Sep 17 00:00:00 2001 From: Hollos Roland Date: Thu, 1 Oct 2020 08:46:06 +0200 Subject: [PATCH] revert the old state --- RBBGCMuso/R/calibrateMuso.R | 28 ++++++++++++++++++---------- RBBGCMuso/R/calibration.R | 1 + 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/RBBGCMuso/R/calibrateMuso.R b/RBBGCMuso/R/calibrateMuso.R index efea427..cd144d7 100644 --- a/RBBGCMuso/R/calibrateMuso.R +++ b/RBBGCMuso/R/calibrateMuso.R @@ -340,7 +340,7 @@ prepareFromAgroMo <- function(fName){ calcLikelihoodsAndRMSE <- function(dataVar, mod, mes, likelihoods, alignIndexes, musoCodeToIndex, uncert){ - + # browser() # NOT COMPATIBLE WITH OLD MEASUREMENT DATA, mes have to be a matrix likelihoodRMSE <- sapply(names(dataVar),function(key){ # browser() @@ -348,20 +348,28 @@ calcLikelihoodsAndRMSE <- function(dataVar, mod, mes, likelihoods, alignIndexes, selected <- grep(sprintf("%s$", key), colnames(mes)) # browser() measured <- mes[alignIndexes$meas,selected] - notNA <- sapply(1:nrow(measured), function(x){!any(is.na(measured[x,]))}) - modelled <- modelled[notNA] - measured <- measured[notNA,] + if(is.data.frame(measured)){ + notNA <- sapply(1:nrow(measured), function(x){!any(is.na(measured[x,]))}) + modelled <- modelled[notNA] + measured <- measured[notNA,] + } else { + notNA <- !(is.na(measured)) + modelled <- modelled[notNA] + measured <- measured[notNA] + } # uncert <- uncert[!is.na(measured)] # measured <- measured[!is.na(measured)] - apply(measured, 1, function(x){!any(is.na(x))}) - measured <- t(apply(measured, 1, function(x){if(!any(is.na(x))){x}} )) - if(ncol(measured)!=1){ + # measured <- t(apply(measured, 1, function(x){if(!any(is.na(x))){x}} )) + if(!is.null(ncol(measured))){ m <- measured[,grep("^mean", colnames(measured))] + res <- c(likelihoods[[key]](modelled, measured), + sqrt(mean((modelled-m)^2))) + } else { + res <- c(likelihoods[[key]](modelled, measured), + sqrt(mean((modelled-measured)^2))) + } - res <- c(likelihoods[[key]](modelled, measured), - sqrt(mean((modelled-m)^2)) - ) # browser() res }) diff --git a/RBBGCMuso/R/calibration.R b/RBBGCMuso/R/calibration.R index 5c687c3..4e271fd 100644 --- a/RBBGCMuso/R/calibration.R +++ b/RBBGCMuso/R/calibration.R @@ -123,6 +123,7 @@ optiMuso <- function(measuredData, parameters = NULL, startDate = NULL, uncert <- NULL } # browser() + browser() origModellOut <- calibMuso(settings=settings, silent=TRUE, skipSpinup = skipSpinup, postProcString=postProcString, modifyOriginal=modifyOriginal) partialResult[,resultRange] <- calcLikelihoodsAndRMSE(dataVar=dataVar, mod=origModellOut,