src/hg/instinct/bioInt2/bioIntDb.as 1.2

Index: src/hg/instinct/bioInt2/bioIntDb.as
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/instinct/bioInt2/bioIntDb.as,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -B -U 4 -r1.1 -r1.2
--- src/hg/instinct/bioInt2/bioIntDb.as	20 Mar 2009 06:06:31 -0000	1.1
+++ src/hg/instinct/bioInt2/bioIntDb.as	21 Mar 2009 19:54:10 -0000	1.2
@@ -47,8 +47,22 @@
 string probe_table; "Probe tablename"
 string probe_to_gene_table; "Probe to gene tablename"
 )
 
+table cohorts
+"All cohorts"
+(
+uint id;             "Cohort Id"
+string name;         "Cohort name"
+)
+
+table datasetCohort
+"Dataset cohort lookup"
+(
+uint dataset_id;     "Dataset Id"
+uint cohort_id;      "Cohort Id"
+)
+
 table geneLookup
 "Lookup table linking knownGene"
 (
 uint id;            "Unique Id"
@@ -117,19 +131,36 @@
 double val;          "Value"
 string code;         "Coded Value"
 )
 
+table analyses
+"All analyses run"
+(
+uint id;             "Analysis id"
+uint cohort_id;      "Cohort Id"
+string module;       "Analysis Module"
+string result_table; "Table containing result"
+)
+
+table analysisParams
+"All analysis parameters"
+(
+uint analysis_id;      "Module Id"
+string key;          "Parameter key"
+string val;          "Parameter val"
+)
+
 table analysisFeatures
 "All analysis features"
 (
-uint feature_id;      "Feature Id"
+uint id;              "Feature Id"
 string feature_name;  "Feature Name"
 )
 
 table analysisVals
 "All analysis vals"
 (
 uint sample_id;       "Sample Id"
-uint feature_id;      "Feature Id"
+uint feature_id;      "Analysis Feature Id"
 float val;            "Val"
 float conf;           "Confidence"
 )