Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
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)
3 changes: 3 additions & 0 deletions DiscreteDistribution.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@

#ifndef MATH_DISCRETEDISTRIBUTION_H
#define MATH_DISCRETEDISTRIBUTION_H

#include <map>
#include <string>

using namespace std;

class DiscreteDistribution : public map<string, int>{
Expand Down
1 change: 1 addition & 0 deletions Matrix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <fstream>
#include <random>
#include <complex>
#include <algorithm>
#include "Matrix.h"
#include "MatrixDimensionMismatch.h"
#include "MatrixColumnMismatch.h"
Expand Down
2 changes: 1 addition & 1 deletion Matrix.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#ifndef MATH_MATRIX_H
#define MATH_MATRIX_H
#include<string>
#include <string>
#include "Vector.h"
#include "Eigenvector.h"

Expand Down
2 changes: 1 addition & 1 deletion TestMath.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ int main(){
matrix.increment(0, 1);
matrix.increment(1, 0);
matrix.increment(1, 1);
}
}