Skip to content

Commit

Permalink
Clean up quickanalyze comments and error outputs. #1
Browse files Browse the repository at this point in the history
  • Loading branch information
cnettel committed Apr 25, 2016
1 parent 378f6ec commit 5ae0d69
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions cnF2freq.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1434,15 +1434,12 @@ struct individ
}
else
{
//printf("Not a quick end %d %d\n", startmark, stopdata.getgenotype(startmark));
factor += realanalyze<0, T>(tb, turner, startmark, startmark + stepsize, stopdata, flag2, ruleout, &probs);
}

// This will work.
if (!_finite(factor) || factor <= minfactor)
{
// if (startmark) printf("%d;%d;%d : %lf\n", n, shiftflagmode, startmark, factor);
if (!_finite(factor)) printf("Non-finiteA %d %d\n", n, startmark);
{
if (!_finite(factor)) fprintf(stderr, "Non-finiteA %d %d\n", n, startmark);
return MINFACTOR;
}
if (willquickend)
Expand All @@ -1461,7 +1458,6 @@ struct individ
tb.quickendprobs[*tb.shiftflagmode][genotype][genotype] = 1.0;
double superfactor = realanalyze<0 | 2, T>(tb, turner, startmark, startmark + stepsize, NONESTOP, -1, ruleout, &tb.quickendprobs[*tb.shiftflagmode][genotype]);

// printf("Setting!\n");
superfactor += quickanalyze<true, T>(tb, turner, startmark + stepsize, endmark, NONESTOP, flag2, ruleout, tb.quickendprobs[*tb.shiftflagmode][genotype],
// all uses of this precalced data will have the
// quickfactor component in common, so taking that
Expand Down Expand Up @@ -1506,7 +1502,7 @@ struct individ

if (!_finite(factor) || factor <= minfactor)
{
if (!_finite(factor)) printf("Non-finiteB %d %d\n", n, startmark);
if (!_finite(factor)) fprintf(stderr, "Non-finiteB %d %d\n", n, startmark);
if (!frommem && !stopdata.okstep(startmark, endmark))
{
tb.quickgen[*tb.shiftflagmode] = *tb.generation;
Expand Down

0 comments on commit 5ae0d69

Please sign in to comment.