Added default arguments

Author: egbertbouman

CMakeLists.txt

@@ -29,7 +29,7 @@ if (NOT EXISTS ${EIGEN_ROOT})
 endif()
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/bindings/python)
-include_directories($ENV{EIGEN_ROOT} /usr/include/eigen3)
+include_directories($ENV{EIGEN_ROOT})
 include_directories(${Boost_INCLUDE_DIRS})
 include_directories(${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIR})
 

bindings/python/module.cpp

@@ -5,28 +5,28 @@
 #include <boost/python/module.hpp>
 #include <boost/python/extract.hpp>
 #include <boost/python/scope.hpp>
+#include <boost/python/args.hpp>
 
 namespace python = boost::python;
 
 
 python::object solve_python(PyObject* KP, PyObject* KQ, PyObject* Ct, PyObject* asgTX,
                           const python::dict& gph1, const python::dict& gph2,
-                          const python::dict& params)
+                          int nAlp, int nItMa, int nHst)
 {
     Eigen::MatrixXd _KP = python::extract<Eigen::MatrixXd>(KP);
     Eigen::MatrixXd _KQ = python::extract<Eigen::MatrixXd>(KQ);
     Eigen::MatrixXd _Ct = python::extract<Eigen::MatrixXd>(Ct);
     Eigen::MatrixXd _asgTX = python::extract<Eigen::MatrixXd>(asgTX);
     auto _gph1 = dict2map<std::string, Eigen::MatrixXd>(gph1);
     auto _gph2 = dict2map<std::string, Eigen::MatrixXd>(gph2);
-    auto _params = dict2map<std::string, std::string>(params);
-    return python::object(fgm(_KP, _KQ, _Ct, _asgTX, _gph1, _gph2, _params));
+    return python::object(fgm(_KP, _KQ, _Ct, _asgTX, _gph1, _gph2, nAlp, nItMa, nHst));
 }
 
 
 BOOST_PYTHON_MODULE(fgm)
 {
     initializeConverters();
-    python::def("solve", solve_python);
+    python::def("solve", solve_python,  (python::arg("nAlp")=101, python::arg("nItMa")=100, python::arg("nHst")=10));
     python::scope().attr("version") = FGM_VERSION;
 }

fgm.cpp

@@ -112,13 +112,8 @@ double multGXHSQTr(const MatrixXd& indG, const MatrixXd& X, const MatrixXd& indH
 std::pair<MatrixXd, double> fgm(MatrixXd& KP, MatrixXd& KQ, MatrixXd& Ct, MatrixXd& asgTX,
                                 std::map<std::string, MatrixXd>& gph1,
                                 std::map<std::string, MatrixXd>& gph2,
-                                std::map<std::string, std::string>& params)
+                                int nAlp, int nItMa, int nHst)
 {
-    // TODO : get params from python
-    int nAlp = 101;
-    int nItMa = 100;
-    int nHst = 10;
-
     // weight
     VectorXd alps = VectorXd::LinSpaced(nAlp, 0, 1);
 

fgm.hpp

@@ -18,6 +18,6 @@ std::pair<Eigen::MatrixXd, double> fgm(Eigen::MatrixXd& KP, Eigen::MatrixXd& KQ,
                                        Eigen::MatrixXd& Ct, Eigen::MatrixXd& asgTX, 
                                        std::map<std::string, Eigen::MatrixXd>& gph1,
                                        std::map<std::string, Eigen::MatrixXd>& gph2,
-                                       std::map<std::string, std::string>& params);
+                                       int nAlp = 101, int nItMa = 100, int nHst = 10);
 
 #endif