Changeset 2888 in Sophya

Timestamp:

Jan 4, 2006, 7:25:32 PM (20 years ago)

Author:

ansari

Message:

Ajout de la methode BaseArray::ValueAtPositionDB() pour corriger un gros bug au niveau de la conversion de type (r_4 r_8 ...) des tableaux - Reza 4 Jan 2006

Location:

trunk/SophyaLib/TArray

Files:

• basarr.h (modified) (1 diff)
• tarray.cc (modified) (2 diffs)
• tarray.h (modified) (1 diff)

trunk/SophyaLib/TArray/basarr.h

@@ -146 +146 @@
   // an abstract element acces methode
   virtual MuTyV & ValueAtPosition(sa_size_t ip) const = 0;
+  virtual MuTyV & ValueAtPositionDB(sa_size_t ip) const = 0;
 
   // Pour recuperer pas et numero d'axe pour operations sur deux arrays

trunk/SophyaLib/TArray/tarray.cc

@@ -360 +360 @@
 }
 
-//! Give value (in \b double) for element at position \b ip..
+/*! 
+  \brief Return the value (as a MuTyV) for element at position \b ip in the array.
+  This method is used for conversion between arrays of different types. 
+  \param ip : element position in the array 
+ */
 template <class T>
 MuTyV & TArray<T>::ValueAtPosition(sa_size_t ip) const
 {
 #ifdef SO_BOUNDCHECKING
-  if (ip >= totsize_)  throw( ParmError("TArray<T>::ValueAtPosition(sa_size_t ip) Out-of-bound Error") );
+  if ( (ip >= totsize_) || (ip < 0) )   
+    throw( ParmError("TArray<T>::ValueAtPosition(sa_size_t ip) Out-of-bound Error") );
 #endif
   my_mtv = *(mNDBlock.Begin()+Offset(ip));
+  return( my_mtv );
+}
+
+/*! 
+  \brief Return the value (as a MuTyV) for element at position \b ip in the datablock.
+  This method is used for conversion between arrays of different types. 
+  \param ip : element position in the array DataBlock, regardless of 
+   the array memory organisation
+ */
+template <class T>
+MuTyV & TArray<T>::ValueAtPositionDB(sa_size_t ip) const
+{
+#ifdef SO_BOUNDCHECKING
+  if ( (ip >= mNDBlock.Size() ) || (ip < 0) )   
+    throw( ParmError("TArray<T>::ValueAtPositionDB(sa_size_t ip) Out-of-bound Error") );
+#endif
+  my_mtv = *(mNDBlock.Begin()+ip);
   return( my_mtv );
 }
@@ -1113 +1135 @@
    --- Appel explicite de l'operateur de conversion sur l'objet MuTyV 
 */
-    for(k=0, ka=0;  k<gpas;  k+=step, ka+=stepa)  
-      a.ValueAtPosition(offa+ka).Convert(pe[k]); 
+    /*  ----- Janvier 2006 ------
+      Un bug important etait semble-t-il present depuis longtemps
+      On appelait a.ValueAtPosition(ip) qui renvoie l'element ip en tenant compte
+      de la structure du tableau , alors qu'on veut acceder l'element ip du datablock
+      Methode ValueAtPositionDB(ip) ajoute et utilisee a la place de  ValueAtPosition(ip)
+     */
+    for(k=0, ka=0;  k<gpas;  k+=step, ka+=stepa) 
+      a.ValueAtPositionDB(offa+ka).Convert(pe[k]); 
       //REMPLACE Suite pb compil gcc4   pe[k] = a.ValueAtPosition(offa+ka).operator T(); 
   }

trunk/SophyaLib/TArray/tarray.h

@@ -89 +89 @@
   // Definition of virtual element acces method inherited from BaseArray class 
   virtual MuTyV & ValueAtPosition(sa_size_t ip) const;
+  virtual MuTyV & ValueAtPositionDB(sa_size_t ip) const;
 
   // Data Access: operator overloaded inline acces methods