adapted tools 0.23.0

themachinethatgoesping · Apr 9, 2024 · 083029a · 083029a
1 parent 98c10d3
commit 083029a
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 36 deletions.
diff --git a/src/pymodule/c_navigationinterpolatorlatlon.cpp b/src/pymodule/c_navigationinterpolatorlatlon.cpp
@@ -147,7 +147,7 @@ void init_c_NavigationInterpolatorLatLon(py::module& m)
             "interpolator_latitude",
             &NavigationInterpolatorLatLon::interpolator_latitude,
             [](NavigationInterpolatorLatLon& self,
-               const themachinethatgoesping::tools::vectorinterpolators::AkimaInterpolator&
+               const themachinethatgoesping::tools::vectorinterpolators::AkimaInterpolator<double>&
                    interpolator) { self.interpolator_latitude() = interpolator; },
             DOC(themachinethatgoesping,
                 navigation,
@@ -157,7 +157,7 @@ void init_c_NavigationInterpolatorLatLon(py::module& m)
             "interpolator_longitude",
             &NavigationInterpolatorLatLon::interpolator_longitude,
             [](NavigationInterpolatorLatLon& self,
-               const themachinethatgoesping::tools::vectorinterpolators::AkimaInterpolator&
+               const themachinethatgoesping::tools::vectorinterpolators::AkimaInterpolator<double>&
                    interpolator) { self.interpolator_longitude() = interpolator; },
             DOC(themachinethatgoesping,
                 navigation,
@@ -169,21 +169,21 @@ void init_c_NavigationInterpolatorLatLon(py::module& m)
             "interpolator_heave",
             &NavigationInterpolatorLatLon::interpolator_heave,
             [](NavigationInterpolatorLatLon& self,
-               const themachinethatgoesping::tools::vectorinterpolators::AkimaInterpolator&
+               const themachinethatgoesping::tools::vectorinterpolators::AkimaInterpolator<double>&
                    interpolator) { self.interpolator_heave() = interpolator; },
             DOC(themachinethatgoesping, navigation, I_NavigationInterpolator, interpolator_heave))
         .def_property(
             "interpolator_depth",
             &NavigationInterpolatorLatLon::interpolator_depth,
             [](NavigationInterpolatorLatLon& self,
-               const themachinethatgoesping::tools::vectorinterpolators::LinearInterpolator&
+               const themachinethatgoesping::tools::vectorinterpolators::LinearInterpolator<double, double>&
                    interpolator) { self.interpolator_depth() = interpolator; },
             DOC(themachinethatgoesping, navigation, I_NavigationInterpolator, interpolator_depth))
         .def_property(
             "interpolator_attitude",
             &NavigationInterpolatorLatLon::interpolator_attitude,
             [](NavigationInterpolatorLatLon& self,
-               const themachinethatgoesping::tools::vectorinterpolators::SlerpInterpolator&
+               const themachinethatgoesping::tools::vectorinterpolators::SlerpInterpolator<double, double>&
                    interpolator) { self.interpolator_attitude() = interpolator; },
             DOC(themachinethatgoesping,
                 navigation,
@@ -193,7 +193,7 @@ void init_c_NavigationInterpolatorLatLon(py::module& m)
             "interpolator_heading",
             &NavigationInterpolatorLatLon::interpolator_heading,
             [](NavigationInterpolatorLatLon& self,
-               const themachinethatgoesping::tools::vectorinterpolators::SlerpInterpolator&
+               const themachinethatgoesping::tools::vectorinterpolators::SlerpInterpolator<double, double>&
                    interpolator) { self.interpolator_heading() = interpolator; },
             DOC(themachinethatgoesping, navigation, I_NavigationInterpolator, interpolator_heading))
         .def("merge",

diff --git a/src/pymodule/c_navigationinterpolatorlocal.cpp b/src/pymodule/c_navigationinterpolatorlocal.cpp
@@ -2,11 +2,8 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
-
 // automatically gernerated using  python -m pybind11_mkdoc -o docstrings.h <headerfiles>
 
-
-
 // -- c++ library headers
 #include <themachinethatgoesping/tools/vectorinterpolators.hpp>
 #include <themachinethatgoesping/tools_pybind/classhelper.hpp>
@@ -145,7 +142,7 @@ void init_c_NavigationInterpolatorLocal(py::module& m)
             "interpolator_northing",
             &NavigationInterpolatorLocal::interpolator_northing,
             [](NavigationInterpolatorLocal& self,
-               const themachinethatgoesping::tools::vectorinterpolators::AkimaInterpolator&
+               const themachinethatgoesping::tools::vectorinterpolators::AkimaInterpolator<double>&
                    interpolator) { self.interpolator_northing() = interpolator; },
             DOC(themachinethatgoesping,
                 navigation,
@@ -155,7 +152,7 @@ void init_c_NavigationInterpolatorLocal(py::module& m)
             "interpolator_easting",
             &NavigationInterpolatorLocal::interpolator_easting,
             [](NavigationInterpolatorLocal& self,
-               const themachinethatgoesping::tools::vectorinterpolators::AkimaInterpolator&
+               const themachinethatgoesping::tools::vectorinterpolators::AkimaInterpolator<double>&
                    interpolator) { self.interpolator_easting() = interpolator; },
             DOC(themachinethatgoesping,
                 navigation,
@@ -167,21 +164,22 @@ void init_c_NavigationInterpolatorLocal(py::module& m)
             "interpolator_heave",
             &NavigationInterpolatorLocal::interpolator_heave,
             [](NavigationInterpolatorLocal& self,
-               const themachinethatgoesping::tools::vectorinterpolators::AkimaInterpolator&
+               const themachinethatgoesping::tools::vectorinterpolators::AkimaInterpolator<double>&
                    interpolator) { self.interpolator_heave() = interpolator; },
             DOC(themachinethatgoesping, navigation, I_NavigationInterpolator, interpolator_heave))
         .def_property(
             "interpolator_depth",
             &NavigationInterpolatorLocal::interpolator_depth,
             [](NavigationInterpolatorLocal& self,
-               const themachinethatgoesping::tools::vectorinterpolators::LinearInterpolator&
+               const themachinethatgoesping::tools::vectorinterpolators::LinearInterpolator<double,
+                                                                                            double>&
                    interpolator) { self.interpolator_depth() = interpolator; },
             DOC(themachinethatgoesping, navigation, I_NavigationInterpolator, interpolator_depth))
         .def_property(
             "interpolator_attitude",
             &NavigationInterpolatorLocal::interpolator_attitude,
             [](NavigationInterpolatorLocal& self,
-               const themachinethatgoesping::tools::vectorinterpolators::SlerpInterpolator&
+               const themachinethatgoesping::tools::vectorinterpolators::SlerpInterpolator<double, double>&
                    interpolator) { self.interpolator_attitude() = interpolator; },
             DOC(themachinethatgoesping,
                 navigation,
@@ -191,7 +189,7 @@ void init_c_NavigationInterpolatorLocal(py::module& m)
             "interpolator_heading",
             &NavigationInterpolatorLocal::interpolator_heading,
             [](NavigationInterpolatorLocal& self,
-               const themachinethatgoesping::tools::vectorinterpolators::SlerpInterpolator&
+               const themachinethatgoesping::tools::vectorinterpolators::SlerpInterpolator<double, double>&
                    interpolator) { self.interpolator_heading() = interpolator; },
             DOC(themachinethatgoesping, navigation, I_NavigationInterpolator, interpolator_heading))
         .def("merge",
@@ -204,7 +202,7 @@ void init_c_NavigationInterpolatorLocal(py::module& m)
              DOC(themachinethatgoesping, navigation, NavigationInterpolatorLocal, operator_eq),
              py::arg("other"))
 
-        // default copy functions
+        // default copy functionss
         __PYCLASS_DEFAULT_COPY__(NavigationInterpolatorLocal)
         // default binary functions
         __PYCLASS_DEFAULT_BINARY__(NavigationInterpolatorLocal)

diff --git a/src/themachinethatgoesping/navigation/.docstrings/i_navigationinterpolator.doc.hpp b/src/themachinethatgoesping/navigation/.docstrings/i_navigationinterpolator.doc.hpp
@@ -1,4 +1,4 @@
-//sourcehash: b3ddf039c6218087e5f74500afdc648e81a67539ea251e0bc562069000e5381c
+//sourcehash: bc44be11fc66376f87aea7998f9fb46886a6d5d07cd4b46d1f955c0b24b7c543
 
 /*
   This file contains docstrings for use in the Python bindings.

diff --git a/src/themachinethatgoesping/navigation/.docstrings/navigationinterpolatorlatlon.doc.hpp b/src/themachinethatgoesping/navigation/.docstrings/navigationinterpolatorlatlon.doc.hpp
@@ -1,4 +1,4 @@
-//sourcehash: 39decf6965dd72ca97e4a750f84c124d55b53f22bc0b34c8769241426f65ae8a
+//sourcehash: 763b9e6c4a048513fee55056ceafafdb6a78c48180813ca16c6f6ebe9c0a55d0
 
 /*
   This file contains docstrings for use in the Python bindings.

diff --git a/src/themachinethatgoesping/navigation/.docstrings/navigationinterpolatorlocal.doc.hpp b/src/themachinethatgoesping/navigation/.docstrings/navigationinterpolatorlocal.doc.hpp
@@ -1,4 +1,4 @@
-//sourcehash: c8d2e297be67d3800fa4630816aa5c1f10944aceb0194efc2fb09d1329ebf53e
+//sourcehash: a23e7957a546df5d24c09f89300eeac7a7c36c3e7372ca0f04618ba3990a072b
 
 /*
   This file contains docstrings for use in the Python bindings.

diff --git a/src/themachinethatgoesping/navigation/i_navigationinterpolator.hpp b/src/themachinethatgoesping/navigation/i_navigationinterpolator.hpp
@@ -33,17 +33,17 @@ class I_NavigationInterpolator
     SensorConfiguration _sensor_configuration; ///< sensor configuration that stores the offsets
 
     // SlerpInterpolator that stores timestamp, roll, pitch, yaw -> Attitude of Vessel on the Water
-    tools::vectorinterpolators::SlerpInterpolator
+    tools::vectorinterpolators::SlerpInterpolator<double, double>
         _interpolator_attitude; ///< interpolator that stores attitude data (pitch and roll)
-    tools::vectorinterpolators::SlerpInterpolator
+    tools::vectorinterpolators::SlerpInterpolator<double, double>
         _interpolator_heading; ///< interpolator that stores compass data (yaw/heading) [°]
 
     // LinearInterpolator for the depth in the world coordinate system
-    tools::vectorinterpolators::AkimaInterpolator
+    tools::vectorinterpolators::AkimaInterpolator<double>
         _interpolator_heave; ///< interpolator that stores heave data (relative change in depth,
                              ///< positive upwards) [m]
     // tools::vectorinterpolators::AkimaInterpolator // bad results for noisy data
-    tools::vectorinterpolators::LinearInterpolator
+    tools::vectorinterpolators::LinearInterpolator<double, double>
         _interpolator_depth; ///< interpolator that stores depth data (depth, positive downwards)
                              ///< [m]
 
@@ -186,7 +186,7 @@ class I_NavigationInterpolator
      *
      * @return interpolator_depth&
      */
-    tools::vectorinterpolators::LinearInterpolator& interpolator_depth()
+    auto& interpolator_depth()
     {
         return _interpolator_depth;
     }
@@ -196,7 +196,7 @@ class I_NavigationInterpolator
      *
      * @return interpolator_depth&
      */
-    tools::vectorinterpolators::AkimaInterpolator& interpolator_heave()
+    auto& interpolator_heave()
     {
         return _interpolator_heave;
     }
@@ -206,7 +206,7 @@ class I_NavigationInterpolator
      *
      * @return interpolator_attitude&
      */
-    tools::vectorinterpolators::SlerpInterpolator& interpolator_attitude()
+    auto& interpolator_attitude()
     {
         return _interpolator_attitude;
     }
@@ -216,7 +216,7 @@ class I_NavigationInterpolator
      *
      * @return interpolator_heading&
      */
-    tools::vectorinterpolators::SlerpInterpolator& interpolator_heading()
+    auto& interpolator_heading()
     {
         return _interpolator_heading;
     }

diff --git a/src/themachinethatgoesping/navigation/navigationinterpolatorlatlon.hpp b/src/themachinethatgoesping/navigation/navigationinterpolatorlatlon.hpp
@@ -26,11 +26,10 @@ namespace navigation {
  */
 class NavigationInterpolatorLatLon : public I_NavigationInterpolator
 {
-
     // LinearInterpolator for the depth in the world coordinate system
-    tools::vectorinterpolators::AkimaInterpolator
+    tools::vectorinterpolators::AkimaInterpolator<double>
         _interpolator_latitude; ///< interpolator for the latitude data
-    tools::vectorinterpolators::AkimaInterpolator
+    tools::vectorinterpolators::AkimaInterpolator<double>
         _interpolator_longitude; ///< interpolator for the longitude data
 
   protected:
@@ -111,7 +110,7 @@ class NavigationInterpolatorLatLon : public I_NavigationInterpolator
      *
      * @return interpolator_latitude&
      */
-    tools::vectorinterpolators::AkimaInterpolator& interpolator_latitude()
+    auto& interpolator_latitude()
     {
         return _interpolator_latitude;
     }
@@ -121,7 +120,7 @@ class NavigationInterpolatorLatLon : public I_NavigationInterpolator
      *
      * @return interpolator_longitude&
      */
-    tools::vectorinterpolators::AkimaInterpolator& interpolator_longitude()
+    auto& interpolator_longitude()
     {
         return _interpolator_longitude;
     }

diff --git a/src/themachinethatgoesping/navigation/navigationinterpolatorlocal.hpp b/src/themachinethatgoesping/navigation/navigationinterpolatorlocal.hpp
@@ -28,9 +28,9 @@ class NavigationInterpolatorLocal : public I_NavigationInterpolator
 {
 
     // LinearInterpolator for the depth in the world coordinate system
-    tools::vectorinterpolators::AkimaInterpolator
+    tools::vectorinterpolators::AkimaInterpolator<double>
         _interpolator_northing; ///< interpolator for the northing data
-    tools::vectorinterpolators::AkimaInterpolator
+    tools::vectorinterpolators::AkimaInterpolator<double>
         _interpolator_easting; ///< interpolator for the easting data
 
     std::string class_name() const override { return "NavigationInterpolatorLocal"; }
@@ -151,7 +151,7 @@ class NavigationInterpolatorLocal : public I_NavigationInterpolator
      *
      * @return interpolator_northing&
      */
-    tools::vectorinterpolators::AkimaInterpolator& interpolator_northing()
+    auto& interpolator_northing()
     {
         return _interpolator_northing;
     }
@@ -161,7 +161,7 @@ class NavigationInterpolatorLocal : public I_NavigationInterpolator
      *
      * @return interpolator_easting&
      */
-    tools::vectorinterpolators::AkimaInterpolator& interpolator_easting()
+    auto& interpolator_easting()
     {
         return _interpolator_easting;
     }