redundantly passing in parental metadata

molpopgen · Aug 16, 2023 · 1efd8a3 · 1efd8a3
1 parent 162711b
commit 1efd8a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/lib/evolve_discrete_demes/evolve_generation_ts.hpp b/lib/evolve_discrete_demes/evolve_generation_ts.hpp
@@ -185,7 +185,6 @@ evolve_generation_ts(
     const fwdpy11_core::discrete_demography::multideme_fitness_bookmark&
         fitness_bookmark,
     const fwdpp::uint_t generation,
-    const std::vector<fwdpy11::DiploidMetadata>& parental_metadata,
     fwdpp::ts::edge_buffer& new_edge_buffer,
     std::vector<fwdpy11::DiploidGenotype>& offspring,
     std::vector<fwdpy11::DiploidMetadata>& offspring_metadata, std::int32_t next_index,
@@ -237,7 +236,7 @@ evolve_generation_ts(
                             auto pdata = fwdpy11_core::discrete_demography::pick_parents(
                                 rng, offspring_deme_index, demography,
                                 ancestor_deme_lookup, fitness_bookmark, fitness_lookup,
-                                parental_metadata, allow_residual_selfing);
+                                pop.diploid_metadata, allow_residual_selfing);
                             fwdpy11::DiploidGenotype dip{
                                 std::numeric_limits<std::size_t>::max(),
                                 std::numeric_limits<std::size_t>::max()};

diff --git a/lib/evolve_discrete_demes/evolvets.cc b/lib/evolve_discrete_demes/evolvets.cc
@@ -462,7 +462,7 @@ evolve_with_tree_sequences(
             ++pop.generation;
             evolve_generation_ts(rng, pop, genetics, demography, fitness_lookup,
                                  fitness_bookmark, // miglookup,
-                                 pop.generation, pop.diploid_metadata, *new_edge_buffer,
+                                 pop.generation, *new_edge_buffer,
                                  offspring, offspring_metadata, next_index,
                                  next_offspring_id, options.allow_residual_selfing);
             next_offspring_id += static_cast<std::int64_t>(offspring_metadata.size());