fix a bug about partitionfinder greedy algorithm

HuaiyanRen · HuaiyanRen · commit cf8e813fccb9 · 2026-01-15T15:23:30.000+11:00
diff --git a/main/phylotesting.cpp b/main/phylotesting.cpp
@@ -4061,6 +4061,8 @@ void PartitionFinder::retreiveAnsFrChkpt(vector<pair<int,double> >& jobs, int jo
                     //cur_pair.distance = closest_pairs[pair].distance;
                     //cur_pair.score_bic = computeInformationScore(lhnew, dfnew, ssize, MTC_BIC);
                     sorted_pairs.insertPair(cur_pair);
+                } else if (params->partition_merge == MERGE_GREEDY) {
+                    better_pairs.insertPair(cur_pair);
                 }
 
                 to_delete.push_back(1);
@@ -4348,7 +4350,7 @@ ModelPairSet PartitionFinder::getBetterPairsmAIC() {
         }
     }
 
-    if (params->partition_merge == MERGE_GREEDY && better_pairs.size() > 0) {
+    if (params->partition_merge == MERGE_GREEDY && cur_better_pairs.size() > 0) {
         auto it = cur_better_pairs.begin();
         int cur_df = dfsum - dfvec[it->second.part1] - dfvec[it->second.part2] + it->second.df;
         cout << "Merging " << it->second.set_name << " with mAIC score: " << greedy_score_maic

Original file line number	Diff line number	Diff line change
`@@ -4061,6 +4061,8 @@ void PartitionFinder::retreiveAnsFrChkpt(vector<pair<int,double> >& jobs, int jo`
`4061`	`4061`	`//cur_pair.distance = closest_pairs[pair].distance;`
`4062`	`4062`	`//cur_pair.score_bic = computeInformationScore(lhnew, dfnew, ssize, MTC_BIC);`
`4063`	`4063`	`sorted_pairs.insertPair(cur_pair);`
	`4064`	`+ } else if (params->partition_merge == MERGE_GREEDY) {`
	`4065`	`+ better_pairs.insertPair(cur_pair);`
`4064`	`4066`	`}`
`4065`	`4067`
`4066`	`4068`	`to_delete.push_back(1);`
`@@ -4348,7 +4350,7 @@ ModelPairSet PartitionFinder::getBetterPairsmAIC() {`
`4348`	`4350`	`}`
`4349`	`4351`	`}`
`4350`	`4352`
`4351`		`- if (params->partition_merge == MERGE_GREEDY && better_pairs.size() > 0) {`
	`4353`	`+ if (params->partition_merge == MERGE_GREEDY && cur_better_pairs.size() > 0) {`
`4352`	`4354`	`auto it = cur_better_pairs.begin();`
`4353`	`4355`	`int cur_df = dfsum - dfvec[it->second.part1] - dfvec[it->second.part2] + it->second.df;`
`4354`	`4356`	`cout << "Merging " << it->second.set_name << " with mAIC score: " << greedy_score_maic`