[Archetypes-commits] r33 - branches/pkg-robust/R

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

Author: manuel
Date: 2010-03-24 11:30:13 +0100 (Wed, 24 Mar 2010)
New Revision: 33

Modified:
   branches/pkg-robust/R/archetypes-plot.R
Log:


Modified: branches/pkg-robust/R/archetypes-plot.R
===================================================================
--- branches/pkg-robust/R/archetypes-plot.R	2010-03-18 14:53:06 UTC (rev 32)
+++ branches/pkg-robust/R/archetypes-plot.R	2010-03-24 10:30:13 UTC (rev 33)
@@ -84,20 +84,18 @@
 #' Plot weighted archetypes.
 plot.weightedArchetypes <- function(x, y,
                                     adata.show = FALSE, data.col = 1, data.pch = 21,
-                                    data.bg = gray, link.col.show = TRUE,
-                                    link.col = data.col, link.lty = 1,
+                                    data.bg = gray, link.col = NULL, link.lty = NULL,
                                     weights.type = 'weights', ...) {
-  if ( !adata.show )
-    return(plot.archetypes(x, y, ...))
 
   w <- 1 - weights(x, type = weights.type)
 
-  if ( link.col.show ) {
+  if ( is.null(link.col) )
     link.col <- ifelse(w == 1, 1, data.bg(w))
+
+  if ( is.null(link.lty) )
     link.lty <- ifelse(w == 1, 2, 1)
-  }
 
-  plot.archetypes(x, y, adata.show = TRUE, data.pch = data.pch,
+  plot.archetypes(x, y, adata.show = adata.show, data.pch = data.pch,
                   data.col = data.col, data.bg = data.bg(w),
                   link.col = link.col, link.lty = link.lty, ...)
 }