Changeset 1072 in Sophya

Timestamp:

Jul 16, 2000, 1:28:19 AM (25 years ago)

Author:

ansari

Message:

protection conditionnelle DivElts par zero cmv 16/7/00

Location:

trunk/SophyaLib/TArray

Files:

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

trunk/SophyaLib/TArray/tarray.cc

@@ -663 +663 @@
 Divide two TArrays *this = (*this)/a
 \param fginv == true : Perfoms the inverse division (*this = a/(*this)) 
+\param divzero == true : if a(i)==0. result is set to zero: (*this)(i)==0.
 */
 template <class T>
-TArray<T>& TArray<T>::DivElt(const TArray<T>& a, bool fginv)
+TArray<T>& TArray<T>::DivElt(const TArray<T>& a, bool fginv, bool divzero)
 {
   if (NbDimensions() < 1) 
@@ -681 +682 @@
     pe = Data();
     pea = a.Data();
-    if (fginv) 
-      for(k=0, ka=0;  k<maxx;  k+=step, ka+=stepa )  pe[k] = pea[ka]/pe[k];
-    else 
-      for(k=0, ka=0;  k<maxx;  k+=step, ka+=stepa )  pe[k] /= pea[ka] ;
+    if(divzero) {
+      if (fginv) 
+        for(k=0, ka=0;  k<maxx;  k+=step, ka+=stepa )
+          {if(pe[k]==(T)0) pe[k] = (T)0; else pe[k] = pea[ka]/pe[k];}
+      else 
+        for(k=0, ka=0;  k<maxx;  k+=step, ka+=stepa )
+          {if(pea[k]==(T)0) pe[k] = (T)0; else pe[k] /= pea[ka] ;}
+    } else {
+      if (fginv) 
+        for(k=0, ka=0;  k<maxx;  k+=step, ka+=stepa )  pe[k] = pea[ka]/pe[k];
+      else 
+        for(k=0, ka=0;  k<maxx;  k+=step, ka+=stepa )  pe[k] /= pea[ka] ;
+    }
   }
   else {    // Non regular data spacing ...
@@ -695 +705 @@
       pe = mNDBlock.Begin()+Offset(ax,j);
       pea = a.DataBlock().Begin()+a.Offset(ax,j);
-      if (fginv) 
-        for(k=0, ka=0;  k<gpas;  k+=step, ka+=stepa)  pe[k] = pea[ka]/pe[k]; 
-      else
-        for(k=0, ka=0;  k<gpas;  k+=step, ka+=stepa)  pe[k] /= pea[ka]; 
+      if(divzero) {
+        if (fginv) 
+          for(k=0, ka=0;  k<gpas;  k+=step, ka+=stepa)
+            {if(pe[k]==(T)0) pe[k] = (T)0; else pe[k] = pea[ka]/pe[k];} 
+        else
+          for(k=0, ka=0;  k<gpas;  k+=step, ka+=stepa)
+            {if(pea[k]==(T)0) pe[k] = (T)0; else pe[k] /= pea[ka];} 
+      } else {
+        if (fginv) 
+          for(k=0, ka=0;  k<gpas;  k+=step, ka+=stepa)  pe[k] = pea[ka]/pe[k]; 
+        else
+          for(k=0, ka=0;  k<gpas;  k+=step, ka+=stepa)  pe[k] /= pea[ka]; 
+      }
     }
   }

trunk/SophyaLib/TArray/tarray.h

@@ -147 +147 @@
 // Multiplication, division element par element les deux tableaux 
   virtual TArray<T>&  MulElt(const TArray<T>& a);
-  virtual TArray<T>&  DivElt(const TArray<T>& a, bool fginv=false);
+  virtual TArray<T>&  DivElt(const TArray<T>& a, bool fginv=false, bool divzero=false);
 // Recopie des valeurs, element par element
   virtual TArray<T>&  CopyElt(const TArray<T>& a);