changed BIC complexity to be less conservative

ivazquez · Feb 26, 2014 · 42a0d7d · 42a0d7d
1 parent 632991b
commit 42a0d7d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/run-example.sh b/run-example.sh
@@ -56,7 +56,7 @@ then
 ### cloneHD ###
     echo "*** cloneHD ***"
     echo
-    cmd="$cloneHD --cna $tumorCNA --baf $tumorBAF --pre ${results}/tumor --bias $bias --seed 123 --trials 1\
+    cmd="$cloneHD --cna $tumorCNA --baf $tumorBAF --pre ${results}/tumor --bias $bias --seed 123 --trials 3\
  --nmax 3 --force --max-tcn 4 --cna-jumps $tumorCNAjumps --baf-jumps $tumorBAFjumps --min-jump 0.01 --restarts 20"    
     echo $cmd
     $cmd

diff --git a/src/clone.cpp b/src/clone.cpp
@@ -540,6 +540,7 @@ void Clone::get_complexity(){
     for (int j=0; j<nClones; j++){
       val *= (double) maxtcn_per_clone[chr][j] + 1;
     }
+    val -= 1.0;
     if (cnaEmit->is_set && cnaEmit->chrs.count(chr)==1){
       cnaC += val*double(cnaEmit->nSites[cnaEmit->idx_of[chr]]);
       cnaN += double(cnaEmit->nSites[cnaEmit->idx_of[chr]]);      
@@ -559,11 +560,11 @@ void Clone::get_complexity(){
     complexity += cnaC / cnaN;
     size += cnaN;
   }
-  if (bafEmit->is_set){
+  /*if (bafEmit->is_set){
     complexity += bafC / bafN;
     size += bafN;
-  }
-  if (snvEmit->is_set){
+    }*/
+  else if (snvEmit->is_set){
     complexity += snvC / snvN;
     size += snvN;
     if (learn_priors){