src/hg/instinct/hgGeneset/hgStats.h 1.2

1.2 2010/01/29 00:34:07 jsanborn
added 2D clustering
Index: src/hg/instinct/hgGeneset/hgStats.h
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/instinct/hgGeneset/hgStats.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -B -U 4 -r1.1 -r1.2
--- src/hg/instinct/hgGeneset/hgStats.h	28 Jan 2010 22:59:07 -0000	1.1
+++ src/hg/instinct/hgGeneset/hgStats.h	29 Jan 2010 00:34:07 -0000	1.2
@@ -46,12 +46,14 @@
 
 void initializeRawData(int rows, int columns,
 		       struct rawData *rdList, struct mapSettings *settings,
 		       double **data, int **mask, double *arrayweight,
-		       double *geneorder, char **genename);
+		       double *geneorder, char **genename, 
+		       double *sampleorder, char **samplename);
 
-struct slName *clusterDataByGene(struct rawData *rdList, struct mapSettings *settings,
-				 char method, char metric);
+void clusterData(struct rawData *rdList, struct mapSettings *settings,
+		 char method, char metric, 
+		 struct slName **geneOrder, struct slName **sampleOrder);
     
 struct slName *clusterGeneSet(struct hash *geneHash, 
 			      struct slName *genes, char method, char metric);
 /* Set up data structures for cluster software, perform hierarchical clustering, and