Mercurial > octave-nkf

diff liboctave/dSparse.cc @ 5697:2fe20065a545

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-03-21 16:01:46 by dbateman]
author dbateman
date Tue, 21 Mar 2006 16:01:48 +0000
parents 233d98d95659
children 8bf74c0b2cbf
line wrap: on
line diff
--- a/liboctave/dSparse.cc	Mon Mar 20 18:52:46 2006 +0000
+++ b/liboctave/dSparse.cc	Tue Mar 21 16:01:48 2006 +0000
@@ -6884,7 +6884,8 @@
 }
 
 Matrix
-SparseMatrix::solve (SparseType &mattype, const Matrix& b, octave_idx_type& info) const
+SparseMatrix::solve (SparseType &mattype, const Matrix& b, 
+		     octave_idx_type& info) const
 {
   double rcond;
   return solve (mattype, b, info, rcond, 0);
@@ -6899,8 +6900,8 @@
 
 Matrix
 SparseMatrix::solve (SparseType &mattype, const Matrix& b, octave_idx_type& err, 
-		     double& rcond, 
-		     solve_singularity_handler sing_handler) const
+		     double& rcond, solve_singularity_handler sing_handler,
+		     bool singular_fallback) const
 {
   Matrix retval;
   int typ = mattype.type (false);
@@ -6929,7 +6930,7 @@
     }
 
   // Rectangular or one of the above solvers flags a singular matrix
-  if (mattype.type (false) == SparseType::Rectangular)
+  if (singular_fallback && mattype.type (false) == SparseType::Rectangular)
     {
       rcond = 1.;
 #ifdef USE_QRSOLVE
@@ -6968,7 +6969,8 @@
 SparseMatrix
 SparseMatrix::solve (SparseType &mattype, const SparseMatrix& b, 
 		     octave_idx_type& err, double& rcond,
-		     solve_singularity_handler sing_handler) const
+		     solve_singularity_handler sing_handler,
+		     bool singular_fallback) const
 {
   SparseMatrix retval;
   int typ = mattype.type (false);
@@ -6995,7 +6997,7 @@
       return SparseMatrix ();
     }
 
-  if (mattype.type (false) == SparseType::Rectangular)
+  if (singular_fallback && mattype.type (false) == SparseType::Rectangular)
     {
       rcond = 1.;
 #ifdef USE_QRSOLVE
@@ -7035,7 +7037,8 @@
 ComplexMatrix
 SparseMatrix::solve (SparseType &mattype, const ComplexMatrix& b, 
 		     octave_idx_type& err, double& rcond, 
-		     solve_singularity_handler sing_handler) const
+		     solve_singularity_handler sing_handler,
+		     bool singular_fallback) const
 {
   ComplexMatrix retval;
   int typ = mattype.type (false);
@@ -7062,7 +7065,7 @@
       return ComplexMatrix ();
     }
 
-  if (mattype.type(false) == SparseType::Rectangular)
+  if (singular_fallback && mattype.type(false) == SparseType::Rectangular)
     {
       rcond = 1.;
 #ifdef USE_QRSOLVE
@@ -7102,7 +7105,8 @@
 SparseComplexMatrix
 SparseMatrix::solve (SparseType &mattype, const SparseComplexMatrix& b, 
 		     octave_idx_type& err, double& rcond,
-		     solve_singularity_handler sing_handler) const
+		     solve_singularity_handler sing_handler,
+		     bool singular_fallback) const
 {
   SparseComplexMatrix retval;
   int typ = mattype.type (false);
@@ -7129,7 +7133,7 @@
       return SparseComplexMatrix ();
     }
 
-  if (mattype.type(false) == SparseType::Rectangular)
+  if (singular_fallback && mattype.type(false) == SparseType::Rectangular)
     {
       rcond = 1.;
 #ifdef USE_QRSOLVE