[R-gregmisc-commits] r2107 - pkg/gplots/tests

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

Author: warnes
Date: 2016-03-25 19:20:26 +0100 (Fri, 25 Mar 2016)
New Revision: 2107

Modified:
   pkg/gplots/tests/heatmap2Test.Rout.save
Log:
Update test output to match corrected messages

Modified: pkg/gplots/tests/heatmap2Test.Rout.save
===================================================================
--- pkg/gplots/tests/heatmap2Test.Rout.save	2016-03-25 17:28:45 UTC (rev 2106)
+++ pkg/gplots/tests/heatmap2Test.Rout.save	2016-03-25 18:20:26 UTC (rev 2107)
@@ -1,7 +1,7 @@
 
-R version 3.1.1 (2014-07-10) -- "Sock it to Me"
-Copyright (C) 2014 The R Foundation for Statistical Computing
-Platform: x86_64-apple-darwin13.1.0 (64-bit)
+R version 3.2.0 (2015-04-16) -- "Full of Ingredients"
+Copyright (C) 2015 The R Foundation for Statistical Computing
+Platform: x86_64-unknown-linux-gnu (64-bit)
 
 R is free software and comes with ABSOLUTELY NO WARRANTY.
 You are welcome to redistribute it under certain conditions.
@@ -40,44 +40,44 @@
 > heatmap.2(x, Colv=FALSE)
 Warning message:
 In heatmap.2(x, Colv = FALSE) :
-  Discrepancy: Colv is FALSE, while dendrogram is `row'. Omitting column dendogram.
+  Discrepancy: Colv is FALSE, while dendrogram is `both'. Omitting column dendogram.
 > heatmap.2(x, Colv=NULL)
 Warning message:
 In heatmap.2(x, Colv = NULL) :
-  Discrepancy: Colv is FALSE, while dendrogram is `row'. Omitting column dendogram.
+  Discrepancy: Colv is FALSE, while dendrogram is `both'. Omitting column dendogram.
 > 
 > heatmap.2(x, Rowv=FALSE)
 Warning message:
 In heatmap.2(x, Rowv = FALSE) :
-  Discrepancy: Rowv is FALSE, while dendrogram is `column'. Omitting row dendogram.
+  Discrepancy: Rowv is FALSE, while dendrogram is `both'. Omitting row dendogram.
 > heatmap.2(x, Rowv=NULL)
 Warning message:
 In heatmap.2(x, Rowv = NULL) :
-  Discrepancy: Rowv is FALSE, while dendrogram is `column'. Omitting row dendogram.
+  Discrepancy: Rowv is FALSE, while dendrogram is `both'. Omitting row dendogram.
 > 
 > heatmap.2(x, Rowv=FALSE, dendrogram="both") ## generate warning!
 Warning message:
 In heatmap.2(x, Rowv = FALSE, dendrogram = "both") :
-  Discrepancy: Rowv is FALSE, while dendrogram is `column'. Omitting row dendogram.
+  Discrepancy: Rowv is FALSE, while dendrogram is `both'. Omitting row dendogram.
 > heatmap.2(x, Rowv=NULL, dendrogram="both")  ## generate warning!
 Warning message:
 In heatmap.2(x, Rowv = NULL, dendrogram = "both") :
-  Discrepancy: Rowv is FALSE, while dendrogram is `column'. Omitting row dendogram.
+  Discrepancy: Rowv is FALSE, while dendrogram is `both'. Omitting row dendogram.
 > heatmap.2(x, Colv=FALSE, dendrogram="both") ## generate warning!
 Warning message:
 In heatmap.2(x, Colv = FALSE, dendrogram = "both") :
-  Discrepancy: Colv is FALSE, while dendrogram is `row'. Omitting column dendogram.
+  Discrepancy: Colv is FALSE, while dendrogram is `both'. Omitting column dendogram.
 > 
 > 
 > 
 > heatmap.2(x,dendrogram="both", Rowv=FALSE) ## row and col reordering done, but only col dendrogram plotted 
 Warning message:
 In heatmap.2(x, dendrogram = "both", Rowv = FALSE) :
-  Discrepancy: Rowv is FALSE, while dendrogram is `column'. Omitting row dendogram.
+  Discrepancy: Rowv is FALSE, while dendrogram is `both'. Omitting row dendogram.
 > heatmap.2(x,dendrogram="row",  Rowv=FALSE) 
 Warning message:
 In heatmap.2(x, dendrogram = "row", Rowv = FALSE) :
-  Discrepancy: Rowv is FALSE, while dendrogram is `column'. Omitting row dendogram.
+  Discrepancy: Rowv is FALSE, while dendrogram is `row'. Omitting row dendogram.
 > 
 > 
 > heatmap.2(x,dendrogram="col",  Rowv=FALSE)
@@ -87,19 +87,19 @@
 > heatmap.2(x,dendrogram="both", Colv=FALSE) ## row and col reordering done, but only row dendrogram plotted
 Warning message:
 In heatmap.2(x, dendrogram = "both", Colv = FALSE) :
-  Discrepancy: Colv is FALSE, while dendrogram is `row'. Omitting column dendogram.
+  Discrepancy: Colv is FALSE, while dendrogram is `both'. Omitting column dendogram.
 > heatmap.2(x,dendrogram="row",  Colv=FALSE)
 > heatmap.2(x,dendrogram="col",  Colv=FALSE)
 Warning message:
 In heatmap.2(x, dendrogram = "col", Colv = FALSE) :
-  Discrepancy: Colv is FALSE, while dendrogram is `row'. Omitting column dendogram.
+  Discrepancy: Colv is FALSE, while dendrogram is `column'. Omitting column dendogram.
 > heatmap.2(x,dendrogram="none", Colv=FALSE) 
 > 
 > ## above statement is same as heatmap.2(x,Colv=FALSE)
 > heatmap.2(x,dendrogram="col", Colv=FALSE) ## col reordering done, but no dendrogram plotted 
 Warning message:
 In heatmap.2(x, dendrogram = "col", Colv = FALSE) :
-  Discrepancy: Colv is FALSE, while dendrogram is `row'. Omitting column dendogram.
+  Discrepancy: Colv is FALSE, while dendrogram is `column'. Omitting column dendogram.
 > 
 > 
 > hv <- heatmap.2(x, col=cm.colors(256), scale="column", 
@@ -109,7 +109,7 @@
 +                tracecol="green", density="density")
 > 
 > str(hv) # the two re-ordering index vectors
-List of 12
+List of 13
  $ rowInd       : int [1:32] 31 17 16 15 5 25 29 24 7 6 ...
  $ colInd       : int [1:11] 2 9 8 11 6 5 10 7 1 4 ...
  $ call         : language heatmap.2(x = x, scale = "column", col = cm.colors(256), tracecol = "green",      margins = c(5, 10), ColSideColors = cc, RowSideColors = rc, density.info = "density",  ...
@@ -212,6 +212,10 @@
   ..$ low  : num [1:256] -3.21 -3.19 -3.16 -3.14 -3.11 ...
   ..$ high : num [1:256] -3.19 -3.16 -3.14 -3.11 -3.09 ...
   ..$ color: Factor w/ 254 levels "#80FFFFFF","#81FFFFFF",..: 1 1 2 3 4 5 6 7 8 9 ...
+ $ layout       :List of 3
+  ..$ lmat: num [1:3, 1:3] 6 0 4 0 0 1 5 2 3
+  ..$ lhei: num [1:3] 1.5 0.2 4
+  ..$ lwid: num [1:3] 1.5 0.2 4
 > 
 > ## Test row and column separators 
 > heatmap.2(x,dendrogram="col", colsep=1) ## one colsep
@@ -222,4 +226,4 @@
 > 
 > proc.time()
    user  system elapsed 
-  1.485   0.094   2.015 
+  1.618   1.555   1.558