Switch to manual lambdas

devosoft · Nov 24, 2023 · d0fe272 · d0fe272
1 parent 48789ef
commit d0fe272
Showing 1 changed file with 30 additions and 9 deletions.
diff --git a/avida-core/source/actions/PopulationActions.cc b/avida-core/source/actions/PopulationActions.cc
@@ -5289,9 +5289,14 @@ class cActionKillDemesHighestParasiteLoad : public cAction
     std::vector<int> deme_indices(num_demes);
     std::iota(std::begin(deme_indices), std::end(deme_indices), 0);
 
+    struct HasAny {
+      cPopulation& pop;
+      HasAny(cPopulation& pop) : pop(pop) {}
+      bool operator()(const int d){ return not pop.GetDeme(d).IsEmpty(); }
+    };
     const int num_eligible = std::count_if(
       std::begin(deme_indices), std::end(deme_indices),
-      [&](const int d) { return not pop.GetDeme(d).IsEmpty(); }
+      HasAny(pop)
     );
     const int binomial_draw = ctx.GetRandom().GetRandBinomial(
       num_eligible,
@@ -5302,26 +5307,42 @@ class cActionKillDemesHighestParasiteLoad : public cAction
       std::cout << "warning: capped kill quota at " << kill_quota << " from " << binomial_draw << " binomial sample with " << num_eligible << " eligible and kill prob " << m_killprob << std::endl;
     }
 
+    struct GetParasiteLoad {
+      cPopulation& pop;
+      GetParasiteLoad(cPopulation& pop) : pop(pop) {}
+      double operator()(const int d){ return pop.GetDeme(d).GetParasiteLoad(); }
+    };
     std::vector<double> parasite_loads(num_demes);
     std::transform(
       std::begin(deme_indices), std::end(deme_indices),
       std::begin(parasite_loads),
-      [&](const int d) { return pop.GetDeme(d).GetParasiteLoad(); }
+      GetParasiteLoad(pop)
     );
 
-    std::partial_sort(
-      std::begin(deme_indices),
-      std::next(std::begin(deme_indices), kill_quota),
-      std::end(deme_indices),
-      [&](const int d1, const int d2) {
-        return parasite_loads[d1] > parasite_loads[d2];
+    struct Comp {
+      std::vector<double>& loads;
+      Comp(std::vector<double> &loads) : loads(loads) {}
+      bool operator()(const int d1, const int d2) {
+        return loads[d1] > loads[d2];
       }
+    };
+    std::partial_sort(
+        std::begin(deme_indices),
+        std::next(std::begin(deme_indices), kill_quota),
+        std::end(deme_indices),
+        Comp(parasite_loads)
     );
 
+    struct DoKill {
+      cPopulation& pop;
+      cAvidaContext& ctx;
+      DoKill(cPopulation& pop, cAvidaContext& ctx) : pop(pop), ctx(ctx) {}
+      void operator()(const int d) { pop.GetDeme(d).KillAll(ctx); }
+    };
     std::for_each(
       std::begin(deme_indices),
       std::next(std::begin(deme_indices), kill_quota),
-      [&](const int d) { pop.GetDeme(d).KillAll(ctx); }
+      DoKill(pop, ctx)
     );
 
 } // End Process()