changeset 12101:ae70ce64beb7 release-3-2-x

Fix test for valid threshold value in sparse LU factorization
author David Bateman <dbateman@free.fr>
date Tue, 24 Nov 2009 08:00:32 +0100
parents 38f3c198ba63
children 52d8ad5d28d6
files liboctave/ChangeLog liboctave/SparseCmplxLU.cc liboctave/SparsedbleLU.cc
diffstat 3 files changed, 16 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog	Tue Nov 24 07:58:44 2009 +0100
+++ b/liboctave/ChangeLog	Tue Nov 24 08:00:32 2009 +0100
@@ -1,3 +1,15 @@
+2009-10-27  David Bateman  <dbateman@free.fr>
+
+	* SparsedbleLU.cc (SparseLU::SparseLU (const SparseMatrix&,
+	const Matrix&, bool), SparseLU::SparseLU (const SparseMatrix&,
+	const ColumnVector&, const Matrix&, boo, bool, double, bool,
+	bool)): Fix test for valid pivot tolerance.
+	* SparseCmplxLU.cc (SparseComplexLU::SparseComplexLU 
+	(const SparseComplexMatrix&, const Matrix&, bool), 
+	SparseComplexLU::SparseComplexLU (const SparseComplexMatrix&,
+	const ColumnVector&, const Matrix&, boo, bool, double, bool,
+	bool)): Ditto.
+
 	2009-09-18  Jaroslav Hajek  <highegg@gmail.com>
 
 	Version 3.2.3 released.
--- a/liboctave/SparseCmplxLU.cc	Tue Nov 24 07:58:44 2009 +0100
+++ b/liboctave/SparseCmplxLU.cc	Tue Nov 24 08:00:32 2009 +0100
@@ -57,7 +57,7 @@
   double tmp = octave_sparse_params::get_key ("spumoni");
   if (!xisnan (tmp))
     Control (UMFPACK_PRL) = tmp;
-  if (piv_thres.nelem() != 2)
+  if (piv_thres.nelem() == 2)
     {
       tmp = (piv_thres (0) > 1. ? 1. : piv_thres (0));
       if (!xisnan (tmp))
@@ -266,7 +266,7 @@
       double tmp = octave_sparse_params::get_key ("spumoni");
       if (!xisnan (tmp))
 	Control (UMFPACK_PRL) = tmp;
-      if (piv_thres.nelem() != 2)
+      if (piv_thres.nelem() == 2)
 	{
 	  tmp = (piv_thres (0) > 1. ? 1. : piv_thres (0));
 	  if (!xisnan (tmp))
--- a/liboctave/SparsedbleLU.cc	Tue Nov 24 07:58:44 2009 +0100
+++ b/liboctave/SparsedbleLU.cc	Tue Nov 24 08:00:32 2009 +0100
@@ -57,7 +57,7 @@
   if (!xisnan (tmp))
     Control (UMFPACK_PRL) = tmp;
 
-  if (piv_thres.nelem() != 2)
+  if (piv_thres.nelem() == 2)
     {
       tmp = (piv_thres (0) > 1. ? 1. : piv_thres (0));
       if (!xisnan (tmp))
@@ -253,7 +253,7 @@
       if (!xisnan (tmp))
 	Control (UMFPACK_PRL) = tmp;
 
-      if (piv_thres.nelem() != 2)
+      if (piv_thres.nelem() == 2)
 	{
 	  tmp = (piv_thres (0) > 1. ? 1. : piv_thres (0));
 	  if (!xisnan (tmp))