Skip to content

Commit

Permalink
Merge pull request #627 from molpopgen/simplification_timing
Browse files Browse the repository at this point in the history
  • Loading branch information
molpopgen committed Jan 13, 2021
2 parents a51c7f8 + d2b3e61 commit 1b58972
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion fwdpy11/src/evolve_population/with_tree_sequences.cc
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@ evolve_with_tree_sequences(
}

std::vector<fwdpp::ts::table_index_t> alive_at_last_simplification(pop.alive_nodes);
new_edge_buffer->reset(alive_at_last_simplification.size());

for (std::uint32_t gen = 0; gen < simlen && !stopping_criteron_met; ++gen)
{
Expand Down Expand Up @@ -437,7 +438,7 @@ evolve_with_tree_sequences(
throw ddemog::GlobalExtinction(o.str());
}

if (gen > 0 && gen % simplification_interval == 0.0)
if (gen % simplification_interval == 0.0)
{
simplification_rv = simplification(
preserve_selected_fixations, simulating_neutral_variants,
Expand Down

0 comments on commit 1b58972

Please sign in to comment.