Fix crash with -mtree

Cibiv · Dec 21, 2017 · 0d2cc01 · 0d2cc01
1 parent 08073e9
commit 0d2cc01
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 13 deletions.
diff --git a/main/phylotesting.cpp b/main/phylotesting.cpp
@@ -1297,12 +1297,12 @@ string testOneModel(string &model_name, Params &params, Alignment *in_aln,
 //        iqtree->num_precision = in_tree->num_precision;
 
         // clear all checkpointed information
-        Checkpoint *newCheckpoint = new Checkpoint;
-        iqtree->getCheckpoint()->getSubCheckpoint(newCheckpoint, "iqtree");
-        iqtree->getCheckpoint()->clear();
-        iqtree->getCheckpoint()->insert(newCheckpoint->begin(), newCheckpoint->end());
-        delete newCheckpoint;
-        
+//        Checkpoint *newCheckpoint = new Checkpoint;
+//        iqtree->getCheckpoint()->getSubCheckpoint(newCheckpoint, "iqtree");
+//        iqtree->getCheckpoint()->clear();
+//        iqtree->getCheckpoint()->insert(newCheckpoint->begin(), newCheckpoint->end());
+//        delete newCheckpoint;
+
         cout << endl << "===> Testing model " << model_name << endl;
 
         if (iqtree->root) {
@@ -1326,13 +1326,17 @@ string testOneModel(string &model_name, Params &params, Alignment *in_aln,
         params.stop_condition = orig_stop_condition;
 
         // clear all checkpointed information
-        newCheckpoint = new Checkpoint;
-        iqtree->getCheckpoint()->getSubCheckpoint(newCheckpoint, "iqtree");
-        iqtree->getCheckpoint()->clear();
-        iqtree->getCheckpoint()->insert(newCheckpoint->begin(), newCheckpoint->end());
-        iqtree->getCheckpoint()->putBool("finished", false);
-        iqtree->getCheckpoint()->dump(true);
-        delete newCheckpoint;
+//        newCheckpoint = new Checkpoint;
+//        iqtree->getCheckpoint()->getSubCheckpoint(newCheckpoint, "iqtree");
+//        iqtree->getCheckpoint()->clear();
+//        iqtree->getCheckpoint()->insert(newCheckpoint->begin(), newCheckpoint->end());
+//        iqtree->getCheckpoint()->putBool("finished", false);
+//        iqtree->getCheckpoint()->dump(true);
+//        delete newCheckpoint;
+
+        int count = iqtree->getCheckpoint()->eraseKeyPrefix("finished");
+        cout << count << " finished checkpoint entries erased" << endl;
+
 
     } else {
         //--- FIX TREE TOPOLOGY AND ESTIMATE MODEL PARAMETERS ----//

diff --git a/utils/checkpoint.cpp b/utils/checkpoint.cpp
@@ -183,6 +183,22 @@ bool Checkpoint::hasKeyPrefix(string key_prefix) {
     return false;
 }
 
+int Checkpoint::eraseKeyPrefix(string key_prefix) {
+    int count = 0;
+    iterator first_it = lower_bound(key_prefix);
+    iterator i;
+	for (i = first_it; i != end(); i++) {
+        if (i->first.compare(0, key_prefix.size(), key_prefix) == 0)
+            count++;
+        else
+            break;
+
+    }
+    if (count)
+        erase(first_it, i);
+    return count;
+}
+
 /*-------------------------------------------------------------
  * series of get function to get value of a key
  *-------------------------------------------------------------*/

diff --git a/utils/checkpoint.h b/utils/checkpoint.h
@@ -131,6 +131,13 @@ class Checkpoint : public map<string, string> {
 	 */
 	bool hasKeyPrefix(string key_prefix);
 
+    /**
+        erase all entries with a key prefix
+        @param key_prefix key prefix
+        @return number of entries removed
+    */
+    int eraseKeyPrefix(string key_prefix);
+
     /*-------------------------------------------------------------
      * series of get function to get value of a key
      *-------------------------------------------------------------*/