diff cluster.tools/select.k.from.consensus.cluster.R @ 8:a58527c632b7 draft

Uploaded

--- a/cluster.tools/select.k.from.consensus.cluster.R	Mon Mar 04 04:11:28 2013 -0500
+++ b/cluster.tools/select.k.from.consensus.cluster.R	Mon Mar 11 16:31:29 2013 -0400
@@ -319,12 +319,19 @@
   write.table( cl, opt$cluster.class.out, sep="\t", row.names=FALSE, quote=FALSE )
 }
 
-treecl.res <- results[[ k.select ]]$consensusTree
 ## cl should already exist, but re-create it just in case
 cl <- cls[[ as.character( k.select ) ]] 
-
+treecl.res <- results[[ k.select ]]$consensusTree
+select.result <- results[[ k.select ]]
 
-select.result <- results[[ k.select ]]
+if ( length(cl) == ncol(data) ) {
+  names( cl ) <- treecl.res$labels <- select.result$consensusTree$labels <- colnames(data)
+} else if ( length(cl) == nrow(data) ) {
+  names( cl ) <- treecl.res$labels <- select.result$consensusTree$labels <- rownames(data)
+} else {
+  stop( "Number of clustered elements not equal to either number of rows or columns of data matrix\n" )
+}
+
 ## over-write the tabular version of the opt$cluster.class.out with an RData file
 save( file=opt$cluster.class.out, treecl.res, cl, select.result, data )