Changeset 0776f70 in tol

Timestamp:

Oct 6, 2009, 5:12:08 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

4a044ad

Parents:

f3e971a

Message:

Fixed #754

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

File:

• tol/bmath/blinalg/linalg.cpp (modified) (2 diffs)

tol/bmath/blinalg/linalg.cpp

@@ -217 +217 @@
 //--------------------------------------------------------------------
 {
+  double tolerance = chop*chop;
   BInt k, rows=A_.Rows(), cols=A_.Columns();
   /* PRECONDITIONS: ENSURING DIMENSIONS */
@@ -275 +276 @@
     relAdv = advance/oldR;
 #ifdef TRZ_MinimumResidualsSolve
-    Std(pr+" Iteration "+k+
-              "\tAbsMaxNorm : "+maxpa.Format("%lg")+
-              "\tResNorm : "+BDat(R).Format("%lg"));
+    if(k && !(k%cols))
+    {
+      Std(pr+" Iteration "+k+
+                "\tAbsMaxNorm : "+maxpa.Format("%lg")+
+                "\tResNorm : "+BDat(R).Format("%lg"));
+      Std(BText(" - ")+
+          BDat(oldR        ).Format("%lg"   )+" = "+
+            BDat(advance           ).Format("%lg"   )+" ("+
+            BDat(xNormAdvance).Format("%lg"   )+" ,"+
+            BDat(100*relAdv  ).Format("%8.4lf")+"%)");
+   }
 #endif
-    if(k)
-    {
-#ifdef TRZ_MinimumResidualsSolve
-      Std(BText(" - ")+
-          BDat(oldR        ).Format("%lg"   )+" = "+
-          BDat(advance     ).Format("%lg"   )+" ("+
-          BDat(xNormAdvance).Format("%lg"   )+" ,"+
-          BDat(100*relAdv  ).Format("%8.4lf")+"%)");
-#endif
-      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;
-    s  = At*r;
-    oldS = S;
-    S  = MtMSqr(s)(0,0);
-    b  = S.Value()/oldS.Value();
-    p*=b; p+=s;
+    if(S.IsUnknown()                    ) { break; }
+    if(maxpa.IsUnknown()                ) { break; }
+    if(advance             >=  0        ) { break; }
+    if(S                   <= tolerance ) { break; }
+    if(1+maxpa-1           == 0         ) { break; }
+  }
+  r -= q*a;
+  s  = At*r;
+  oldS = S;
+  S  = MtMSqr(s)(0,0);
+  b  = S.Value()/oldS.Value();
+  p*=b; p+=s;
 
 //  Std(BText("\cols")+k+"\t"+S);
-  }
 /*
   Std(pr+" Iteration "+k+