From 2e9068f4fe635176c498a546a5742c938561460d Mon Sep 17 00:00:00 2001 From: "Dmitry Yu. Naumov" <github@naumov.de> Date: Sun, 13 Dec 2015 20:17:13 +0000 Subject: [PATCH] [MaL] Remove MathLib::DenseMatrixIndexType typedef --- MathLib/LinAlg/Dense/DenseTools.cpp | 13 ++++++------- MathLib/LinAlg/Dense/DenseTools.h | 13 ++++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/MathLib/LinAlg/Dense/DenseTools.cpp b/MathLib/LinAlg/Dense/DenseTools.cpp index 32a9cf03999..f9ae84c7722 100644 --- a/MathLib/LinAlg/Dense/DenseTools.cpp +++ b/MathLib/LinAlg/Dense/DenseTools.cpp @@ -16,9 +16,8 @@ namespace MathLib { - -void applyKnownSolution(DenseMatrix<double> &eqsA, DenseVector<double> &eqsRHS, - DenseMatrixIndexType k, double val) +void applyKnownSolution(DenseMatrix<double>& eqsA, DenseVector<double>& eqsRHS, + DenseMatrix<double>::IDX_T k, double val) { const std::size_t n_rows = eqsA.getNRows(); const std::size_t n_cols = eqsA.getNCols(); @@ -47,10 +46,10 @@ void applyKnownSolution(DenseMatrix<double> &eqsA, DenseVector<double> &eqsRHS, eqsRHS[k] = val; } -void applyKnownSolution(DenseMatrix<double> &A, DenseVector<double> &b, - DenseVector<double> &/*x*/, - const std::vector<DenseMatrixIndexType> &vec_knownX_id, - const std::vector<double> &vec_knownX_x) +void applyKnownSolution( + DenseMatrix<double>& A, DenseVector<double>& b, DenseVector<double>& /*x*/, + const std::vector<DenseMatrix<double>::IDX_T>& vec_knownX_id, + const std::vector<double>& vec_knownX_x) { const std::size_t n_bc = vec_knownX_id.size(); for (std::size_t i_bc = 0; i_bc < n_bc; i_bc++) diff --git a/MathLib/LinAlg/Dense/DenseTools.h b/MathLib/LinAlg/Dense/DenseTools.h index 97bbdad8886..826e8e510bf 100644 --- a/MathLib/LinAlg/Dense/DenseTools.h +++ b/MathLib/LinAlg/Dense/DenseTools.h @@ -21,7 +21,6 @@ namespace MathLib { -typedef DenseMatrix<double>::IDX_T DenseMatrixIndexType; /** * Apply known solutions to a system of linear equations. * @@ -33,10 +32,10 @@ typedef DenseMatrix<double>::IDX_T DenseMatrixIndexType; * @param vec_knownX_id a vector of known solution entry IDs * @param vec_knownX_x a vector of known solutions */ -void applyKnownSolution(DenseMatrix<double> &A, DenseVector<double> &b, - DenseVector<double> &/*x*/, - const std::vector<DenseMatrixIndexType> &vec_knownX_id, - const std::vector<double> &vec_knownX_x); +void applyKnownSolution( + DenseMatrix<double>& A, DenseVector<double>& b, DenseVector<double>& /*x*/, + const std::vector<DenseMatrix<double>::IDX_T>& vec_knownX_id, + const std::vector<double>& vec_knownX_x); /** * Apply known solutions to a system of linear equations \f$A x = b\f$. @@ -52,8 +51,8 @@ void applyKnownSolution(DenseMatrix<double> &A, DenseVector<double> &b, * @param row_id a known solution entry ID * @param val a known solution */ -void applyKnownSolution(DenseMatrix<double> &A, DenseVector<double> &b, - DenseMatrixIndexType row_id, double val); +void applyKnownSolution(DenseMatrix<double>& A, DenseVector<double>& b, + DenseMatrix<double>::IDX_T row_id, double val); } // MathLib -- GitLab