[Analogue-commits] r164 - in pkg: . R inst

[noreply at r-forge.r-project.org]

Author: gsimpson
Date: 2010-04-19 19:49:45 +0200 (Mon, 19 Apr 2010)
New Revision: 164

Modified:
   pkg/DESCRIPTION
   pkg/R/summary.predict.mat.R
   pkg/inst/ChangeLog
Log:
summary.predict.mat was incorrectly extracting the MAT model estimates for the training set

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2010-03-09 12:19:32 UTC (rev 163)
+++ pkg/DESCRIPTION	2010-04-19 17:49:45 UTC (rev 164)
@@ -1,7 +1,7 @@
 Package: analogue
 Type: Package
 Title: Analogue and weighted averaging methods for palaeoecology
-Version: 0.6-23
+Version: 0.6-24
 Date: $Date$
 Depends: R (>= 2.5.0), stats, graphics, vegan, lattice, MASS
 Author: Gavin L. Simpson, Jari Oksanen

Modified: pkg/R/summary.predict.mat.R
===================================================================
--- pkg/R/summary.predict.mat.R	2010-03-09 12:19:32 UTC (rev 163)
+++ pkg/R/summary.predict.mat.R	2010-04-19 17:49:45 UTC (rev 164)
@@ -20,29 +20,29 @@
 print.summary.predict.mat <- function(x,
                                       digits = max(3, getOption("digits") - 3),
                                       ...)
-  {
+{
     print.predict.mat(x)
     if(!is.null(x$bootstrap)) {
-      k.model <- x$model$k
-      k.boot <- x$bootstrap$k
-      dat <- data.frame(Obs = x$observed,
-                        Est = x$model$estimated[k.model, ],
-                        Resid = x$model$residuals[k.model, ],
-                        Boot.Est = x$bootstrap$estimated[, k.boot],
-                        Boot.Resid = x$bootstrap$residuals[, k.boot],
-                        s1 = x$sample.errors$s1[, k.boot],
-                        s2 = x$sample.errors$s2[, k.boot],
-                        RMSEP = x$sample.errors$rmsep[, k.boot])
-      cat("\nTraining set assessment:\n\n")
-      print(dat, digits = digits)
+        k.model <- x$model$k
+        k.boot <- x$bootstrap$k
+        dat <- data.frame(Obs = x$observed,
+                          Est = x$model$estimated[k.model, ],
+                          Resid = x$model$residuals[k.model, ],
+                          Boot.Est = x$bootstrap$estimated[, k.boot],
+                          Boot.Resid = x$bootstrap$residuals[, k.boot],
+                          s1 = x$sample.errors$s1[, k.boot],
+                          s2 = x$sample.errors$s2[, k.boot],
+                          RMSEP = x$sample.errors$rmsep[, k.boot])
+        cat("\nTraining set assessment:\n\n")
+        print(dat, digits = digits)
     } else {
-      k.model <- x$model$k
-      dat <- data.frame(Obs = x$observed,
-                        Est = as.numeric(x$model$estimated[k.model]),
-                        Resid = x$model$residuals$residuals)
-      rownames(dat) <- names(x$model$estimated)
+        k.model <- x$model$k
+        dat <- data.frame(Obs = x$observed,
+                          Est = as.numeric(x$model$estimated),
+                          Resid = x$model$residuals$residuals)
+        rownames(dat) <- names(x$model$estimated)
     }
     cat("\nTraining set assessment:\n\n")
     print(dat, digits = digits)
     invisible(x)
-  }
+}

Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog	2010-03-09 12:19:32 UTC (rev 163)
+++ pkg/inst/ChangeLog	2010-04-19 17:49:45 UTC (rev 164)
@@ -1,5 +1,10 @@
 analogue Change Log
 
+Version 0.6-24
+
+	* summary.predict.mat: print method was incorrectly extracting
+	the model estimates for training set samples.
+
 Version 0.6-23
 
 	* tran: 'rootroot' transformation was same as 'cuberoot' from