src/hg/instinct/bioInt2/bioController.h 1.5

Index: src/hg/instinct/bioInt2/bioController.h
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/instinct/bioInt2/bioController.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -B -U 4 -r1.4 -r1.5
--- src/hg/instinct/bioInt2/bioController.h	23 Mar 2009 18:19:29 -0000	1.4
+++ src/hg/instinct/bioInt2/bioController.h	27 Apr 2009 06:15:48 -0000	1.5
@@ -26,10 +26,10 @@
     struct hash *parameters;
 
     void (*pipeline)(struct biAnalysis *ba);
 
-    struct analysisResult *(*analyze)(struct biAnalysis *ba, void *data, 
-				      char *sample, char *feature);
+    struct analysisVals *(*analyze)(struct biAnalysis *ba, void *data, 
+				    int sample_id, int feature_id);
 }; 
 
 void analysisResultFree(struct analysisResult **pEl);
 
@@ -49,17 +49,17 @@
 /* Gene Level Analyses */
 void geneLevelPipeline(struct biAnalysis *ba);
 
 
-struct analysisResult *metaGene(struct biAnalysis *ba, void *data,
-				char *sample, char *gene); 
+struct analysisVals *metaGene(struct biAnalysis *ba, void *data,
+			      int sample_id, int feature_id);
 
 
 /* Geneset Analyses */
 void genesetLevelPipeline(struct biAnalysis *ba);
 
-struct analysisResult *metaGeneset(struct biAnalysis *ba, void *data,
-				   char *sample, char *gene);
+struct analysisVals *metaGeneset(struct biAnalysis *ba, void *data,
+				   int sample_id, int feature_id);
 
 /* Pathway Analyses */