Changeset eca8d89 in tol

Timestamp:

Jan 25, 2009, 6:47:18 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

f14db26

Parents:

8b75c1f2

Message:

New methods SquaresdSum, EuclideanNorm, FrobeniusNorm

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

File:

• tol/btol/vmatrix_type/vmat_stats.cpp (modified) (1 diff)

tol/btol/vmatrix_type/vmat_stats.cpp

@@ -223 +223 @@
   if(!CheckDefined("VMatStDs")) { return(BDat::Nan()); }
   return(sqrt(Var()));
+}
+
+////////////////////////////////////////////////////////////////////////////////
+double BVMat::FrobeniusNorm() const
+////////////////////////////////////////////////////////////////////////////////
+{
+  if(!CheckDefined("VMatFrobeniusNorm")) { return(BDat::Nan()); }
+  return(sqrt(Moment(2)));
+}
+
+////////////////////////////////////////////////////////////////////////////////
+double BVMat::SquaresdSum() const
+////////////////////////////////////////////////////////////////////////////////
+{
+  if(!CheckDefined("VMatSquaresdSum")) { return(BDat::Nan()); }
+  int k,nzmax;
+  int size = Rows()*Columns();
+  int n = size;
+  const double *x;
+  if(!StoredData(x, nzmax)) { return(0.0); }
+  double result = 0;
+  for(k=0; k<nzmax; k++)
+  {
+    if(!IS_NAN(x[k]))
+    {
+      result += x[k]*x[k];
+    }
+    else
+    {
+      n--;
+    }
+  }
+  return(result);
+}
+////////////////////////////////////////////////////////////////////////////////
+double BVMat::EuclideanNorm() const
+////////////////////////////////////////////////////////////////////////////////
+{
+  if(!CheckDefined("VMatEuclideanNorm")) { return(BDat::Nan()); }
+  return(sqrt(SquaresdSum()));
 }