Changeset 1113 in Sophya for trunk/SophyaLib/TArray

Timestamp:

Jul 28, 2000, 6:46:25 PM (25 years ago)

Author:

ansari

Message:

Ajout Methodes TArray::MinMax() et TArray::SumX2() - Reza 28/7/2000

Location:

trunk/SophyaLib/TArray

Files:

• tarray.cc (modified) (4 diffs)
• tarray.h (modified) (1 diff)

trunk/SophyaLib/TArray/tarray.cc

@@ -838 +838 @@
   if (NbDimensions() < 1) 
     throw RangeCheckError("TArray<T>::Product()  - Not Allocated Array ! ");
+  T ret=(T)1;
+  const T * pe;
+  uint_8 j,k;
+  if (AvgStep() > 0)   {  // regularly spaced elements
+    uint_8 step = AvgStep();
+    uint_8 maxx = totsize_*step;
+    pe = Data();
+    for(k=0; k<maxx; k+=step )  ret *= pe[k];
+  }
+  else {    // Non regular data spacing ...
+    uint_4 ka = MaxSizeKA();
+    uint_8 step = Step(ka);
+    uint_8 gpas = Size(ka)*step;
+    uint_8 naxa = Size()/Size(ka);
+    for(j=0; j<naxa; j++)  {
+      pe = mNDBlock.Begin()+Offset(ka,j);
+      for(k=0; k<gpas; k+=step)  ret *= pe[k] ;
+    }
+  }
+  return ret;
+}
+
+//! Returns the sum of all elements squared (Sum
+template <class T>
+T TArray<T>::SumX2() const
+{
+  if (NbDimensions() < 1) 
+    throw RangeCheckError("TArray<T>::SumX2()  - Not Allocated Array ! ");
   T ret=0;
   const T * pe;
@@ -845 +873 @@
     uint_8 maxx = totsize_*step;
     pe = Data();
-    for(k=0; k<maxx; k+=step )  ret *= pe[k];
+    for(k=0; k<maxx; k+=step )  ret += pe[k]*pe[k];
   }
   else {    // Non regular data spacing ...
@@ -854 +882 @@
     for(j=0; j<naxa; j++)  {
       pe = mNDBlock.Begin()+Offset(ka,j);
-      for(k=0; k<gpas; k+=step)  ret *= pe[k] ;
+      for(k=0; k<gpas; k+=step)  ret += pe[k]*pe[k] ;
     }
   }
@@ -860 +888 @@
 }
 
-
+//! Return the minimum and the maximum values of the array elements 
+/*!
+  This method generates an exception (\c MathExc) if called for complex arrays
+*/
+template <class T>
+void TArray<T>::MinMax(T& min, T& max) const
+{
+  const T * pe;
+  uint_8 j,k;
+  uint_4 ka = MaxSizeKA();
+  uint_8 step = Step(ka);
+  uint_8 gpas = Size(ka)*step;
+  uint_8 naxa = Size()/Size(ka);
+  min = (*this)[0];
+  max = (*this)[0];
+  for(j=0; j<naxa; j++)  {
+    pe = mNDBlock.Begin()+Offset(ka,j);
+    for(k=0; k<gpas; k+=step) {
+      if (pe[k]<min)  min = pe[k];
+      else if (pe[k]>max)  max = pe[k];      
+    }
+  }
+  return;
+}
+
+void TArray< complex<r_4> >::MinMax(complex<r_4>& min, complex<r_4>& max) const
+{
+  throw MathExc("TArray< complex<r_4> >::MinMax(...) - No order in complex");
+}
+
+void TArray< complex<r_8> >::MinMax(complex<r_8>& min, complex<r_8>& max) const
+{
+  throw MathExc("TArray< complex<r_4> >::MinMax(...) - No order in complex");
+}
 
 // ----------------------------------------------------

trunk/SophyaLib/TArray/tarray.h

@@ -161 +161 @@
   virtual T Sum() const ;
   virtual T Product() const ;
+// Somme du carre des elements
+  virtual T SumX2() const;
+// Valeur min et max des elements
+  virtual void MinMax(T& min, T& max) const ;
 
 // Impression, I/O, ...