Fix issues with separated pybind functionality.

Author: kpeeters

core/pythoncdb/py_algorithms.cc

@@ -1,4 +1,7 @@
 #include "py_algorithms.hh"
+
+#include <pybind11/stl.h>
+
 #include "../Algorithm.hh"
 
 #include "../algorithms/canonicalise.hh"
@@ -93,9 +96,9 @@ namespace cadabra
 		def_algo<sort_sum>(m, "sort_sum", true, false, 0);
 		def_algo<tabdimension>(m, "tab_dimension", true, false, 0);
 		def_algo<young_project_product>(m, "young_project_product", true, false, 0);
+		def_algo<drop_weight, Ex>(m, "drop_weight", false, false, 0, py::arg("condition") = Ex{});
 		def_algo<complete, Ex>(m, "complete", false, false, 0, py::arg("add"));
 		def_algo<decompose, Ex>(m, "decompose", false, false, 0, py::arg("basis"));
-		def_algo<drop_weight, Ex>(m, "drop_weight", false, false, 0, py::arg("condition"));
 		def_algo<eliminate_metric, Ex>(m, "eliminate_metric", true, false, 0, py::arg("preferred") = Ex{});
 		def_algo<keep_weight, Ex>(m, "keep_weight", false, false, 0, py::arg("condition"));
 		def_algo<lower_free_indices, bool>(m, "lower_free_indices", true, false, 0, py::arg("lower") = true);
@@ -126,6 +129,5 @@ namespace cadabra
 		def_algo<split_gamma, bool>(m, "split_gamma", true, false, 0, py::arg("on_back"));
 		def_algo<split_index, Ex>(m, "split_index", true, false, 0, py::arg("rules"));
 		def_algo<unwrap, Ex>(m, "unwrap", true, false, 0, py::arg("wrapper") = Ex{});
-
 		}
 	}

core/pythoncdb/py_algorithms.hh

@@ -9,7 +9,7 @@
 namespace cadabra
 	{
 	template <class Algo, typename... Args>
-	Ex_ptr apply_algo(Ex_ptr ex, bool deep, bool repeat, unsigned int depth, Args... args)
+	Ex_ptr apply_algo(Ex_ptr ex, Args... args, bool deep, bool repeat, unsigned int depth)
 		{
 		Algo algo(*get_kernel_from_scope(), *ex, args...);
 
@@ -25,21 +25,21 @@ namespace cadabra
 		}
 
 	template<class Algo, typename... Args, typename... PyArgs>
-	void def_algo(pybind11::module& m, const char* name, bool deep, bool repeat, unsigned int depth, PyArgs... args)
+	void def_algo(pybind11::module& m, const char* name, bool deep, bool repeat, unsigned int depth, PyArgs... pyargs)
 		{
 		m.def(name,
-			  &apply_algo<Algo, Args...>,
+   		  &apply_algo<Algo, Args...>,
 			  pybind11::arg("ex"),
+			  std::forward<PyArgs>(pyargs)...,
 			  pybind11::arg("deep") = deep,
 			  pybind11::arg("repeat") = repeat,
 			  pybind11::arg("depth") = depth,
-			  std::forward<PyArgs>(args)...,
 			  pybind11::doc(read_manual("algorithms", name).c_str()),
 			  pybind11::return_value_policy::reference_internal);
 		}
 
 	template <class Algo, typename... Args>
-	Ex_ptr apply_algo_preorder(Ex_ptr ex, bool deep, bool repeat, unsigned int depth, Args... args)
+	Ex_ptr apply_algo_preorder(Ex_ptr ex, Args... args, bool deep, bool repeat, unsigned int depth)
 		{
 		Algo algo(*get_kernel_from_scope(), *ex, args...);
 
@@ -55,15 +55,15 @@ namespace cadabra
 		}
 
 	template<class Algo, typename... Args, typename... PyArgs>
-	void def_algo_preorder(pybind11::module& m, const char* name, bool deep, bool repeat, unsigned int depth, PyArgs... args)
+	void def_algo_preorder(pybind11::module& m, const char* name, bool deep, bool repeat, unsigned int depth, PyArgs... pyargs)
 		{
 		m.def(name,
 			  &apply_algo_preorder<Algo, Args...>,
 			  pybind11::arg("ex"),
+			  std::forward<PyArgs>(pyargs)...,
 			  pybind11::arg("deep") = deep,
 			  pybind11::arg("repeat") = repeat,
 			  pybind11::arg("depth") = depth,
-			  std::forward<PyArgs>(args)...,
 			  pybind11::doc(read_manual("algorithms", name).c_str()),
 			  pybind11::return_value_policy::reference_internal);
 		}

core/pythoncdb/py_ex.cc

@@ -1,3 +1,6 @@
+
+#include "Config.hh"
+
 #include "py_ex.hh"
 #include "py_helpers.hh"
 #include "py_globals.hh"
@@ -502,18 +505,9 @@ namespace cadabra
 		std::vector<std::string> av;
 		for (auto& arg : args)
 			av.push_back(arg.cast<std::string>());
-		return apply_algo_preorder<map_sympy, std::string, std::vector<std::string>>(ex, true, false, 0, head, av);
+		return apply_algo_preorder<map_sympy, std::string, std::vector<std::string>>(ex, head, av, true, false, 0);
 		}
 
-#ifdef MATHEMATICA_FOUND
-	Ex_ptr map_mma_wrapper(Ex_ptr ex, std::string head)
-		{
-		map_mma algo(*get_kernel_from_scope(), *ex, head);
-		return dispatch_base(ex, algo, true, false, 0, true);
-		}
-#endif
-
-
 	void init_ex(py::module& m)
 		{
 		pybind11::enum_<str_node::parent_rel_t>(m, "parent_rel_t")
@@ -589,12 +583,9 @@ namespace cadabra
 			  pybind11::arg("ex"),
 			  pybind11::arg("function") = "",
 			  pybind11::return_value_policy::reference_internal);
-	#ifdef MATHEMATICA_FOUND
-		m.def("map_mma", &map_mma_wrapper,
-			  pybind11::arg("ex"),
-			  pybind11::arg("function") = "",
-			  pybind11::return_value_policy::reference_internal);
-	#endif
+#ifdef MATHEMATICA_FOUND
+		def_algo<map_mma, std::string>(m, "map_mma", false, false, 0, pybind11::arg("function") = "");
+#endif
 
 		m.def("terms", &terms);