diff --git a/MathLib/LinAlg/SystemOfLinearEquations/LisOption.cpp b/MathLib/LinAlg/SystemOfLinearEquations/LisOption.cpp index 308f3dc0ff5eff18c6d3f5b01a7cbc5cdc29a4b5..8ee5d504b0932d7ef41b2be903afc0a6f692dd8f 100644 --- a/MathLib/LinAlg/SystemOfLinearEquations/LisOption.cpp +++ b/MathLib/LinAlg/SystemOfLinearEquations/LisOption.cpp @@ -88,9 +88,10 @@ LisOption::MatrixType LisOption::getMatrixType(const std::string &matrix_name) RETURN_MATRIX_ENUM_IF_SAME_STRING(matrix_name, ELL); RETURN_MATRIX_ENUM_IF_SAME_STRING(matrix_name, JDS); RETURN_MATRIX_ENUM_IF_SAME_STRING(matrix_name, BSR); + RETURN_MATRIX_ENUM_IF_SAME_STRING(matrix_name, BSC); RETURN_MATRIX_ENUM_IF_SAME_STRING(matrix_name, VBR); - RETURN_MATRIX_ENUM_IF_SAME_STRING(matrix_name, DNS); RETURN_MATRIX_ENUM_IF_SAME_STRING(matrix_name, COO); + RETURN_MATRIX_ENUM_IF_SAME_STRING(matrix_name, DNS); return MatrixType::CRS; #undef RETURN_MATRIX_ENUM_IF_SAME_STRING diff --git a/MathLib/LinAlg/SystemOfLinearEquations/LisOption.h b/MathLib/LinAlg/SystemOfLinearEquations/LisOption.h index 698bc5f13a5e287bfce0b7f9a862f304adc7335d..704b38f80ee8b6d4087ed341cd93e86b493c9793 100644 --- a/MathLib/LinAlg/SystemOfLinearEquations/LisOption.h +++ b/MathLib/LinAlg/SystemOfLinearEquations/LisOption.h @@ -14,7 +14,6 @@ #define LIS_OPTION_H_ #include <string> -#include "lis.h" namespace MathLib { @@ -70,16 +69,17 @@ struct LisOption /// Matrix type enum class MatrixType : int { - CRS = LIS_MATRIX_CRS, - CCS = LIS_MATRIX_CCS, - MSR = LIS_MATRIX_MSR, - DIA = LIS_MATRIX_DIA, - ELL = LIS_MATRIX_ELL, - JDS = LIS_MATRIX_JDS, - BSR = LIS_MATRIX_BSR, - VBR = LIS_MATRIX_VBR, - DNS = LIS_MATRIX_DNS, - COO = LIS_MATRIX_COO + CRS = 1, + CCS = 2, + MSR = 3, + DIA = 4, + ELL = 5, + JDS = 6, + BSR = 7, + BSC = 8, + VBR = 9, + COO = 10, + DNS = 11 }; /// Linear solver type