correctly write best MixtureFinder model info (k-class) to checkpoint rather than (k+1-class)

Author: HuaiyanRen

main/phylotesting.cpp

@@ -6868,7 +6868,9 @@ double runMixtureFinderMain(Params &params, IQTree* &iqtree, ModelCheckpoint &mo
     string best_model_AIC, best_model_AICc, best_model_BIC;
     double best_score_AIC, best_score_AICc, best_score_BIC;
     // Store the information of (k-1)-class models. Once (k-1)-class is better then k-class, the (k-1)-class models will be printed out as the global best.
-    string best_model_pre_AIC, best_model_pre_AICc, best_model_pre_BIC, best_model_pre_list;
+    string best_model_AIC_pre, best_model_AICc_pre, best_model_BIC_pre, best_model_list_pre;
+    string best_score_AIC_pre, best_score_AICc_pre, best_score_BIC_pre, best_tree_AIC_pre, best_tree_AICc_pre, best_tree_BIC_pre;
+
     Checkpoint *checkpoint;
     int ssize;
     int curr_df;
@@ -6948,10 +6950,17 @@ double runMixtureFinderMain(Params &params, IQTree* &iqtree, ModelCheckpoint &mo
 
     cout << endl << "Model: " << best_subst_name << best_rate_name << "; df: " << curr_df << "; loglike: " << curr_loglike << "; " << criteria_str << " score: " << curr_score << endl;
 
-    model_info.getString("best_model_AIC", best_model_pre_AIC);
-    model_info.getString("best_model_AICc", best_model_pre_AICc);
-    model_info.getString("best_model_BIC", best_model_pre_BIC);
-    model_info.getString("best_model_list_" + criteria_str, best_model_pre_list);
+    model_info.getString("best_model_AIC", best_model_AIC_pre);
+    model_info.getString("best_model_AICc", best_model_AICc_pre);
+    model_info.getString("best_model_BIC", best_model_BIC_pre);
+    model_info.getString("best_model_list_" + criteria_str, best_model_list_pre);
+    model_info.getString("best_score_AIC", best_score_AIC_pre);
+    model_info.getString("best_score_AICc", best_score_AICc_pre);
+    model_info.getString("best_score_BIC", best_score_BIC_pre);
+    model_info.getString("best_tree_AIC", best_tree_AIC_pre);
+    model_info.getString("best_tree_AICc", best_tree_AICc_pre);
+    model_info.getString("best_tree_BIC", best_tree_BIC_pre);
+
 
     // Step 3: keep adding a new class until no further improvement
     if (params.opt_qmix_criteria == 1) {
@@ -6996,18 +7005,29 @@ double runMixtureFinderMain(Params &params, IQTree* &iqtree, ModelCheckpoint &mo
             curr_score = best_model.getScore();
             model_str = best_subst_name;
 
-            model_info.getString("best_model_AIC", best_model_pre_AIC);
-            model_info.getString("best_model_AICc", best_model_pre_AICc);
-            model_info.getString("best_model_BIC", best_model_pre_BIC);
-            model_info.getString("best_model_list_" + criteria_str, best_model_pre_list);
-
+            model_info.getString("best_model_AIC", best_model_AIC_pre);
+            model_info.getString("best_model_AICc", best_model_AICc_pre);
+            model_info.getString("best_model_BIC", best_model_BIC_pre);
+            model_info.getString("best_model_list_" + criteria_str, best_model_list_pre);
+            model_info.getString("best_score_AIC", best_score_AIC_pre);
+            model_info.getString("best_score_AICc", best_score_AICc_pre);
+            model_info.getString("best_score_BIC", best_score_BIC_pre);
+            model_info.getString("best_tree_AIC", best_tree_AIC_pre);
+            model_info.getString("best_tree_AICc", best_tree_AICc_pre);
+            model_info.getString("best_tree_BIC", best_tree_BIC_pre);
         }
     } while (better_model && getClassNum(best_subst_name)+1 <= params.max_mix_cats);
 
-    model_info.put("best_model_list_" + criteria_str, best_model_pre_list);
-    model_info.put("best_model_AIC", best_model_pre_AIC);
-    model_info.put("best_model_AICc", best_model_pre_AICc);
-    model_info.put("best_model_BIC", best_model_pre_BIC);
+    model_info.put("best_model_AIC", best_model_AIC_pre);
+    model_info.put("best_model_AICc", best_model_AICc_pre);
+    model_info.put("best_model_BIC", best_model_BIC_pre);
+    model_info.put("best_model_list_" + criteria_str, best_model_list_pre);
+    model_info.put("best_score_AIC", best_score_AIC_pre);
+    model_info.put("best_score_AICc", best_score_AICc_pre);
+    model_info.put("best_score_BIC", best_score_BIC_pre);
+    model_info.put("best_tree_AIC", best_tree_AIC_pre);
+    model_info.put("best_tree_AICc", best_tree_AICc_pre);
+    model_info.put("best_tree_BIC", best_tree_BIC_pre);
 
     best_subst_name = model_str;
     if (params.optimize_from_given_params == false)