Merge pull request #167 from revbayes/multitrace

Improved combining of multiple tree traces
revbayes · Sep 11, 2019 · 9afdfe3 · 9afdfe3
2 parents e2f9250 + b69374b
commit 9afdfe3
Show file tree

Hide file tree

Showing 36 changed files with 2,694 additions and 2,424 deletions.
diff --git a/src/core/analysis/mcmc/Mcmc.cpp b/src/core/analysis/mcmc/Mcmc.cpp
@@ -351,7 +351,7 @@ void Mcmc::finishMonitors( size_t n_reps, MonteCarloAnalysisOptions::TraceCombin
             monitors[i].closeStream();
 
             // combine results if we used more than one replicate
-            if ( n_reps > 1 )
+            if ( n_reps > 1 && tc != MonteCarloAnalysisOptions::NONE )
             {
                 monitors[i].combineReplicates( n_reps, tc );
             }

diff --git a/src/core/analysis/mcmc/output/Trace.h b/src/core/analysis/mcmc/output/Trace.h
@@ -50,6 +50,7 @@ class Serializable;
         virtual void                    addObject(valueType* d);
         virtual bool                    isCoveredInInterval(const std::string &v, double i, bool verbose);
         bool                            isDirty(void) const                             { return dirty; };
+        void                            isDirty(bool d) const                             { dirty = d; };
         void                            removeLastObject();
         void                            removeObjectAtIndex(int index);