fixed tree output in IC computation with partial gene trees

stamatak · Jun 28, 2017 · 197c7c5 · 197c7c5
1 parent 257d3ca
commit 197c7c5
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/README b/README
@@ -1,4 +1,4 @@
-Standard RAxML version 8.2.10
+Standard RAxML version 8.2.11
 
 ============================================================================================================
 

diff --git a/axml.c b/axml.c
@@ -7887,7 +7887,8 @@ void printBipartitionResult(tree *tr, analdef *adef, boolean finalPrint, boolean
 	  fprintf(logFile, "%s", tr->tree_string);
 	  fclose(logFile);
 	}
-
+
+
       Tree2String(tr->tree_string, tr, tr->start->back, FALSE, TRUE, FALSE, FALSE, finalPrint, adef, NO_BRANCHES, TRUE, FALSE, printIC, FALSE);
 
 

diff --git a/axml.h b/axml.h
@@ -168,9 +168,9 @@
 #define PointGamma(prob,alpha,beta)  PointChi2(prob,2.0*(alpha))/(2.0*(beta))
 
 #define programName        "RAxML"
-#define programVersion     "8.2.10"
-#define programVersionInt   8210
-#define programDate        "March 2017"
+#define programVersion     "8.2.11"
+#define programVersionInt   8211
+#define programDate        "June 2017"
 
 
 #define  TREE_EVALUATION                 0

diff --git a/bipartitionList.c b/bipartitionList.c
@@ -1833,7 +1833,7 @@ void calcBipartitions_IC_Global(tree *tr, analdef *adef, char *bestTreeFileName,
 {
   int    
     numberOfTrees,
-    numberOfTaxa = readSingleTree(tr, bestTreeFileName, adef, FALSE, FALSE, TRUE);
+    numberOfTaxa = readSingleTree(tr, bestTreeFileName, adef, TRUE, FALSE, TRUE);
 
   FILE 
     *treeFile; 

diff --git a/models.c b/models.c
@@ -4118,7 +4118,7 @@ void makeGammaCats(int rateHetModel, double alpha, double *gammaRates, int K, bo
       for (i = 0; i < K; i++)
         gammaRates[i] *= scaler;
     }
-
+     
 
   rax_free(gammaProbs);
 

diff --git a/treeIO.c b/treeIO.c
@@ -1103,8 +1103,8 @@ static boolean addElementLen (FILE *fp, tree *tr, nodeptr p, boolean readBranchL
     }
   else 
     {   
-      ungetc(ch, fp);
-      if ((n = treeFindTipName(fp, tr, TRUE)) <= 0)          return FALSE;
+      ungetc(ch, fp);    
+      if ((n = treeFindTipName(fp, tr, TRUE)) <= 0)          return FALSE;     
       q = tr->nodep[n];
       if (tr->start->number > n)  tr->start = q;
       (tr->ntips)++;