diff --git a/MathLib/LinAlg/Dense/DenseMatrix-impl.h b/MathLib/LinAlg/Dense/DenseMatrix-impl.h index 725f8a81aed1778d43f9cfc61d2d062b875e4092..2bb172b7cde37b0dda594f5618ce6bb120e87999 100644 --- a/MathLib/LinAlg/Dense/DenseMatrix-impl.h +++ b/MathLib/LinAlg/Dense/DenseMatrix-impl.h @@ -56,7 +56,6 @@ DenseMatrix<FP_TYPE, IDX_TYPE>::~DenseMatrix () template <typename FP_TYPE, typename IDX_TYPE> DenseMatrix<FP_TYPE, IDX_TYPE>& DenseMatrix<FP_TYPE, IDX_TYPE>::operator=(DenseMatrix<FP_TYPE, IDX_TYPE> const& rhs) - noexcept(false) { if (this == &rhs) return *this; @@ -140,7 +139,6 @@ V DenseMatrix<FP_TYPE, IDX_TYPE>::operator* (V const& x) const template<typename FP_TYPE, typename IDX_TYPE> DenseMatrix<FP_TYPE, IDX_TYPE>* DenseMatrix<FP_TYPE, IDX_TYPE>::operator+(const DenseMatrix<FP_TYPE, IDX_TYPE>& mat) const - noexcept(false) { // make sure the two matrices have the same dimension. if (_n_rows != mat.getNRows() || _n_cols != mat.getNCols()) @@ -159,7 +157,6 @@ DenseMatrix<FP_TYPE, IDX_TYPE>::operator+(const DenseMatrix<FP_TYPE, IDX_TYPE>& template<typename FP_TYPE, typename IDX_TYPE> DenseMatrix<FP_TYPE, IDX_TYPE>* DenseMatrix<FP_TYPE, IDX_TYPE>::operator-(const DenseMatrix<FP_TYPE, IDX_TYPE>& mat) const - noexcept(false) { // make sure the two matrices have the same dimension. if (_n_rows != mat.getNRows() || _n_cols != mat.getNCols()) @@ -178,7 +175,6 @@ DenseMatrix<FP_TYPE, IDX_TYPE>::operator-(const DenseMatrix<FP_TYPE, IDX_TYPE>& template<typename FP_TYPE, typename IDX_TYPE> DenseMatrix<FP_TYPE, IDX_TYPE>* DenseMatrix<FP_TYPE, IDX_TYPE>::operator*(const DenseMatrix<FP_TYPE, IDX_TYPE>& mat) const - noexcept(false) { // make sure the two matrices have the same dimension. if (_n_cols != mat.getNRows()) @@ -218,7 +214,6 @@ DenseMatrix<FP_TYPE, IDX_TYPE>* DenseMatrix<FP_TYPE, IDX_TYPE>::getSubMatrix( IDX_TYPE b_row, IDX_TYPE b_col, IDX_TYPE e_row, IDX_TYPE e_col) const - noexcept(false) { if (b_row >= e_row | b_col >= e_col) throw std::range_error("DenseMatrix::getSubMatrix() illegal sub matrix"); @@ -239,7 +234,6 @@ template<typename FP_TYPE, typename IDX_TYPE> void DenseMatrix<FP_TYPE, IDX_TYPE>::setSubMatrix(IDX_TYPE b_row, IDX_TYPE b_col, const DenseMatrix<FP_TYPE, IDX_TYPE>& sub_mat) - noexcept(false) { if (b_row + sub_mat.getNRows() > _n_rows | b_col + sub_mat.getNCols() > _n_cols) throw std::range_error("DenseMatrix::setSubMatrix() sub matrix to big"); @@ -254,7 +248,6 @@ DenseMatrix<FP_TYPE, IDX_TYPE>::setSubMatrix(IDX_TYPE b_row, IDX_TYPE b_col, template<typename FP_TYPE, typename IDX_TYPE> FP_TYPE& DenseMatrix<FP_TYPE, IDX_TYPE>::operator() (IDX_TYPE row, IDX_TYPE col) - noexcept(false) { if ((row >= _n_rows) | (col >= _n_cols)) throw std::range_error("DenseMatrix: op() const range error"); @@ -265,7 +258,6 @@ DenseMatrix<FP_TYPE, IDX_TYPE>::operator() (IDX_TYPE row, IDX_TYPE col) template<typename FP_TYPE, typename IDX_TYPE> FP_TYPE const& DenseMatrix<FP_TYPE, IDX_TYPE>::operator() (IDX_TYPE row, IDX_TYPE col) const - noexcept(false) { if ((row >= _n_rows) | (col >= _n_cols)) throw std::range_error("DenseMatrix: op() const range error"); diff --git a/MathLib/LinAlg/Dense/DenseMatrix.h b/MathLib/LinAlg/Dense/DenseMatrix.h index b98e3568c4d9f233d2f152d032c9890a75060828..0847d25d2657326079d36dad0ab432f89f2f6ef5 100644 --- a/MathLib/LinAlg/Dense/DenseMatrix.h +++ b/MathLib/LinAlg/Dense/DenseMatrix.h @@ -64,7 +64,7 @@ public: * Assignment operator, makes a copy of the internal data of the object. * @param rhs The DenseMatrix object to the right side of the assignment symbol. */ - DenseMatrix& operator=(DenseMatrix const& rhs) noexcept(false); + DenseMatrix& operator=(DenseMatrix const& rhs); /** * This is the move assignment operator. @@ -88,18 +88,18 @@ public: /** * DenseMatrix matrix addition. */ - DenseMatrix* operator+ (const DenseMatrix& mat) const noexcept(false); + DenseMatrix* operator+ (const DenseMatrix& mat) const; /** * DenseMatrix matrix subtraction */ - DenseMatrix* operator- (const DenseMatrix& mat) const noexcept(false); + DenseMatrix* operator- (const DenseMatrix& mat) const; /** * DenseMatrix matrix multiplication \f$ C = A \cdot B\f$ * @param mat the matrix \f$ B \f$ * @return the matrix \f$ C \f$ */ - DenseMatrix* operator* (const DenseMatrix& mat) const noexcept(false); + DenseMatrix* operator* (const DenseMatrix& mat) const; /** * matrix transpose @@ -107,7 +107,7 @@ public: */ DenseMatrix* transpose() const; // HB & ZC - DenseMatrix* getSubMatrix (IDX_TYPE b_row, IDX_TYPE b_col, IDX_TYPE e_row, IDX_TYPE e_col) const noexcept(false); + DenseMatrix* getSubMatrix (IDX_TYPE b_row, IDX_TYPE b_col, IDX_TYPE e_row, IDX_TYPE e_col) const; /** * overwrites values of the matrix with the given sub matrix @@ -115,10 +115,10 @@ public: * @param b_col the first column * @param sub_mat the sub matrix */ - void setSubMatrix (IDX_TYPE b_row, IDX_TYPE b_col, const DenseMatrix& sub_mat) noexcept(false); + void setSubMatrix (IDX_TYPE b_row, IDX_TYPE b_col, const DenseMatrix& sub_mat); - inline FP_TYPE & operator() (IDX_TYPE row, IDX_TYPE col) noexcept(false); - inline FP_TYPE const& operator() (IDX_TYPE row, IDX_TYPE col) const noexcept(false); + inline FP_TYPE & operator() (IDX_TYPE row, IDX_TYPE col); + inline FP_TYPE const& operator() (IDX_TYPE row, IDX_TYPE col) const; /** * writes the matrix entries into the output stream