Remove direct use of boost::python in modelfitting

Author: ayllon

SEImplementation/SEImplementation/Plugin/FlexibleModelFitting/FlexibleModelFittingParameter.h

@@ -13,8 +13,7 @@
 #include <functional>
 #include <vector>
 #include <mutex>
-
-#include <boost/python/object.hpp>
+#include "SEFramework/CoordinateSystem/CoordinateSystem.h"
 
 namespace ModelFitting {
   class BasicParameter;
@@ -93,8 +92,12 @@ class FlexibleModelFittingFreeParameter : public FlexibleModelFittingParameter {
 class FlexibleModelFittingDependentParameter : public FlexibleModelFittingParameter {
 
 public:
+
+  /// The signature of a function that evaluates the dependent parameter. It gets
+  /// as parameters the values of those parameters on which this one depends.
+  using ValueFunc = std::function<double(const std::shared_ptr<CoordinateSystem>&, const std::vector<double>&)>;
 
-  FlexibleModelFittingDependentParameter(int id, boost::python::object value_calculator,
+  FlexibleModelFittingDependentParameter(int id, ValueFunc value_calculator,
                                          std::vector<std::shared_ptr<FlexibleModelFittingParameter>> parameters)
           : FlexibleModelFittingParameter(id),
             m_value_calculator(value_calculator),
@@ -106,8 +109,8 @@ class FlexibleModelFittingDependentParameter : public FlexibleModelFittingParame
                                   const SourceInterface& source) const override;
 
 private:
-  
-  boost::python::object m_value_calculator;
+
+  ValueFunc m_value_calculator;
   std::vector<std::shared_ptr<FlexibleModelFittingParameter>> m_parameters;
 
 };

SEImplementation/src/lib/Configuration/ModelFittingConfig.cpp

@@ -109,8 +109,19 @@ void ModelFittingConfig::initialize(const UserValues&) {
       int id = py::extract<int>(param_ids[i]);
       params.push_back(m_parameters[id]);
     }
+
+    auto dependent_func = [py_func](const std::shared_ptr<CoordinateSystem> &cs, const std::vector<double> &params) -> double {
+      try {
+        PythonInterpreter::getSingleton().setCoordinateSystem(cs);
+        return py::extract<double>(py_func(*py::tuple(params)));
+      }
+      catch (const py::error_already_set&) {
+        throw pyToElementsException(logger);
+      }
+    };
+
     m_parameters[p.first] = std::make_shared<FlexibleModelFittingDependentParameter>(
-                                                      p.first, py_func, params);
+                                                      p.first, dependent_func, params);
   }
 
   for (auto& p : getDependency<PythonConfig>().getInterpreter().getPointSourceModels()) {

SEImplementation/src/lib/Plugin/FlexibleModelFitting/FlexibleModelFittingParameter.cpp

@@ -6,7 +6,6 @@
  */
 
 #include <iostream>
-#include <boost/python.hpp>
 
 #include "ModelFitting/utils.h"
 
@@ -77,19 +76,14 @@ template<typename ... Parameters>
 std::shared_ptr<ModelFitting::BasicParameter> createDependentParameterHelper(
                                        FlexibleModelFittingParameterManager& parameter_manager,
                                        const SourceInterface& source,
-                                       boost::python::object value_calculator,
+                                       FlexibleModelFittingDependentParameter::ValueFunc value_calculator,
                                        std::shared_ptr<Parameters>... parameters) {
   auto coordinate_system = source.getProperty<DetectionFrame>().getFrame()->getCoordinateSystem();
 
   auto calc = [value_calculator, coordinate_system] (decltype(doubleResolver(std::declval<Parameters>()))... params) -> double {
     std::lock_guard<std::mutex> guard {python_callback_mutex};
-    try {
-      PythonInterpreter::getSingleton().setCoordinateSystem(coordinate_system);
-      return boost::python::extract<double>(value_calculator(params...));
-    }
-    catch (const boost::python::error_already_set &e) {
-      throw pyToElementsException(logger);
-    }
+    std::vector<double> materialized{params...};
+    return value_calculator(coordinate_system, materialized);
   };
   return createDependentParameterPtr(calc, *(parameter_manager.getParameter(source, parameters))...);
 }

SEImplementation/src/lib/Plugin/FlexibleModelFitting/FlexibleModelFittingPrior.cpp

@@ -6,7 +6,6 @@
  */
 
 #include <iostream>
-#include <boost/python.hpp>
 #include <mutex>
 
 #include "ModelFitting/utils.h"

SEImplementation/src/lib/PythonConfig/PythonModule.cpp

@@ -4,6 +4,7 @@
  */
 
 #include <boost/python.hpp>
+#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
 
 #include <SEImplementation/PythonConfig/ObjectInfo.h>
 #include <SEImplementation/PythonConfig/PyMeasurementImage.h>
@@ -61,6 +62,10 @@ BOOST_PYTHON_MODULE(_SExtractorPy) {
       .def(bp::init<double, double>())
       .def_readwrite("x", &ImageCoordinate::m_x)
       .def_readwrite("y", &ImageCoordinate::m_y);
+
+  bp::class_<std::vector<double> >("_DoubleVector")
+    .def(bp::vector_indexing_suite<std::vector<double> >())
+  ;
 }
 
 } // namespace SExtractor