about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLei Yan2014-02-05 16:23:44 -0600
committerLei Yan2014-02-05 16:23:44 -0600
commitc9e98757d13063c04d639ad39bf55ef58fa61e5d (patch)
tree79c499376bc78b31a183dab649b0e7899485ac47
parent7b7ac2d766b6ed83be21f654a1526ace9fdab930 (diff)
downloadgenenetwork2-c9e98757d13063c04d639ad39bf55ef58fa61e5d.tar.gz
On branch master
-rw-r--r--wqflask/maintenance/dataset/specials.py18
1 files changed, 8 insertions, 10 deletions
diff --git a/wqflask/maintenance/dataset/specials.py b/wqflask/maintenance/dataset/specials.py
index 0273d24d..262db731 100644
--- a/wqflask/maintenance/dataset/specials.py
+++ b/wqflask/maintenance/dataset/specials.py
@@ -2,6 +2,7 @@ import utilities
 import datastructure
 import genotypes
 import probesets
+import calculate
 
 """
 For:    Rob, GeneNetwork
@@ -113,17 +114,14 @@ def bxd_correlations():
                 dic1 = geno['dicvalues']
                 dic2 = probesetdata
                 keys, values1, values2 = utilities.overlap(dic1, dic2)
-                
-                print keys
-                print values1
-                print values2
-                return 
+                rs = calculate.correlation(values1, values2)
+                print rs
                 #
-                outputfile.write("%s\t" % "Overlap Number")
-                outputfile.write("%s\t" % "Pearson r")
-                outputfile.write("%s\t" % "Pearson p")
-                outputfile.write("%s\t" % "Spearman r")
-                outputfile.write("%s\t" % "Spearman p")
+                outputfile.write("%s\t" % len(keys))
+                outputfile.write("%s\t" % rs[0][0])
+                outputfile.write("%s\t" % rs[0][1])
+                outputfile.write("%s\t" % rs[1][0])
+                outputfile.write("%s\t" % rs[1][1])
                 outputfile.write("\n")
                 outputfile.flush()
         #