diff options
| -rw-r--r-- | bench/spbench/test_sparseLU.cpp | 2 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/sparse_solver.h | 4 | ||||
| -rw-r--r-- | test/sparselu.cpp | 43 |
4 files changed, 47 insertions, 4 deletions
diff --git a/bench/spbench/test_sparseLU.cpp b/bench/spbench/test_sparseLU.cpp index ecf254b3d..59f8252d0 100644 --- a/bench/spbench/test_sparseLU.cpp +++ b/bench/spbench/test_sparseLU.cpp @@ -70,7 +70,7 @@ int main(int argc, char **args) cout << "Factorize Time " << timer.value() << std::endl; timer.reset(); timer.start(); - solver._solve(b, x); + x = solver.solve(b); timer.stop(); cout << "solve time " << timer.value() << std::endl; /* Check the accuracy */ diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 8de795baa..0d5ab61af 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -200,7 +200,7 @@ ei_add_test(vectorwiseop) ei_add_test(simplicial_cholesky) ei_add_test(conjugate_gradient) ei_add_test(bicgstab) - +ei_add_test(sparselu) if(UMFPACK_FOUND) ei_add_test(umfpack_support "" "${UMFPACK_ALL_LIBS}") diff --git a/test/sparse_solver.h b/test/sparse_solver.h index 1bbaeb2dd..f529ad7e9 100644 --- a/test/sparse_solver.h +++ b/test/sparse_solver.h @@ -163,9 +163,9 @@ 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/"); + mat_folder = mat_folder + static_cast<std::string>("/complex/"); else - mat_folder = mat_folder + static_cast<string>("/real/"); + mat_folder = mat_folder + static_cast<std::string>("/real/"); return mat_folder; } #endif diff --git a/test/sparselu.cpp b/test/sparselu.cpp new file mode 100644 index 000000000..e960f9c93 --- /dev/null +++ b/test/sparselu.cpp @@ -0,0 +1,43 @@ +// This file is part of Eigen, a lightweight C++ template library +// for linear algebra. +// +// Copyright (C) 2012 Désiré Nuentsa-Wakam <desire.nuentsa_wakam@inria.fr> +// +// Eigen is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 3 of the License, or (at your option) any later version. +// +// Alternatively, you can redistribute it and/or +// modify it under the terms of the GNU General Public License as +// published by the Free Software Foundation; either version 2 of +// the License, or (at your option) any later version. +// +// Eigen is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +// FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License or the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License and a copy of the GNU General Public License along with +// Eigen. If not, see <http://www.gnu.org/licenses/>. +#include "sparse_solver.h" +#include <Eigen/SparseLU> +#include <unsupported/Eigen/SparseExtra> + +template<typename T> void test_sparselu_T() +{ + SparseLU<SparseMatrix<T, ColMajor>, COLAMDOrdering<int> > sparselu_colamd; + SparseLU<SparseMatrix<T, ColMajor>, AMDOrdering<int> > sparselu_amd; + + check_sparse_square_solving(sparselu_colamd); + check_sparse_square_solving(sparselu_amd); +} + +void test_sparselu() +{ + CALL_SUBTEST_1(test_sparselu_T<float>()); + CALL_SUBTEST_2(test_sparselu_T<double>()); + CALL_SUBTEST_3(test_sparselu_T<std::complex<float> >()); + CALL_SUBTEST_4(test_sparselu_T<std::complex<double> >()); +}
\ No newline at end of file |