[Vegan-commits] r1765 - pkg/vegan/R

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

Author: jarioksa
Date: 2011-08-27 08:08:47 +0200 (Sat, 27 Aug 2011)
New Revision: 1765

Modified:
   pkg/vegan/R/print.metaMDS.R
   pkg/vegan/R/print.monoMDS.R
Log:
tie handling style makes no sense in linear MDS

Modified: pkg/vegan/R/print.metaMDS.R
===================================================================
--- pkg/vegan/R/print.metaMDS.R	2011-08-26 16:59:46 UTC (rev 1764)
+++ pkg/vegan/R/print.metaMDS.R	2011-08-27 06:08:47 UTC (rev 1765)
@@ -11,9 +11,12 @@
     cat("Distance:", x$distance, "\n\n")
     cat("Dimensions:", x$ndim, "\n")
     cat("Stress:    ", x$stress, "\n")
-    if (inherits(x, "monoMDS"))
-        cat("Stress type ", x$isform, ", ",
-            c("weak", "strong")[x$ities], " ties\n", sep = "")
+    if (inherits(x, "monoMDS")) {
+        cat("Stress type ", x$isform)
+        if(x$model != "linear")
+            cat(", ", c("weak", "strong")[x$ities], " ties", sep = "")
+        cat("\n")
+    }
     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-26 16:59:46 UTC (rev 1764)
+++ pkg/vegan/R/print.monoMDS.R	2011-08-27 06:08:47 UTC (rev 1765)
@@ -13,9 +13,10 @@
     cat(paste(modlab, "Multidimensional Scaling\n"))
     cat("Dimensions:", x$ndim, "\n")
     cat("Stress:    ", x$stress, "\n")
-    cat("Stress type ", x$isform, ", ", c("weak", "strong")[x$ities], " ties\n",
-        sep = "")
-   
+    cat("Stress type ", x$isform)
+    if (x$model != "linear")
+        cat(", ", c("weak", "strong")[x$ities], " ties", sep = "")
+    cat("\n")
     stoplab <- switch(x$icause,
                       "Maximum number of iteration reached",
                       "Stress nearly zero",