Fix python wrapper

MRPT · Dec 3, 2023 · 25ee001 · 25ee001
1 parent 6dd5207
commit 25ee001
Show file tree

Hide file tree

Showing 15 changed files with 813 additions and 1,059 deletions.
diff --git a/python/all_mrpt_math1.cpp b/python/all_mrpt_math1.cpp
@@ -1,11 +1,12 @@
 #include "src/mrpt/math/CAtan2LookUpTable.cpp"
 #include "src/mrpt/math/CMatrixB.cpp"
+#include "src/mrpt/math/CMatrixDynamic_2.cpp"
 #include "src/mrpt/math/CMatrixDynamic_1.cpp"
 #include "src/mrpt/math/CMatrixDynamic.cpp"
 #include "src/mrpt/math/CMatrixF.cpp"
 #include "src/mrpt/math/CMatrixFixed_1.cpp"
 #include "src/mrpt/math/CMatrixFixed_2.cpp"
 #include "src/mrpt/math/CMatrixFixed_3.cpp"
-#include "src/mrpt/math/CMatrixFixed_4.cpp"
 #include "src/mrpt/math/CMatrixFixed.cpp"
+#include "src/mrpt/math/MatrixVectorBase.cpp"
 #include "src/mrpt/math/CPolygon.cpp"
diff --git a/python/patch-003.diff b/python/patch-003.diff
diff --git a/python/patch-004.diff b/python/patch-004.diff
diff --git a/python/patch-012.diff b/python/patch-012.diff
diff --git a/python/python.conf b/python/python.conf
@@ -213,6 +213,7 @@
 -class mrpt::math::MatrixBase<double,mrpt::math::CMatrixFixed<double, 7, 7>>
 -class mrpt::math::MatrixBase<unsigned char,mrpt::math::CMatrixDynamic<unsigned char>>
 -class mrpt::math::MatrixBase<unsigned short,mrpt::math::CMatrixDynamic<unsigned short>>
+-class mrpt::math::MatrixBase<mrpt::math::TPoint3D_<float>,mrpt::math::CMatrixDynamic<mrpt::math::TPoint3D_<float> >>
 -class mrpt::math::MatrixBase<float,mrpt::math::CMatrixDynamic<float>>
 -class mrpt::math::MatrixBase<float,mrpt::math::CMatrixFixed<float, 3, 1>>
 -class mrpt::math::MatrixBase<float,mrpt::math::CMatrixFixed<float, 3, 3>>
@@ -232,6 +233,7 @@
 -class mrpt::math::MatrixVectorBase<float,mrpt::math::CMatrixFixed<float, 3, 1>>
 -class mrpt::math::MatrixVectorBase<float,mrpt::math::CMatrixFixed<float, 4, 1>>
 -class mrpt::math::MatrixVectorBase<unsigned char,mrpt::math::CMatrixDynamic<unsigned char>>
+-class mrpt::math::MatrixVectorBase<mrpt::math::TPoint3D_<float>,mrpt::math::CMatrixDynamic<mrpt::math::TPoint3D_<float> >>
 -class mrpt::math::MatrixVectorBase<double,mrpt::math::CMatrixFixed<double, 2, 2>>
 -class mrpt::math::MatrixVectorBase<double,mrpt::math::CMatrixFixed<double, 7, 7>>
 -class mrpt::math::MatrixVectorBase<double,mrpt::math::CMatrixDynamic<double>>

diff --git a/python/src/mrpt/math/CMatrixDynamic_1.cpp b/python/src/mrpt/math/CMatrixDynamic_1.cpp
diff --git a/python/src/mrpt/math/CMatrixDynamic_2.cpp b/python/src/mrpt/math/CMatrixDynamic_2.cpp
diff --git a/python/src/mrpt/math/CMatrixFixed.cpp b/python/src/mrpt/math/CMatrixFixed.cpp
diff --git a/python/src/mrpt/math/CMatrixFixed_1.cpp b/python/src/mrpt/math/CMatrixFixed_1.cpp
diff --git a/python/src/mrpt/math/CMatrixFixed_2.cpp b/python/src/mrpt/math/CMatrixFixed_2.cpp
diff --git a/python/src/mrpt/math/CMatrixFixed_3.cpp b/python/src/mrpt/math/CMatrixFixed_3.cpp
diff --git a/python/src/mrpt/math/CMatrixFixed_4.cpp b/python/src/mrpt/math/CMatrixFixed_4.cpp
diff --git a/python/src/mrpt/math/MatrixVectorBase.cpp b/python/src/mrpt/math/MatrixVectorBase.cpp
diff --git a/python/src/pymrpt.cpp b/python/src/pymrpt.cpp
@@ -177,8 +177,12 @@ void bind_mrpt_obs_CObservationStereoImages(std::function< pybind11::module &(st
 void bind_mrpt_vision_CStereoRectifyMap(std::function< pybind11::module &(std::string const &namespace_) > &M);
 void bind_mrpt_hwdrivers_CDUO3DCamera(std::function< pybind11::module &(std::string const &namespace_) > &M);
 void bind_mrpt_math_CMatrixDynamic(std::function< pybind11::module &(std::string const &namespace_) > &M);
+void bind_mrpt_math_CMatrixDynamic_1(std::function< pybind11::module &(std::string const &namespace_) > &M);
+void bind_mrpt_math_CMatrixFixed(std::function< pybind11::module &(std::string const &namespace_) > &M);
+void bind_mrpt_math_CMatrixFixed_1(std::function< pybind11::module &(std::string const &namespace_) > &M);
+void bind_mrpt_math_CMatrixFixed_2(std::function< pybind11::module &(std::string const &namespace_) > &M);
+void bind_mrpt_math_CMatrixFixed_3(std::function< pybind11::module &(std::string const &namespace_) > &M);
 void bind_mrpt_math_MatrixVectorBase(std::function< pybind11::module &(std::string const &namespace_) > &M);
-void bind_mrpt_math_MatrixBase(std::function< pybind11::module &(std::string const &namespace_) > &M);
 void bind_mrpt_math_math_frwds(std::function< pybind11::module &(std::string const &namespace_) > &M);
 void bind_mrpt_bayes_CProbabilityParticle_1(std::function< pybind11::module &(std::string const &namespace_) > &M);
 void bind_mrpt_math_CMatrixF(std::function< pybind11::module &(std::string const &namespace_) > &M);
@@ -230,12 +234,7 @@ void bind_mrpt_kinematics_CKinematicChain(std::function< pybind11::module &(std:
 void bind_mrpt_kinematics_CVehicleVelCmd(std::function< pybind11::module &(std::string const &namespace_) > &M);
 void bind_mrpt_kinematics_CVehicleVelCmd_DiffDriven(std::function< pybind11::module &(std::string const &namespace_) > &M);
 void bind_mrpt_poses_CPointPDF(std::function< pybind11::module &(std::string const &namespace_) > &M);
-void bind_mrpt_math_CMatrixDynamic_1(std::function< pybind11::module &(std::string const &namespace_) > &M);
-void bind_mrpt_math_CMatrixFixed(std::function< pybind11::module &(std::string const &namespace_) > &M);
-void bind_mrpt_math_CMatrixFixed_1(std::function< pybind11::module &(std::string const &namespace_) > &M);
-void bind_mrpt_math_CMatrixFixed_2(std::function< pybind11::module &(std::string const &namespace_) > &M);
-void bind_mrpt_math_CMatrixFixed_3(std::function< pybind11::module &(std::string const &namespace_) > &M);
-void bind_mrpt_math_CMatrixFixed_4(std::function< pybind11::module &(std::string const &namespace_) > &M);
+void bind_mrpt_math_CMatrixDynamic_2(std::function< pybind11::module &(std::string const &namespace_) > &M);
 void bind_mrpt_poses_CPointPDFSOG(std::function< pybind11::module &(std::string const &namespace_) > &M);
 void bind_mrpt_maps_CBeacon(std::function< pybind11::module &(std::string const &namespace_) > &M);
 void bind_mrpt_opengl_COctoMapVoxels(std::function< pybind11::module &(std::string const &namespace_) > &M);
@@ -608,8 +607,12 @@ PYBIND11_MODULE(pymrpt, root_module) {
 	bind_mrpt_vision_CStereoRectifyMap(M);
 	bind_mrpt_hwdrivers_CDUO3DCamera(M);
 	bind_mrpt_math_CMatrixDynamic(M);
+	bind_mrpt_math_CMatrixDynamic_1(M);
+	bind_mrpt_math_CMatrixFixed(M);
+	bind_mrpt_math_CMatrixFixed_1(M);
+	bind_mrpt_math_CMatrixFixed_2(M);
+	bind_mrpt_math_CMatrixFixed_3(M);
 	bind_mrpt_math_MatrixVectorBase(M);
-	bind_mrpt_math_MatrixBase(M);
 	bind_mrpt_math_math_frwds(M);
 	bind_mrpt_bayes_CProbabilityParticle_1(M);
 	bind_mrpt_math_CMatrixF(M);
@@ -661,12 +664,7 @@ PYBIND11_MODULE(pymrpt, root_module) {
 	bind_mrpt_kinematics_CVehicleVelCmd(M);
 	bind_mrpt_kinematics_CVehicleVelCmd_DiffDriven(M);
 	bind_mrpt_poses_CPointPDF(M);
-	bind_mrpt_math_CMatrixDynamic_1(M);
-	bind_mrpt_math_CMatrixFixed(M);
-	bind_mrpt_math_CMatrixFixed_1(M);
-	bind_mrpt_math_CMatrixFixed_2(M);
-	bind_mrpt_math_CMatrixFixed_3(M);
-	bind_mrpt_math_CMatrixFixed_4(M);
+	bind_mrpt_math_CMatrixDynamic_2(M);
 	bind_mrpt_poses_CPointPDFSOG(M);
 	bind_mrpt_maps_CBeacon(M);
 	bind_mrpt_opengl_COctoMapVoxels(M);

diff --git a/python/src/pymrpt.sources b/python/src/pymrpt.sources
@@ -167,8 +167,12 @@ mrpt/obs/CObservationStereoImages.cpp
 mrpt/vision/CStereoRectifyMap.cpp
 mrpt/hwdrivers/CDUO3DCamera.cpp
 mrpt/math/CMatrixDynamic.cpp
+mrpt/math/CMatrixDynamic_1.cpp
+mrpt/math/CMatrixFixed.cpp
+mrpt/math/CMatrixFixed_1.cpp
+mrpt/math/CMatrixFixed_2.cpp
+mrpt/math/CMatrixFixed_3.cpp
 mrpt/math/MatrixVectorBase.cpp
-mrpt/math/MatrixBase.cpp
 mrpt/math/math_frwds.cpp
 mrpt/bayes/CProbabilityParticle_1.cpp
 mrpt/math/CMatrixF.cpp
@@ -220,12 +224,7 @@ mrpt/kinematics/CKinematicChain.cpp
 mrpt/kinematics/CVehicleVelCmd.cpp
 mrpt/kinematics/CVehicleVelCmd_DiffDriven.cpp
 mrpt/poses/CPointPDF.cpp
-mrpt/math/CMatrixDynamic_1.cpp
-mrpt/math/CMatrixFixed.cpp
-mrpt/math/CMatrixFixed_1.cpp
-mrpt/math/CMatrixFixed_2.cpp
-mrpt/math/CMatrixFixed_3.cpp
-mrpt/math/CMatrixFixed_4.cpp
+mrpt/math/CMatrixDynamic_2.cpp
 mrpt/poses/CPointPDFSOG.cpp
 mrpt/maps/CBeacon.cpp
 mrpt/opengl/COctoMapVoxels.cpp