Skip to content

Commit e9eff5b

Browse files
Merge pull request #172 from smithlabcode/round-three-silence-more-warnings
Third round of trying to silence compiler warnings before v1.4.2
2 parents 356ac7f + 2115380 commit e9eff5b

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

src/common/TwoStateHMM.cpp

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -538,10 +538,12 @@ TwoStateHMM::PosteriorScores(const vector<pair<double, double> > &values,
538538
get_emissions(begin(values), end(values), begin(bg_emit), bg_distro);
539539

540540
for (size_t i = 0; i < reset_points.size() - 1; ++i) {
541+
#ifndef NDEBUG
541542
const double score =
542-
forward_algorithm(reset_points[i], reset_points[i + 1],
543-
lp_sf, lp_sb, lp_ff, lp_fb, lp_bf, lp_bb,
544-
fg_emit, bg_emit, forward);
543+
#endif
544+
forward_algorithm(reset_points[i], reset_points[i + 1],
545+
lp_sf, lp_sb, lp_ff, lp_fb, lp_bf, lp_bb,
546+
fg_emit, bg_emit, forward);
545547

546548
#ifndef NDEBUG
547549
const double backward_score =
@@ -618,10 +620,12 @@ TwoStateHMM::TransitionPosteriors(const vector<pair<double, double> > &values,
618620
get_emissions(begin(values), end(values), begin(bg_emit), bg_distro);
619621

620622
for (size_t i = 0; i < reset_points.size() - 1; ++i) {
623+
#ifndef NDEBUG
621624
const double score =
622-
forward_algorithm(reset_points[i], reset_points[i + 1],
623-
lp_sf, lp_sb, lp_ff, lp_fb, lp_bf, lp_bb,
624-
fg_emit, bg_emit, forward);
625+
#endif
626+
forward_algorithm(reset_points[i], reset_points[i + 1],
627+
lp_sf, lp_sb, lp_ff, lp_fb, lp_bf, lp_bb,
628+
fg_emit, bg_emit, forward);
625629

626630
#ifndef NDEBUG
627631
const double backward_score =
@@ -1069,10 +1073,12 @@ TwoStateHMM::PosteriorScores(const vector<vector<pair<double, double> > > &value
10691073
get_emissions_rep(values, bg_emit, bg_distro);
10701074

10711075
for (size_t i = 0; i < reset_points.size() - 1; ++i) {
1076+
#ifndef NDEBUG
10721077
const double score =
1073-
forward_algorithm(reset_points[i], reset_points[i + 1],
1074-
lp_sf, lp_sb, lp_ff, lp_fb, lp_bf, lp_bb,
1075-
fg_emit, bg_emit, forward);
1078+
#endif
1079+
forward_algorithm(reset_points[i], reset_points[i + 1],
1080+
lp_sf, lp_sb, lp_ff, lp_fb, lp_bf, lp_bb,
1081+
fg_emit, bg_emit, forward);
10761082

10771083
#ifndef NDEBUG
10781084
const double backward_score =
@@ -1116,7 +1122,6 @@ TwoStateHMM::PosteriorDecoding(const vector<vector<pair<double, double> > > &val
11161122

11171123
double total_loglik = 0;
11181124
for (size_t i = 0; i < reset_points.size() - 1; ++i) {
1119-
11201125
const double score =
11211126
forward_algorithm(reset_points[i], reset_points[i + 1],
11221127
lp_sf, lp_sb, lp_ff, lp_fb, lp_bf, lp_bb,

0 commit comments

Comments
 (0)