import of new C++ type works

molpopgen · Aug 18, 2023 · 51c5aec · 51c5aec
1 parent 4c80e57
commit 51c5aec
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 1 deletion.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -54,6 +54,7 @@ set(GENETIC_VALUE_TO_FITNESS_SOURCES
     genetic_value_to_fitness/GeneticValueIsFitness.cc
     genetic_value_to_fitness/GeneticValueIsTrait.cc
     genetic_value_to_fitness/GSSmo.cc
+    genetic_value_to_fitness/GaussianStabilizingSelection.cc
     genetic_value_to_fitness/MultivariateGSSmo.cc
     genetic_value_to_fitness/Optimum.cc
     genetic_value_to_fitness/PleiotropicOptima.cc)

diff --git a/cpp/genetic_value_to_fitness/GaussianStabilizingSelection.cc b/cpp/genetic_value_to_fitness/GaussianStabilizingSelection.cc
@@ -0,0 +1,19 @@
+#include <tuple>
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+#include <fwdpy11/genetic_value_to_fitness/GaussianStabilizingSelection.hpp>
+
+namespace py = pybind11;
+
+void
+init_GaussianStabilizingSelection(py::module& m)
+{
+    py::class_<fwdpy11::GaussianStabilizingSelection, fwdpy11::GeneticValueIsTrait>(
+        m, "_ll_GaussianStabilizingSelection")
+        .def(py::init([](const fwdpy11::GSSmo& single_trait) {
+            return fwdpy11::GaussianStabilizingSelection(single_trait);
+        }))
+        .def(py::init([](const fwdpy11::MultivariateGSSmo& pleiotropy) {
+            return fwdpy11::GaussianStabilizingSelection(pleiotropy);
+        }));
+}
diff --git a/cpp/genetic_value_to_fitness/init.cc b/cpp/genetic_value_to_fitness/init.cc
@@ -11,6 +11,7 @@ void init_GeneticValueToFitnessMap(py::module&);
 void init_GeneticValueIsTrait(py::module&);
 void init_GeneticValueIsFitness(py::module&);
 void init_GSSmo(py::module&);
+void init_GaussianStabilizingSelection(py::module&);
 
 // Multivariate classes
 void init_MultivariateGSSmo(py::module&);
@@ -25,6 +26,7 @@ initialize_genetic_value_to_fitness(py::module& m)
     init_GeneticValueIsTrait(m);
     init_GeneticValueIsFitness(m);
     init_GSSmo(m);
+    init_GaussianStabilizingSelection(m);
 
     init_MultivariateGSSmo(m);
 }
diff --git a/fwdpy11/__init__.py b/fwdpy11/__init__.py
@@ -48,6 +48,7 @@
 from .genetic_values import (  # NOQA
     PleiotropicOptima,
     Optimum,
+    GaussianStabilizingSelection,
     GSS,
     GSSmo,
     MultivariateGSS,

diff --git a/fwdpy11/genetic_values.py b/fwdpy11/genetic_values.py
@@ -23,7 +23,9 @@
 import numpy as np
 
 from ._fwdpy11 import (GeneticValueIsTrait, GeneticValueNoise, _ll_Additive,
-                       _ll_GaussianNoise, _ll_GBR, _ll_GSSmo,
+                       _ll_GaussianNoise, _ll_GBR,
+                       _ll_GaussianStabilizingSelection,
+                       _ll_GSSmo,
                        _ll_Multiplicative, _ll_MultivariateGSSmo, _ll_NoNoise,
                        _ll_Optimum, _ll_PleiotropicOptima,
                        _ll_StrictAdditiveMultivariateEffects)

diff --git a/fwdpy11/headers/fwdpy11/genetic_value_to_fitness/GaussianStabilizingSelection.hpp b/fwdpy11/headers/fwdpy11/genetic_value_to_fitness/GaussianStabilizingSelection.hpp
@@ -24,11 +24,17 @@ namespace fwdpy11
         {
         }
 
+        double
+        operator()(const DiploidGeneticValueToFitnessData data) const final {
+            return this->pimpl->operator()(data);
+        }
+
         void
         update(const DiploidPopulation &pop) final
         {
             return this->pimpl->update(pop);
         }
+
         std::shared_ptr<GeneticValueToFitnessMap>
         clone() const final
         {