matrix: fix internal include chain

src/lib/matrix/matrix/AxisAngle.hpp

@@ -6,19 +6,16 @@
 
 #pragma once
 
-#include "math.hpp"
+#include "Vector3.hpp"
 
 namespace matrix
 {
 
-template <typename Type>
-class Dcm;
-
 template <typename Type>
 class Euler;
 
-template <typename Type>
-class AxisAngle;
+template<typename Type>
+class Quaternion;
 
 /**
  * AxisAngle class

src/lib/matrix/matrix/Dcm.hpp

@@ -15,19 +15,20 @@
 
 #pragma once
 
-#include "math.hpp"
+#include "SquareMatrix.hpp"
+#include "Vector3.hpp"
 
 namespace matrix
 {
 
 template<typename Type>
-class Quaternion;
+class AxisAngle;
 
 template<typename Type>
 class Euler;
 
 template<typename Type>
-class AxisAngle;
+class Quaternion;
 
 /**
  * Direction cosine matrix class

src/lib/matrix/matrix/Dcm2.hpp

@@ -48,7 +48,8 @@
 
 #pragma once
 
-#include "math.hpp"
+#include "SquareMatrix.hpp"
+#include "Vector2.hpp"
 
 namespace matrix
 {

src/lib/matrix/matrix/Dual.hpp

@@ -15,14 +15,12 @@
 
 #include <cmath>
 
-#include "math.hpp"
+#include "Scalar.hpp"
+#include "Vector.hpp"
 
 namespace matrix
 {
 
-template <typename Type, size_t M>
-class Vector;
-
 template <typename Scalar, size_t N>
 struct Dual {
 	static constexpr size_t WIDTH = N;

src/lib/matrix/matrix/Euler.hpp

@@ -15,17 +15,9 @@
 
 #pragma once
 
-#include "math.hpp"
-
 namespace matrix
 {
 
-template <typename Type>
-class Dcm;
-
-template <typename Type>
-class Quaternion;
-
 /**
  * Euler angles class
  *

src/lib/matrix/matrix/LeastSquaresSolver.hpp

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "math.hpp"
+#include "Vector.hpp"
 
 namespace matrix
 {

src/lib/matrix/matrix/Matrix.hpp

@@ -12,20 +12,12 @@
 #include <cstdio>
 #include <cstring>
 
-#include "math.hpp"
+#include "helper_functions.hpp"
+#include "Slice.hpp"
 
 namespace matrix
 {
 
-template <typename Type, size_t M>
-class Vector;
-
-template<typename Type, size_t M, size_t N>
-class Matrix;
-
-template <typename Type, size_t P, size_t Q, size_t M, size_t N>
-class Slice;
-
 template<typename Type, size_t M, size_t N>
 class Matrix
 {

src/lib/matrix/matrix/PseudoInverse.hpp

@@ -9,7 +9,8 @@
 
 #pragma once
 
-#include "math.hpp"
+#include "SquareMatrix.hpp"
+#include "Vector.hpp"
 
 namespace matrix
 {

src/lib/matrix/matrix/Quaternion.hpp

@@ -28,21 +28,20 @@
 
 #pragma once
 
-#include "math.hpp"
+#include <float.h> // FLT_EPSILON
+
+#include "Vector3.hpp"
+#include "Vector4.hpp"
 
 namespace matrix
 {
 
-template <typename Type>
-class Dcm;
-
 template <typename Type>
 class Euler;
 
 template <typename Type>
 class AxisAngle;
 
-
 /**
  * Quaternion class
  *

src/lib/matrix/matrix/Scalar.hpp

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "math.hpp"
+#include "Matrix.hpp"
 
 namespace matrix
 {

src/lib/matrix/matrix/Slice.hpp

@@ -8,8 +8,9 @@
 
 #pragma once
 
-#include "math.hpp"
-
+#include <cassert>
+#include <cstdio>
+#include <cmath>
 
 namespace matrix
 {

src/lib/matrix/matrix/SparseVector.hpp

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "math.hpp"
+#include "Vector.hpp"
 
 namespace matrix
 {

src/lib/matrix/matrix/SquareMatrix.hpp

@@ -10,20 +10,11 @@
 
 #include <float.h> // FLT_EPSILON
 
-#include "math.hpp"
+#include "Slice.hpp"
 
 namespace matrix
 {
 
-template <typename Type, size_t M, size_t N>
-class Matrix;
-
-template <typename Type, size_t M>
-class Vector;
-
-template <typename Type, size_t P, size_t Q, size_t M, size_t N>
-class Slice;
-
 template <typename Type, size_t  M>
 class SquareMatrix : public Matrix<Type, M, M>
 {

src/lib/matrix/matrix/Vector.hpp

@@ -8,14 +8,11 @@
 
 #pragma once
 
-#include "math.hpp"
+#include "Matrix.hpp"
 
 namespace matrix
 {
 
-template <typename Type, size_t M, size_t N>
-class Matrix;
-
 template<typename Type, size_t M>
 class Vector : public Matrix<Type, M, 1>
 {

src/lib/matrix/matrix/Vector2.hpp

@@ -8,14 +8,11 @@
 
 #pragma once
 
-#include "math.hpp"
+#include "Vector.hpp"
 
 namespace matrix
 {
 
-template <typename Type, size_t M>
-class Vector;
-
 template<typename Type>
 class Vector2 : public Vector<Type, 2>
 {

src/lib/matrix/matrix/Vector3.hpp

@@ -8,23 +8,14 @@
 
 #pragma once
 
-#include "math.hpp"
+#include "Vector.hpp"
 
 namespace matrix
 {
 
-template <typename Type, size_t M, size_t N>
-class Matrix;
-
-template <typename Type, size_t M>
-class Vector;
-
 template <typename Type>
 class Dcm;
 
-template <typename Type>
-class Vector2;
-
 template<typename Type>
 class Vector3 : public Vector<Type, 3>
 {

src/lib/matrix/matrix/Vector4.hpp

@@ -41,17 +41,11 @@
 
 #pragma once
 
-#include "math.hpp"
+#include "Vector.hpp"
 
 namespace matrix
 {
 
-template <typename Type, size_t M, size_t N>
-class Matrix;
-
-template <typename Type, size_t M>
-class Vector;
-
 template<typename Type>
 class Vector4 : public Vector<Type, 4>
 {

src/lib/matrix/matrix/filter.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
-#include "math.hpp"
+#include "Scalar.hpp"
+#include "SquareMatrix.hpp"
 
 namespace matrix
 {

src/lib/matrix/matrix/helper_functions.hpp

@@ -2,7 +2,7 @@
 
 #include <cmath>
 
-#include "math.hpp"
+#include <px4_platform_common/defines.h>
 
 namespace matrix
 {

src/lib/matrix/matrix/integration.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "math.hpp"
+#include "Vector.hpp"
 
 namespace matrix
 {

src/lib/matrix/matrix/math.hpp

@@ -1,24 +1,20 @@
 #pragma once
 
-#include <assert.h>
-#include <px4_platform_common/defines.h>
-
+#include "AxisAngle.hpp"
+#include "Dcm.hpp"
+#include "Dcm2.hpp"
+#include "Dual.hpp"
+#include "Euler.hpp"
 #include "helper_functions.hpp"
-
+#include "LeastSquaresSolver.hpp"
 #include "Matrix.hpp"
-#include "SquareMatrix.hpp"
+#include "PseudoInverse.hpp"
+#include "Quaternion.hpp"
+#include "Scalar.hpp"
 #include "Slice.hpp"
+#include "SparseVector.hpp"
+#include "SquareMatrix.hpp"
 #include "Vector.hpp"
 #include "Vector2.hpp"
 #include "Vector3.hpp"
 #include "Vector4.hpp"
-#include "Euler.hpp"
-#include "Dcm.hpp"
-#include "Dcm2.hpp"
-#include "Scalar.hpp"
-#include "Quaternion.hpp"
-#include "AxisAngle.hpp"
-#include "LeastSquaresSolver.hpp"
-#include "Dual.hpp"
-#include "PseudoInverse.hpp"
-#include "SparseVector.hpp"

src/lib/matrix/test/MatrixDcm2Test.cpp

@@ -34,6 +34,7 @@
 #include <gtest/gtest.h>
 #include <matrix/Dcm.hpp>
 #include <matrix/Dcm2.hpp>
+#include <matrix/Euler.hpp>
 
 using namespace matrix;
 

src/lib/matrix/test/MatrixFilterTest.cpp

@@ -33,6 +33,7 @@
 
 #include <gtest/gtest.h>
 #include <matrix/filter.hpp>
+#include <matrix/Vector.hpp>
 
 using namespace matrix;