Changeset 627cedd in tol

Timestamp:

Sep 11, 2009, 2:54:07 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

af55571

Parents:

da6cdaa

Message:

New _.verbose member

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

Location:

tol/stdlib/math/linalg

Files:

• _solve_precond_sym.tol (modified) (3 diffs)
• _solve_precond_unsym.tol (modified) (4 diffs)

tol/stdlib/math/linalg/_solve_precond_sym.tol

@@ -43 +43 @@
   Real _.do.normalize = do.normalize;
   Real _.m = VRows(_.M);
-
+  Real _.verbose = False;
   //Returns a diagonal normalizer VMatrix for a symmetric VMatrix
   VMatrix Normalizer(VMatrix M)
@@ -85 +85 @@
     Text _MID = "[SolvePrecondSym()::ScaleEval()] ";
     VMatrix _.Sc := _.S + VMatrix Eye(_.m,_.m,0,c);
-    Real old = Show(0,"ALL");
-    VMatrix _.Lc := CholeskiFactor(_.Sc,"X");
-    Real Show(old,"ALL");
+    VMatrix _.Lc := CholeskiFactor(_.Sc,"X",FALSE,FALSE);
     Real ok = VRows(_.Lc)==_.m;
-    WriteLn(_MID+"("<<c+") = "<<ok);
+    If( _.verbose, WriteLn(_MID+"("<<c+") = "<<ok));
     ok
   };
@@ -152 +150 @@
       Real ok.1 = VRows(_.x)==_.m;
       Real ok.2 = _.maxErr <= _.tol.solver;
-      If(!ok.1,WriteLn(_MID+"Wrong dimensions" ,"W"));
-      If(!ok.2,WriteLn(_MID+"Solution has maximum absolute error "<<_.maxErr+
-        " great than specified tolerance "<<_.tol.solver,"W"));
+      If( _.verbose, If(!ok.1,WriteLn(_MID+"Wrong dimensions" ,"W")));
+      If( _.verbose, If(!ok.2,WriteLn(_MID+"Solution has maximum "
+        "absolute error "<<_.maxErr+
+        " great than specified tolerance "<<_.tol.solver,"W")));
       And(ok.1,ok.2)
     }

tol/stdlib/math/linalg/_solve_precond_unsym.tol

@@ -34 +34 @@
 NameBlock SolvePrecondUnsym(VMatrix M, Real do.normalize)
 {[[
+  Real _.verbose = False; 
   //Original s  //Original symmetric system to be solved M*x = y
   VMatrix _.M = M;
@@ -75 +76 @@
     VMatrix Dc = Eye(_.n,_.n,0,c);
     VMatrix Hc = _.H << Dc;
-    Real old = Show(0,"ALL");
-    VMatrix Lc = CholeskiFactor(Hc,"XtX");
-    Real Show(old,"ALL");
+    VMatrix Lc = CholeskiFactor(Hc,"XtX",FALSE,FALSE);
     Real ok = VRows(Lc)==_.n;
     Real If(ok,
@@ -85 +84 @@
       1
     });
-    WriteLn(_MID+"("<<c+") = "<<ok); 
+    If(_.verbose, WriteLn(_MID+"("<<c+") = "<<ok)); 
     ok
   };
@@ -165 +164 @@
         Real ok.1 = VRows(_.x)==_.n;
         Real ok.2 = _.maxErr <= _.tol.solver;
-        If(!ok.1,WriteLn(_MID+"Wrong dimensions" ,"W"));
-        If(!ok.2,WriteLn(_MID+"Solution has maximum absolute error "<<_.maxErr+
-          " great than specified tolerance "<<_.tol.solver,"W"));
+        If(_.verbose, If(!ok.1,WriteLn(_MID+"Wrong dimensions" ,"W")));
+        If(_.verbose, If(!ok.2,WriteLn(_MID+"Solution has maximum "
+          "absolute error "<<_.maxErr+
+          " great than specified tolerance "<<_.tol.solver,"W")));
         And(ok.1,ok.2)
       }