Skip to content

Commit 5b2ab73

Browse files
committed
revert to the old mergeTwoLowers
1 parent bc72ccf commit 5b2ab73

File tree

2 files changed

+55
-109
lines changed

2 files changed

+55
-109
lines changed

alignment/seqregions.cpp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -389,8 +389,6 @@ void cmaple::merge_identicalRACGT_TwoLowers(
389389
const PositionType end_pos,
390390
RealNumType total_blength_1,
391391
RealNumType total_blength_2,
392-
const cmaple::RealNumType blength_1,
393-
const cmaple::RealNumType blength_2,
394392
const PositionType pos,
395393
const RealNumType threshold_prob,
396394
const ModelBase* model,
@@ -416,14 +414,8 @@ void cmaple::merge_identicalRACGT_TwoLowers(
416414
}
417415

418416
if (seq1_region.type == TYPE_R) {
419-
const RealNumType tmp_blength_1 = blength_1 > 0 ? blength_1 : 0;
420-
const RealNumType tmp_blength_2 = blength_2 > 0 ? blength_2 : 0;
421-
422-
if (total_blength_1 > tmp_blength_1 || total_blength_2 > tmp_blength_2)
423-
{
424-
log_lh += (total_blength_1 - tmp_blength_1 + total_blength_2 - tmp_blength_2) *
425-
(cumulative_rate[end_pos + 1] - cumulative_rate[pos]);
426-
}
417+
log_lh += (total_blength_1 + total_blength_2) *
418+
(cumulative_rate[end_pos + 1] - cumulative_rate[pos]);
427419
} else {
428420
log_lh += model->diagonal_mut_mat[seq1_region.type] *
429421
(total_blength_1 + total_blength_2);

0 commit comments

Comments
 (0)