diff options
| author |  Desire NUENTSA <desire.nuentsa_wakam@inria.fr> | 2012-03-29 14:53:42 +0200 |
|---|---|---|
| committer | Desire NUENTSA <desire.nuentsa_wakam@inria.fr> | 2012-03-29 14:53:42 +0200 |
| commit | f776c061a17faf47bcebcd087d3d28d32e3f478a (patch) | |
| tree | dc612efd740d0cdeeffe90ee42423145e5d9949d /test/sparse_solver.h | |
| parent | f804a319c81cb1629abb9bdc97dd74a2d2dec3d7 (diff) | |
Correct a small bug in sparse_solver
Diffstat (limited to 'test/sparse_solver.h')
| -rw-r--r-- | test/sparse_solver.h | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/test/sparse_solver.h b/test/sparse_solver.h index 62c0e9495..1bbaeb2dd 100644 --- a/test/sparse_solver.h +++ b/test/sparse_solver.h @@ -74,17 +74,6 @@ void check_sparse_solving(Solver& solver, const typename Solver::MatrixType& A, VERIFY(x.isApprox(refX,test_precision<Scalar>())); } -template<typename Scalar> -inline std::string get_matrixfolder() -{ - std::string mat_folder = EIGEN_MATRIXDIR; - if( internal::is_same<Scalar, std::complex<float> >::value || internal::is_same<Scalar, std::complex<double> >::value ) - mat_folder = mat_folder + static_cast<string>("/complex/"); - else - mat_folder = mat_folder + static_cast<string>("/real/"); - return mat_folder; -} - template<typename Solver, typename Rhs> void check_sparse_solving_real_cases(Solver& solver, const typename Solver::MatrixType& A, const Rhs& b, const Rhs& refX) { @@ -167,6 +156,20 @@ int generate_sparse_spd_problem(Solver& , typename Solver::MatrixType& A, typena return size; } + +#ifdef TEST_REAL_CASES +template<typename Scalar> +inline std::string get_matrixfolder() +{ + std::string mat_folder = TEST_REAL_CASES; + if( internal::is_same<Scalar, std::complex<float> >::value || internal::is_same<Scalar, std::complex<double> >::value ) + mat_folder = mat_folder + static_cast<string>("/complex/"); + else + mat_folder = mat_folder + static_cast<string>("/real/"); + return mat_folder; +} +#endif + template<typename Solver> void check_sparse_spd_solving(Solver& solver) { typedef typename Solver::MatrixType Mat; @@ -199,7 +202,7 @@ template<typename Solver> void check_sparse_spd_solving(Solver& solver) } // First, get the folder -#ifdef EIGEN_MATRIXDIR +#ifdef TEST_REAL_CASES if (internal::is_same<Scalar, float>::value || internal::is_same<Scalar, std::complex<float> >::value) return ; @@ -278,7 +281,7 @@ template<typename Solver> void check_sparse_square_solving(Solver& solver) } // First, get the folder -#ifdef EIGEN_MATRIXDIR +#ifdef TEST_REAL_CASES if (internal::is_same<Scalar, float>::value || internal::is_same<Scalar, std::complex<float> >::value) return ; |