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

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

Author: jarioksa
Date: 2011-08-21 08:37:51 +0200 (Sun, 21 Aug 2011)
New Revision: 1737

Modified:
   pkg/vegan/R/print.metaMDS.R
   pkg/vegan/R/print.monoMDS.R
   pkg/vegan/inst/ChangeLog
Log:
always print stress types of stress and tie treatment with monoMDS

Modified: pkg/vegan/R/print.metaMDS.R
===================================================================
--- pkg/vegan/R/print.metaMDS.R	2011-08-20 13:16:05 UTC (rev 1736)
+++ pkg/vegan/R/print.metaMDS.R	2011-08-21 06:37:51 UTC (rev 1737)
@@ -11,8 +11,9 @@
     cat("Distance:", x$distance, "\n\n")
     cat("Dimensions:", x$ndim, "\n")
     cat("Stress:    ", x$stress, "\n")
-    if (inherits(x, "monoMDS") && x$isform == 2)
-        cat("(stress type 2)\n")
+    if (inherits(x, "monoMDS"))
+        cat("Stress type ", x$isform, ", ",
+            c("weak", "strong")[x$ities], " ties\n", sep = "")
     if (x$converged) 
         cat("Two convergent solutions found after", x$tries, 
             "tries\n")

Modified: pkg/vegan/R/print.monoMDS.R
===================================================================
--- pkg/vegan/R/print.monoMDS.R	2011-08-20 13:16:05 UTC (rev 1736)
+++ pkg/vegan/R/print.monoMDS.R	2011-08-21 06:37:51 UTC (rev 1737)
@@ -12,10 +12,10 @@
                      hybrid = "Hybrid")
     cat(paste(modlab, "Multidimensional Scaling\n"))
     cat("Dimensions:", x$ndim, "\n")
-    cat("Stress:    ", x$stress)
-    if (x$isform == 2)
-        cat(" (type 2)")
-    cat("\n")
+    cat("Stress:    ", x$stress, "\n")
+    cat("Stress type ", x$isform, ", ", c("weak", "strong")[x$ities], " ties\n",
+        sep = "")
+   
     stoplab <- switch(x$icause,
                       "Maximum number of iteration reached",
                       "Stress nearly zero",

Modified: pkg/vegan/inst/ChangeLog
===================================================================
--- pkg/vegan/inst/ChangeLog	2011-08-20 13:16:05 UTC (rev 1736)
+++ pkg/vegan/inst/ChangeLog	2011-08-21 06:37:51 UTC (rev 1737)
@@ -9,6 +9,8 @@
 
 	* fitspecaccum: a typo and a condition was never true.
 
+	* monoMDS & metaMDS: always print types of stress and ties.
+
 	* NAMESPACE: export pasteCall for analogue.
 
 	* NEWS: added file NEWS.Rd for vegan release 2.0 news in Rd format.