Changeset 289 in Sophya for trunk/SophyaLib/BaseTools/ndatablock.h

Timestamp:

May 3, 1999, 6:56:48 PM (26 years ago)

Author:

ansari

Message:

grosses modif avec refonte code dans cmv 3/5/99

File:

• trunk/SophyaLib/BaseTools/ndatablock.h (modified) (6 diffs)

trunk/SophyaLib/BaseTools/ndatablock.h

@@ -37 +37 @@
   // Temporaire?
   inline bool IsTemp(void) const {return mIsTemp;}
-  void SetTemp(bool temp=false) const;
+  inline void SetTemp(bool temp=false) const {mIsTemp = temp;}
 
   // Gestion taille/Remplissage
   void Clone(const NDataBlock<T>& a);
-  void Reset(T v=0);
-  void ReSize(size_t n,bool force_alloc=true);
+  void CloneOrShare(const NDataBlock<T>& a);
+  void Share(const NDataBlock<T>& a);
   void FillFrom(size_t n,T* data);
+  inline void Reset(T v=0)
+         {if(mSz==0) return; T *p=Begin(),*pe=End(); while(p<pe) *p++=v;}
+  inline void ReSize(size_t n) {Alloc(n);}
   
   // Informations pointeur/data
@@ -53 +56 @@
   inline T& operator()(size_t i)       {return *(mSRef->data+i);}
   inline T  operator()(size_t i) const {return *(mSRef->data+i);}
-
   inline T*        Begin()        {return mSRef->data;}
   inline T const*  Begin() const  {return mSRef->data;} 
@@ -67 +69 @@
   T Product(size_t i1=0,size_t n=0) const;
 
-  // Surcharge d operateurs
+  // Surcharge d'operateurs INPLACE: A = x , A = B , A @= x , A @= B
   NDataBlock<T>& operator = (const NDataBlock<T>& a);
   NDataBlock<T>& operator = (T v);
@@ -81 +83 @@
   NDataBlock<T>& operator /= (const NDataBlock<T>& a);
 
+  // Surcharge d'operateurs: C = A @ x , C = A @ B
   NDataBlock<T> Add(T b) const;
   NDataBlock<T> Sub(T b) const;
@@ -99 +102 @@
 
   void Alloc(size_t n,T* data=NULL,Bridge* br=NULL);
-  void Share(const NDataBlock<T>& a);
   void Delete(void);
 
@@ -153 +155 @@
 template <class T>
 class FIO_NDataBlock : public  PPersist  {
-
 public:
-            FIO_NDataBlock();
-            FIO_NDataBlock(string const & filename); 
-            FIO_NDataBlock(const NDataBlock<T> & obj);
-            FIO_NDataBlock(NDataBlock<T> * obj);
-  virtual   ~FIO_NDataBlock();
-
-  virtual   AnyDataObj* DataObj();
+  FIO_NDataBlock();
+  FIO_NDataBlock(string const & filename); 
+  FIO_NDataBlock(const NDataBlock<T> & obj);
+  FIO_NDataBlock(NDataBlock<T> * obj);
+  virtual ~FIO_NDataBlock();
+  virtual AnyDataObj* DataObj();
   inline operator NDataBlock<T>() { return(*dobj); }
-
 protected :
   virtual void       ReadSelf(PInPersist&);