Changeset d0246f84 in tol

Timestamp:

Jan 26, 2009, 4:05:11 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

5834e8a

Parents:

0dd5554c

Message:

Fixed bug in stopping criterium of MinimumResidualsSolve

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@501 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/bmath/blinalg/linalg.cpp (modified) (1 diff)

tol/bmath/blinalg/linalg.cpp

@@ -286 +286 @@
           BDat(100*relAdv  ).Format("%8.4lf")+"%)");
 #endif
-      if(maxpa.IsUnknown()    ) { break; }
-      if(advance      >  0    ) { break; }
-      if(maxpa        <= chop ) { break; }
-      if(Abs(advance) <= chop ) { break; }
-      if(Abs(relAdv)  <= chop ) { break; }
-      if(Abs(R)       <= chop ) { break; }
-      if
-      (
-        (oldMaxpa          <= BDat::Tolerance () ) &&
-        (maxpa             <= BDat::Tolerance () ) &&
-        (Abs(advance)      <= BDat::Tolerance () ) &&
-        (Abs(xNormAdvance) <= BDat::Tolerance () )
-      )
-      { break; }
-
+      if(S.IsUnknown()               ) { break; }
+      if(maxpa.IsUnknown()           ) { break; }
+      if(advance             >   0   ) { break; }
+      if(S                   <= chop ) { break; }
+/*
+      if(maxpa               <= chop ) { break; }
+      if(fabs(advance)       <= chop ) { break; }
+      if(fabs(relAdv)        <= chop ) { break; }
+      if(fabs(R)             <= chop ) { break; }
+      if(oldMaxpa            <= tol  ) { break; }
+      if(maxpa               <= tol  ) { break; }
+      if(fabs(advance)       <= tol  ) { break; }
+      if(xNormAdvance.Abs()  <= tol  ) { break; }
+*/
     }
     r -= q*a;