diff --git a/DESCRIPTION b/DESCRIPTION index 575aded0394c2e48019d73d474f1b8dcd1e3065f..a2f6fde531c4d1f5f09fe97a0c43de320787e786 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: gmGeostats -Version: 0.10-7.9004 +Version: 0.10-7.9005 Date: 2020-10-05 Title: Geostatistics for Compositional Analysis Authors@R: c(person(given = "Raimon", diff --git a/NEWS.md b/NEWS.md index 18076b06f59e40ef4c92b47308f923a5eceddda3..ffb8bdec8e8984a4eff5cc9473a0842abaf6b71f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,8 @@ +# gmGeostats 0.10.7.9005 + +* (2021-06-30) bugs in xvErrorMeasures() for simulated data corrected +* (2021-06-30) bugs in accuracy() and precision() corrected + # gmGeostats 0.10.7.9004 * (2021-06-29) bugs in accuracy() and precision() corrected diff --git a/R/accuracy.R b/R/accuracy.R index 887c1e8a971f7c61363737cebd8d21144aa00a15..272759201b192366976fb17bb13ed85c3366b00a 100644 --- a/R/accuracy.R +++ b/R/accuracy.R @@ -387,7 +387,17 @@ xvErrorMeasures.DataFrameStack = function(x, observed, output="ME", outputs = c("ME","MSE") output = outputs[pmatch(output, outputs, duplicates.ok = TRUE)] - mn = gmApply(x, FUN=colMeans) - class(mn) = "data.frame" - xvErrorMeasures(mn, observed, output, univariate) + dims = noStackDim(x) + dims = c(ifelse(is.numeric(dims), 1, "loc"), dims) + mn = gmApply(x, MARGIN=dims, FUN=mean) + # class(mn) = "data.frame" + # xvErrorMeasures(mn, observed, output, univariate=TRUE) + + resids = mn-observed + myfun = function(output){ + if(output=="ME") return(colMeans(resids, na.rm=TRUE)) + if(output=="MSE") return(mean(rowSums(resids^2, na.rm=T), na.rm=TRUE)) + } + + return(sapply(outputs, myfun)) }