Mercurial > octave
changeset 32723:6539de546690
maint: Remove conditional compilation for unused define USE_QRSOLVE.
* CSparse.cc, dSparse.cc: Remove all conditional compilations referencing
USE_QRSOLVE.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 10 Jan 2024 16:11:23 -0800 |
| parents | 130b9fbc5ebb |
| children | 5f1297f61e54 |
| files | liboctave/array/CSparse.cc liboctave/array/dSparse.cc |
| diffstat | 2 files changed, 2 insertions(+), 44 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/array/CSparse.cc Wed Jan 10 18:37:21 2024 -0500 +++ b/liboctave/array/CSparse.cc Wed Jan 10 16:11:23 2024 -0800 @@ -63,12 +63,7 @@ #include "Sparse-perm-op-defs.h" -// Define whether to use a basic QR solver or one that uses a Dulmange -// Mendelsohn factorization to separate the problem into under-determined, -// well-determined and over-determined parts and solves them separately -#if ! defined (USE_QRSOLVE) -# include "sparse-dmsolve.h" -#endif +#include "sparse-dmsolve.h" SparseComplexMatrix::SparseComplexMatrix (const SparseMatrix& a) : MSparse<Complex> (a) @@ -6756,12 +6751,8 @@ if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; -#if defined (USE_QRSOLVE) - retval = qrsolve (*this, b, err); -#else retval = dmsolve<ComplexMatrix, SparseComplexMatrix, Matrix> (*this, b, err); -#endif } return retval; @@ -6821,12 +6812,8 @@ if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; -#if defined (USE_QRSOLVE) - retval = qrsolve (*this, b, err); -#else retval = dmsolve<SparseComplexMatrix, SparseComplexMatrix, SparseMatrix> (*this, b, err); -#endif } return retval; @@ -6886,12 +6873,8 @@ if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; -#if defined (USE_QRSOLVE) - retval = qrsolve (*this, b, err); -#else retval = dmsolve<ComplexMatrix, SparseComplexMatrix, ComplexMatrix> (*this, b, err); -#endif } return retval; @@ -6952,12 +6935,8 @@ if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; -#if defined (USE_QRSOLVE) - retval = qrsolve (*this, b, err); -#else retval = dmsolve<SparseComplexMatrix, SparseComplexMatrix, SparseComplexMatrix> (*this, b, err); -#endif } return retval;
--- a/liboctave/array/dSparse.cc Wed Jan 10 18:37:21 2024 -0500 +++ b/liboctave/array/dSparse.cc Wed Jan 10 16:11:23 2024 -0800 @@ -55,12 +55,7 @@ #include "Sparse-perm-op-defs.h" -// Define whether to use a basic QR solver or one that uses a Dulmange -// Mendelsohn factorization to separate the problem into under-determined, -// well-determined and over-determined parts and solves them separately -#if ! defined (USE_QRSOLVE) -# include "sparse-dmsolve.h" -#endif +#include "sparse-dmsolve.h" SparseMatrix::SparseMatrix (const SparseBoolMatrix& a) : MSparse<double> (a.rows (), a.cols (), a.nnz ()) @@ -6748,11 +6743,7 @@ if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; -#if defined (USE_QRSOLVE) - retval = qrsolve (*this, b, err); -#else retval = dmsolve<Matrix, SparseMatrix, Matrix> (*this, b, err); -#endif } return retval; @@ -6812,12 +6803,8 @@ if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; -#if defined (USE_QRSOLVE) - retval = qrsolve (*this, b, err); -#else retval = dmsolve<SparseMatrix, SparseMatrix, SparseMatrix> (*this, b, err); -#endif } return retval; @@ -6877,12 +6864,8 @@ if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; -#if defined (USE_QRSOLVE) - retval = qrsolve (*this, b, err); -#else retval = dmsolve<ComplexMatrix, SparseMatrix, ComplexMatrix> (*this, b, err); -#endif } return retval; @@ -6942,12 +6925,8 @@ if (singular_fallback && mattype.type (false) == MatrixType::Rectangular) { rcond = 1.; -#if defined (USE_QRSOLVE) - retval = qrsolve (*this, b, err); -#else retval = dmsolve<SparseComplexMatrix, SparseMatrix, SparseComplexMatrix> (*this, b, err); -#endif } return retval;