[sample] scope non-template aliaseses

FrancoisCarouge · Oct 31, 2023 · 0947101 · 0947101
1 parent 9471c07
commit 0947101
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/sample/ekf_4x1x0_soaring.cpp b/sample/ekf_4x1x0_soaring.cpp
@@ -7,9 +7,6 @@
 namespace fcarouge::sample {
 namespace {
 template <auto Size> using vector = column_vector<float, Size>;
-using state = vector<4>;
-using output = float;
-using no_input = void;
 
 //! @brief ArduPilot plane soaring.
 //!
@@ -36,6 +33,9 @@ using no_input = void;
 [[maybe_unused]] auto sample{[] {
   // 4x1 extended filter with additional parameter for prediction: driftX [m],
   // driftY [m]. Constant time step.
+  using state = vector<4>;
+  using output = float;
+  using no_input = void;
   using kalman = kalman<state, output, no_input, std::tuple<float, float>,
                         std::tuple<float, float>>;
 

diff --git a/sample/kf_2x1x1_rocket_altitude.cpp b/sample/kf_2x1x1_rocket_altitude.cpp
@@ -8,9 +8,6 @@
 namespace fcarouge::sample {
 namespace {
 template <auto Size> using vector = column_vector<double, Size>;
-using state = vector<2>;
-using output = double;
-using input = double;
 
 //! @brief Estimating the rocket altitude.
 //!
@@ -48,6 +45,9 @@ using input = double;
 //! @example kf_2x1x1_rocket_altitude.cpp
 [[maybe_unused]] auto sample{[] {
   // A 2x1x1 filter, constant acceleration dynamic model, no control, step time.
+  using state = vector<2>;
+  using output = double;
+  using input = double;
   using kalman = kalman<state, output, input, std::tuple<>,
                         std::tuple<std::chrono::milliseconds>>;
   kalman filter;

diff --git a/sample/kf_6x2x0_vehicle_location.cpp b/sample/kf_6x2x0_vehicle_location.cpp
@@ -16,9 +16,6 @@ constexpr auto fcarouge::operator/(const Numerator &lhs, const Denominator &rhs)
 namespace fcarouge::sample {
 namespace {
 template <auto Size> using vector = column_vector<double, Size>;
-using state = vector<6>;
-using output = vector<2>;
-using no_input = void;
 
 //! @brief Estimating the vehicle location.
 //!
@@ -41,6 +38,9 @@ using no_input = void;
 //! @example kf_6x2x0_vehicle_location.cpp
 [[maybe_unused]] auto sample{[] {
   // A 6x2x0 filter, constant acceleration dynamic model, no control.
+  using state = vector<6>;
+  using output = vector<2>;
+  using no_input = void;
   using kalman = kalman<state, output, no_input>;
 
   kalman filter;

diff --git a/sample/kf_8x4x0_deep_sort_bounding_box.cpp b/sample/kf_8x4x0_deep_sort_bounding_box.cpp
@@ -16,9 +16,6 @@ constexpr auto fcarouge::operator/(const Numerator &lhs, const Denominator &rhs)
 namespace fcarouge::sample {
 namespace {
 template <auto Size> using vector = column_vector<float, Size>;
-using state = vector<8>;
-using output = vector<4>;
-using no_input = void;
 
 //! @brief Estimating the position of bounding boxes in image space.
 //!
@@ -37,6 +34,9 @@ using no_input = void;
 //! @example kf_8x4x0_deep_sort_bounding_box.cpp
 [[maybe_unused]] auto sample{[] {
   // A 8x4x0 filter, constant velocity, linear.
+  using state = vector<8>;
+  using output = vector<4>;
+  using no_input = void;
   using kalman = kalman<state, output, no_input>;
 
   kalman filter;