add check for compress data

[mrbayes.git] / src / model.c

diff --git a/src/model.c b/src/model.c
index 8cde2801f814307a7c88c0d89e287efec322664a..8836a351da3ad36974b21e523c7de798abf25c37 100644 (file)
--- a/src/model.c
+++ b/src/model.c
@@ -19897,6 +19897,7 @@ int SetUpAnalysis (RandLong *seed)
         return (ERROR);
         }
 
+    MrBayesPrint ("%s   Local taxa set\n", spacer);
     /* calculate number of global chains */
     numGlobalChains = chainParams.numRuns * chainParams.numChains;
 
@@ -19908,18 +19909,22 @@ int SetUpAnalysis (RandLong *seed)
     if (CheckExpandedModels() == ERROR)
         return (ERROR);
 
+    MrBayesPrint ("%s   ExpandedModels checked\n", spacer);
     /* Set up model info */
     if (SetModelInfo() == ERROR) 
         return (ERROR);
     
+    MrBayesPrint ("%s   SetModelInfo\n", spacer);
     /* Calculate number of (uncompressed) characters for each division */
     if (GetNumDivisionChars() == ERROR)
         return (ERROR);
 
+    MrBayesPrint ("%s   GetNumDivisionChars\n", spacer);
     /* Compress data and calculate some things needed for setting up params. */
     if (CompressData() == ERROR)
         return (ERROR);
 
+    MrBayesPrint ("%s   Compressed Data\n", spacer);
     /* Add dummy characters, if needed. */
     if (AddDummyChars() == ERROR)
         return (ERROR);
@@ -19928,14 +19933,17 @@ int SetUpAnalysis (RandLong *seed)
     if (SetModelParams () == ERROR)
         return (ERROR);
     
+    MrBayesPrint ("%s   Model Params Set\n", spacer);
     /* Allocate normal params */
     if (AllocateNormalParams () == ERROR)
         return (ERROR);
     
+    MrBayesPrint ("%s   Normal Params allocated\n", spacer);
     /* Allocate tree params */
     if (AllocateTreeParams () == ERROR)
         return (ERROR);
     
+    MrBayesPrint ("%s   Tree Params allocated\n", spacer);
     /* Set default number of trees for sumt to appropriate number */
     sumtParams.numTrees = numTrees;
 
@@ -19943,6 +19951,7 @@ int SetUpAnalysis (RandLong *seed)
     if (FillNormalParams (seed, 0, numGlobalChains) == ERROR) 
         return (ERROR);
 
+    MrBayesPrint ("%s   Normal parameters filled\n", spacer);
     /* Process standard characters (calculates bsIndex, tiIndex, and more). */
     if (ProcessStdChars(seed) == ERROR)
         return (ERROR);
@@ -19951,6 +19960,7 @@ int SetUpAnalysis (RandLong *seed)
     if (FillTreeParams (seed, 0, numGlobalChains) == ERROR)
         return (ERROR);
     
+    MrBayesPrint ("%s   Tree params filled\n", spacer);
     /* Set the applicable moves that could be used by the chain. */
     if (SetMoves () == ERROR)
         return (ERROR);