Changeset 804 in Sophya for trunk/SophyaLib/TArray/matharr.cc

Timestamp:

Apr 3, 2000, 7:36:01 PM (25 years ago)

Author:

ansari

Message:

Amelioation / debugging de la classe TArray<T> - TVector et TMatrix

heritent maintenant de TArray<T> - Classe RCMatrix rendu prive au fichier
sopemtx.cc - linfit.cc integre a sopemtx.cc

Reza 03/04/2000

File:

• trunk/SophyaLib/TArray/matharr.cc (modified) (3 diffs)

trunk/SophyaLib/TArray/matharr.cc

@@ -13 +13 @@
 TArray<T>& MathArray<T>::ApplyFunctionInPlace(TArray<T> & a, Arr_DoubleFunctionOfX f)
 {
+  if (a.NbDimensions() < 1) 
+    throw RangeCheckError("MathArray<T>::ApplyFunctionInPlace(TArray<T> & a..) Not Allocated Array a !");
   T * pe;
   uint_8 j,k;
@@ -36 +38 @@
 TArray<T>& MathArray<T>::ApplyFunctionInPlace(TArray<T> & a, Arr_FloatFunctionOfX f)
 {
+  if (a.NbDimensions() < 1) 
+    throw RangeCheckError("MathArray<T>::ApplyFunctionInPlace(TArray<T> & a..) Not Allocated Array a !");
   T * pe;
   uint_8 j,k;
@@ -75 +79 @@
 }
 
+template <class T>
+double MathArray<T>::MeanSigma(TArray<T> const & a, double & mean, double & sig)
+{
+  if (a.NbDimensions() < 1) 
+    throw RangeCheckError("MathArray<T>::MeanSigma(TArray<T> const & a..) Not Allocated Array a !");
+  const T * pe;
+  uint_8 j,k;
+  mean=0.;
+  sig = 0.;
+  double valok;
+  if (a.AvgStep() > 0)   {  // regularly spaced elements
+    uint_8 step = a.AvgStep(); 
+    uint_8 maxx = a.Size()*step;
+    pe = a.Data();
+    for(k=0; k<maxx; k+=step )  { 
+      valok = (double) pe[k]; 
+      mean += valok;  sig += valok*valok;
+    }
+  }
+  else {    // Non regular data spacing ...
+    uint_4 ka = a.MaxSizeKA();
+    uint_8 step = a.Step(ka);
+    uint_8 gpas = a.Size(ka)*step;
+    for(j=0; j<a.Size(); j += a.Size(ka))  {
+      pe = a.DataBlock().Begin()+a.Offset(j);
+      for(k=0; k<gpas; k+=step) { 
+        valok = (double) pe[k]; 
+        mean += valok;  sig += valok*valok;
+      }
+    }
+  }
+  double dsz = (double)(a.Size());
+  mean /= dsz;
+  sig = sig/dsz - mean*mean;
+  if (sig >= 0.) sig = sqrt(sig);
+  return(mean);
+}
+
 ///////////////////////////////////////////////////////////////
 #ifdef __CXX_PRAGMA_TEMPLATES__