diff --git a/CMakeLists.txt b/CMakeLists.txt index 59f47dc..3d2aada 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,9 @@ cmake_minimum_required(VERSION 3.12) + project(Math) set(CMAKE_CXX_STANDARD 20) add_library(Math Distribution.cpp Distribution.h DeterminantZero.cpp DeterminantZero.h VectorSizeMismatch.cpp VectorSizeMismatch.h MatrixColumnMismatch.cpp MatrixColumnMismatch.h MatrixDimensionMismatch.cpp MatrixDimensionMismatch.h MatrixNotPositiveDefinite.cpp MatrixNotPositiveDefinite.h MatrixNotSymmetric.cpp MatrixNotSymmetric.h MatrixRowColumnMismatch.cpp MatrixRowColumnMismatch.h MatrixRowMismatch.cpp MatrixRowMismatch.h Vector.cpp Vector.h Eigenvector.cpp Eigenvector.h DiscreteDistribution.cpp DiscreteDistribution.h Matrix.cpp Matrix.h MatrixNotSquare.cpp MatrixNotSquare.h) -add_executable(TestMath Distribution.cpp Distribution.h DeterminantZero.cpp DeterminantZero.h VectorSizeMismatch.cpp VectorSizeMismatch.h MatrixColumnMismatch.cpp MatrixColumnMismatch.h MatrixDimensionMismatch.cpp MatrixDimensionMismatch.h MatrixNotPositiveDefinite.cpp MatrixNotPositiveDefinite.h MatrixNotSymmetric.cpp MatrixNotSymmetric.h MatrixRowColumnMismatch.cpp MatrixRowColumnMismatch.h MatrixRowMismatch.cpp MatrixRowMismatch.h Vector.cpp Vector.h Eigenvector.cpp Eigenvector.h DiscreteDistribution.cpp DiscreteDistribution.h Matrix.cpp Matrix.h MatrixNotSquare.cpp MatrixNotSquare.h TestMath.cpp) \ No newline at end of file +add_executable(TestMath Distribution.cpp Distribution.h DeterminantZero.cpp DeterminantZero.h VectorSizeMismatch.cpp VectorSizeMismatch.h MatrixColumnMismatch.cpp MatrixColumnMismatch.h MatrixDimensionMismatch.cpp MatrixDimensionMismatch.h MatrixNotPositiveDefinite.cpp MatrixNotPositiveDefinite.h MatrixNotSymmetric.cpp MatrixNotSymmetric.h MatrixRowColumnMismatch.cpp MatrixRowColumnMismatch.h MatrixRowMismatch.cpp MatrixRowMismatch.h Vector.cpp Vector.h Eigenvector.cpp Eigenvector.h DiscreteDistribution.cpp DiscreteDistribution.h Matrix.cpp Matrix.h MatrixNotSquare.cpp MatrixNotSquare.h TestMath.cpp) diff --git a/DiscreteDistribution.h b/DiscreteDistribution.h index 4d4d0b7..293c2b7 100644 --- a/DiscreteDistribution.h +++ b/DiscreteDistribution.h @@ -4,7 +4,10 @@ #ifndef MATH_DISCRETEDISTRIBUTION_H #define MATH_DISCRETEDISTRIBUTION_H + #include +#include + using namespace std; class DiscreteDistribution : public map{ diff --git a/Matrix.cpp b/Matrix.cpp index 0474b5d..e92cb94 100644 --- a/Matrix.cpp +++ b/Matrix.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include "Matrix.h" #include "MatrixDimensionMismatch.h" #include "MatrixColumnMismatch.h" diff --git a/Matrix.h b/Matrix.h index f66a23b..1927d77 100644 --- a/Matrix.h +++ b/Matrix.h @@ -4,7 +4,7 @@ #ifndef MATH_MATRIX_H #define MATH_MATRIX_H -#include +#include #include "Vector.h" #include "Eigenvector.h" diff --git a/TestMath.cpp b/TestMath.cpp index 692c8f1..217aaee 100644 --- a/TestMath.cpp +++ b/TestMath.cpp @@ -14,4 +14,4 @@ int main(){ matrix.increment(0, 1); matrix.increment(1, 0); matrix.increment(1, 1); -} \ No newline at end of file +}