Mercurial > octave-nkf
comparison liboctave/eigs-base.cc @ 12282:81e9ff0cc729 release-3-4-x
eigs-base.cc: fix error in change removing HAVE_ARPACK
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 28 Jan 2011 14:21:57 -0500 |
parents | 52f6f2989fcd |
children | 72c96de7a403 |
comparison
equal
deleted
inserted
replaced
12281:3f162dd0c112 | 12282:81e9ff0cc729 |
---|---|
198 static ComplexMatrix | 198 static ComplexMatrix |
199 utsolve (const ComplexMatrix&, const ColumnVector&, const ComplexMatrix&); | 199 utsolve (const ComplexMatrix&, const ColumnVector&, const ComplexMatrix&); |
200 | 200 |
201 static Matrix | 201 static Matrix |
202 utsolve (const Matrix&, const ColumnVector&, const Matrix&); | 202 utsolve (const Matrix&, const ColumnVector&, const Matrix&); |
203 | |
204 #endif | |
203 | 205 |
204 template <class M, class SM> | 206 template <class M, class SM> |
205 static octave_idx_type | 207 static octave_idx_type |
206 lusolve (const SM& L, const SM& U, M& m) | 208 lusolve (const SM& L, const SM& U, M& m) |
207 { | 209 { |
3825 octave_idx_type &info, ComplexMatrix &eig_vec, | 3827 octave_idx_type &info, ComplexMatrix &eig_vec, |
3826 ComplexColumnVector &eig_val, | 3828 ComplexColumnVector &eig_val, |
3827 ComplexColumnVector &resid, std::ostream& os, | 3829 ComplexColumnVector &resid, std::ostream& os, |
3828 double tol = DBL_EPSILON, bool rvec = false, | 3830 double tol = DBL_EPSILON, bool rvec = false, |
3829 bool cholB = 0, int disp = 0, int maxit = 300); | 3831 bool cholB = 0, int disp = 0, int maxit = 300); |
3830 #endif | |
3831 | 3832 |
3832 #ifndef _MSC_VER | 3833 #ifndef _MSC_VER |
3833 template static octave_idx_type | 3834 template static octave_idx_type |
3834 lusolve (const SparseMatrix&, const SparseMatrix&, Matrix&); | 3835 lusolve (const SparseMatrix&, const SparseMatrix&, Matrix&); |
3835 | 3836 |