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 1000000 -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
@@ -1,67 +1,67 @@
 /* bioController.h 
  * All rights reserved -- J. Zachary Sanborn
  */
 
 #ifndef BIOCONTROLLER_H
 #define BIOCONTROLLER_H 
 
 #include "common.h"
 #include "bioIntDb.h"
 
 
 struct analysisResult {
     struct analysisResult *next;
     char *sample;
     char *feature;
 
     double val;
     double conf;
 };
 
 struct biAnalysis {
     struct biAnalysis *next;
     char *db;
     char *tableName;
     struct slName *inputTables;
     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);
 
 void analysisResultFreeList(struct analysisResult **pList);
 
 struct hash *createHash(struct sqlConnection *biConn,
 			char *table, char *key_field, char *val_field);
 
 int findIdInTable(struct sqlConnection *biConn, char *tableName,
 		  char *idField, char *sField, char *name); 
 
 void storeAnalysisResultsInDb(struct sqlConnection *biConn, struct biAnalysis *ba,
 			      struct analysisResult *arList);
 
 void runAnalysisPipeline(struct biAnalysis *baList);
 
 /* 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 */
 
 
 
 #endif /* BIOCONTROLLER_H */