[R-gregmisc-users] SF.net SVN: r-gregmisc: [967] trunk/gplots/R/heatmap.2.R

[<nj...@us...>]

Revision: 967
Author:   nj7w
Date:     2006-06-26 14:08:21 -0700 (Mon, 26 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/r-gregmisc/?rev=967&view=rev

Log Message:
-----------
Fixed a bug which displayed warnings when Rowv and Colv were specified as dendrograms

Modified Paths:
--------------
    trunk/gplots/R/heatmap.2.R
Modified: trunk/gplots/R/heatmap.2.R
===================================================================
--- trunk/gplots/R/heatmap.2.R	2006-06-06 19:17:08 UTC (rev 966)
+++ trunk/gplots/R/heatmap.2.R	2006-06-26 21:08:21 UTC (rev 967)
@@ -109,6 +109,7 @@
     if(missing(cellnote))
       cellnote <- matrix("", ncol=ncol(x), nrow=nrow(x))
 
+   if(!inherits(Rowv, "dendrogram")) {
   ## Check if Rowv and dendrogram arguments are consistent
   if ( ( (!isTRUE(Rowv)) || (is.null(Rowv))) && (dendrogram %in% c("both","row") ) )
   {
@@ -121,7 +122,9 @@
             dendrogram, "'. Omitting row dendogram.")
     
   }
+}
 
+    if(!inherits(Colv, "dendrogram")) {
  ## Check if Colv and dendrogram arguments are consistent
   if ( ( (!isTRUE(Colv)) || (is.null(Colv)))
       && (dendrogram %in% c("both","column")) )
@@ -134,7 +137,7 @@
     warning("Discrepancy: Colv is FALSE, while dendrogram is `",
             dendrogram, "'. Omitting column dendogram.")
    }
-
+}
   
   
   ## by default order by row/col mean


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.