Changeset 176cd7a4 in tol

Timestamp:

Jan 19, 2010, 9:06:34 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

d6488fb

Parents:

28688f8

Message:

SquaresdSum should be SquaredSum

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

Location:

tol/btol/vmatrix_type

Files:

• tol_bvmat.h (modified) (1 diff)
• vmat_iterative.cpp (modified) (6 diffs)
• vmat_stats.cpp (modified) (2 diffs)

tol/btol/vmatrix_type/tol_bvmat.h

@@ -515 +515 @@
   double Var() const;
   double StDs() const;
-  double SquaresdSum() const;
+  double SquaredSum() const;
   double EuclideanNorm() const;
   double FrobeniusNorm() const;

tol/btol/vmatrix_type/vmat_iterative.cpp

@@ -87 +87 @@
   BDat oldMaxpa;
   BDat oldS;
-  BDat S = s.SquaresdSum();
+  BDat S = s.SquaredSum();
   BDat tol = BDat::Tolerance();
 
@@ -103 +103 @@
 */
     q = A*p;
-    q2 = q.SquaresdSum();
+    q2 = q.SquaredSum();
     a = S.Value()/q2;
     pa = p*a;
@@ -148 +148 @@
     s = (r.T()*A).T();
     oldS = S;
-    S  = s.SquaresdSum();
+    S  = s.SquaredSum();
     b  = S.Value()/oldS.Value();
     p = p*b+s;
@@ -285 +285 @@
   BDat oldMaxpa;
   BDat oldS;
-  BDat S = s.SquaresdSum();
+  BDat S = s.SquaredSum();
   BDat tol = BDat::Tolerance();
 
@@ -299 +299 @@
     }
     OprProd(A,p,false,q);
-    q2 = q.SquaresdSum();
+    q2 = q.SquaredSum();
     a = S.Value()/q2;
     pa = p*a;
@@ -341 +341 @@
     OprProd(A,r,true,s);
     oldS = S;
-    S  = s.SquaresdSum();
+    S  = s.SquaredSum();
     b  = S.Value()/oldS.Value();
     p = p*b+s;

tol/btol/vmatrix_type/vmat_stats.cpp

@@ -239 +239 @@
 
 ////////////////////////////////////////////////////////////////////////////////
-double BVMat::SquaresdSum() const
-////////////////////////////////////////////////////////////////////////////////
-{
-  if(!CheckDefined("VMatSquaresdSum")) { return(BDat::Nan()); }
+double BVMat::SquaredSum() const
+////////////////////////////////////////////////////////////////////////////////
+{
+  if(!CheckDefined("VMatSquaredSum")) { return(BDat::Nan()); }
   int k,nzmax;
   int size = Rows()*Columns();
@@ -267 +267 @@
 {
   if(!CheckDefined("VMatEuclideanNorm")) { return(BDat::Nan()); }
-  return(sqrt(SquaresdSum()));
+  return(sqrt(SquaredSum()));
 }