From f96d66327e5d8504e1b8979147db26148c5666b4 Mon Sep 17 00:00:00 2001
From: Christoph Hafemeister <chafemeister@nygenome.org>
Date: Thu, 24 Nov 2016 12:46:38 +0100
Subject: [PATCH] fixed issue in heatmap.2 where dendrograms were calculated
 using hclust even when Rowv or Colv were set to NA, FALSE, or NULL

---
 R/heatmap.2.R | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/R/heatmap.2.R b/R/heatmap.2.R
index a21d01d..6bf89eb 100644
--- a/R/heatmap.2.R
+++ b/R/heatmap.2.R
@@ -225,15 +225,9 @@ heatmap.2 <- function (x,
       if(nr != length(rowInd))
         stop("row dendrogram ordering gave index of wrong length")
     }
-  else if(!isTRUE(Rowv))
-    {
-      rowInd <- nr:1
-      ddr <- as.dendrogram(hclust(dist(diag(nr))))
-    }
   else
     {
       rowInd <- nr:1
-      ddr <- as.dendrogram(Rowv)
     }
 
   if(inherits(Colv, "dendrogram"))
@@ -277,15 +271,9 @@ heatmap.2 <- function (x,
       if(nc != length(colInd))
         stop("column dendrogram ordering gave index of wrong length")
     }
-  else if(!isTRUE(Colv))
-    {
-      colInd <- 1:nc
-      ddc <- as.dendrogram(hclust(dist(diag(nc))))
-    }
   else
     {
       colInd <- 1:nc
-      ddc <- as.dendrogram(Colv)
     }
 
   retval$rowInd <- rowInd