[Vegan-commits] r2228 - in pkg/vegan: R inst

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

Author: jarioksa
Date: 2012-07-11 08:21:19 +0200 (Wed, 11 Jul 2012)
New Revision: 2228

Modified:
   pkg/vegan/R/oecosimu.R
   pkg/vegan/R/print.oecosimu.R
   pkg/vegan/inst/ChangeLog
Log:
Merge branch 'master' into r-forge-svn-local

Modified: pkg/vegan/R/oecosimu.R
===================================================================
--- pkg/vegan/R/oecosimu.R	2012-07-07 14:30:28 UTC (rev 2227)
+++ pkg/vegan/R/oecosimu.R	2012-07-11 06:21:19 UTC (rev 2228)
@@ -126,6 +126,7 @@
     ind$oecosimu <- list(z = z, means = means, pval = p, simulated=simind,
                          method=method, statistic = indstat,
                          alternative = alternative, isSeq = attr(x, "isSeq"))
+    attr(ind, "call") <- match.call()
     class(ind) <- c("oecosimu", class(ind))
     ind
 }

Modified: pkg/vegan/R/print.oecosimu.R
===================================================================
--- pkg/vegan/R/print.oecosimu.R	2012-07-07 14:30:28 UTC (rev 2227)
+++ pkg/vegan/R/print.oecosimu.R	2012-07-11 06:21:19 UTC (rev 2228)
@@ -2,8 +2,10 @@
     function(x, ...)
 {
     attr(x$oecosimu$method, "permfun") <- NULL
-    cat("oecosimu with", ncol(x$oecosimu$simulated), "simulations\n")
-    cat("simulation method", sQuote(x$oecosimu$method))
+    writeLines(strwrap(pasteCall(attr(x, "call"))))
+    cat("\n")
+    cat("nullmodel method", sQuote(x$oecosimu$method), "with", 
+        ncol(x$oecosimu$simulated), "simulations\n")
     if (length(att <- attributes(x$oecosimu$simulated)) > 1) {
         att$dim <- NULL
         cat(" with", paste(names(att), att, collapse=", "))

Modified: pkg/vegan/inst/ChangeLog
===================================================================
--- pkg/vegan/inst/ChangeLog	2012-07-07 14:30:28 UTC (rev 2227)
+++ pkg/vegan/inst/ChangeLog	2012-07-11 06:21:19 UTC (rev 2228)
@@ -17,6 +17,12 @@
 	calculations without replicating its code. The "call" attribute of
 	these functions now returns the generic function name without
 	".default", ".formula" suffix.
+
+	* oecosimu: returns "call" attribute similarly as adipart(),
+	hiersimu() and multipart(). The print.oecosimu() output changed,
+	and shows the call. print.oecosimu() is able to display adipart(),
+	hiersimu() and multipart() results, but does not show all
+	informations that those dedicated functions showed about options. 
 	
 Version 2.1-16 (closed June 18, 2012)