Skip to content

Commit

Permalink
update to use dispatch of methods in rules type
Browse files Browse the repository at this point in the history
  • Loading branch information
molpopgen committed Jun 22, 2016
1 parent a3142ed commit e737f44
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions fwdpp/experimental/sample_diploid_mloc.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#ifndef __FWDPP_EXPERIMENTAL_SAMPLE_DIPLOID_MLOC_HPP__
#define __FWDPP_EXPERIMENTAL_SAMPLE_DIPLOID_MLOC_HPP__

#include <fwdpp/experimental/dispatch.hpp>

namespace KTfwd
{
namespace experimental
Expand Down Expand Up @@ -132,7 +134,7 @@ namespace KTfwd
auto gamete_recycling_bin = fwdpp_internal::make_gamete_queue(gametes);
auto mutation_recycling_bin = fwdpp_internal::make_mut_queue(mcounts);

rules.w(diploids,gametes,mutations,ff);
dispatch_w(rules,diploids,gametes,mutations,ff);

const auto parents(diploids); //copy the parents

Expand All @@ -157,7 +159,7 @@ namespace KTfwd
((gsl_rng_uniform(r)<0.5)?1:0),
gametes,mutations,neutral,selected,mu,mmodel,gpolicy_mut
);
rules.update(r,dip,parents[p1],parents[p2],gametes,mutations);
dispatch_update(rules,r,dip,parents[p1],parents[p2],gametes,mutations,ff);
}
fwdpp_internal::process_gametes(gametes,mutations,mcounts);
assert(popdata_sane(diploids,gametes,mutations,mcounts));
Expand Down

0 comments on commit e737f44

Please sign in to comment.