Merge /home/zas1024/gene

Conflicts:
	wqflask/wqflask/static/new/javascript/dataset_select_menu.js
	wqflask/wqflask/templates/corr_scatter_plot_old.html

1 files changed, 28 insertions, 0 deletions

diff --git a/wqflask/output/HLC_output1.log.txt b/wqflask/output/HLC_output1.log.txt
new file mode 100755
index 00000000..e8461e91
--- /dev/null
+++ b/wqflask/output/HLC_output1.log.txt
@@ -0,0 +1,28 @@
+##
+## GEMMA Version = 0.94
+##
+## Command Line Input = -bfile /home/zas1024/gene/web/gemma/HLC -k ../web/gemma/output_HLC.cXX.txt -lmm 1 -o HLC_output1 
+##
+## Summary Statistics:
+## number of total individuals = 427
+## number of analyzed individuals = 427
+## number of covariates = 1
+## number of phenotypes = 1
+## number of total SNPs = 358499
+## number of analyzed SNPs = 273349
+## REMLE log-likelihood in the null model = -3657.8
+## MLE log-likelihood in the null model = -3665.89
+## pve estimate in the null model = 3.30749e-06
+## se(pve) in the null model = nan
+## vg estimate in the null model = 16.8101
+## ve estimate in the null model = 1.68101e+06
+## beta estimate in the null model =   890.587
+## se(beta) =   62.7439
+##
+## Computation Time:
+## total computation time = 1.857 min 
+## computation time break down: 
+##      time on eigen-decomposition = 0.0015 min 
+##      time on calculating UtX = 0.406 min 
+##      time on optimization = 1.30517 min 
+##