Changeset 2719 in Sophya

Timestamp:

May 13, 2005, 6:44:31 PM (20 years ago)

Author:

cmv

Message:

remplissage STL vector / TVector cmv 13/05/05

Location:

trunk/SophyaLib/TArray

Files:

• tvector.cc (modified) (4 diffs)
• tvector.h (modified) (2 diffs)

trunk/SophyaLib/TArray/tvector.cc

@@ -1 @@
-// $Id: tvector.cc,v 1.17 2004-09-10 09:55:07 cmv Exp $
+// $Id: tvector.cc,v 1.18 2005-05-13 16:44:30 cmv Exp $
 //                         C.Magneville          04/99
 #include "sopnamsp.h"
@@ -101 +101 @@
 }
 
-
 //! Constructor of a vector from a TArray \b a
 /*!
@@ -132 +131 @@
     throw SzMismatchError("TVector<T>::TVector(const BaseArray& a) NRows()!=1 && NCols()!=1 ");
   arrtype_ = 2;   // Type = Vector
+}
+
+//! Constructor from a STL vector
+template <class T>
+TVector<T>::TVector(const vector<T>& v, short lcv)
+{
+ sa_size_t n = v.size();
+ if(n==0)
+    throw SzMismatchError("TVector<T>::TVector(const vector<T>& v) size()==0 ");
+ arrtype_ = 2;   // Type = Vector
+ ReSize(n,lcv,false);
+ for(sa_size_t i=0;i<n;i++) (*this)(i) = v[i];
 }
 
@@ -206 +217 @@
   return(rs);  
 
+}
+
+//! Fill from a STL vector
+/*!
+  \param v : STL vector to copy
+  \param noresize : "true" means TVector keeps its size
+  \warning Filling is always done starting at TVector(0)
+ */
+template <class T>
+sa_size_t TVector<T>::FillFr(const vector<T>& v,bool noresize)
+{
+ sa_size_t n = v.size();
+ if(n==0) return 0; //STL vector de taille nulle!
+ if(!noresize) ReSize(n,SameVectorType,false);
+ if(Size()<n) n = Size();
+ if(n==0) return 0; //TVector de taille nulle sans resize!
+ for(sa_size_t i=0;i<n;i++) (*this)(i) = v[i];
+ return n;
+}
+
+//! Fill a STL vector
+/*!
+  \param v : STL vector to fill
+  \param addtoend : "true" means TVector will be added at the end of "v"
+ */
+template <class T>
+sa_size_t TVector<T>::FillTo(vector<T>& v,bool addtoend)
+{
+ sa_size_t n = Size();
+ if(n==0) return 0; //TVector de taille nulle!
+ if(!addtoend) v.resize(0);
+ for(sa_size_t i=0;i<n;i++) v.push_back((*this)(i));
+ return n;
 }
 

trunk/SophyaLib/TArray/tvector.h

@@ -20 +20 @@
   TVector(const TArray<T>& a,  bool share, short lcv=AutoVectorType, short mm=AutoMemoryMapping);
   TVector(const BaseArray& a);
+  TVector(const vector<T>& v, short lcv=AutoVectorType);
 
   virtual ~TVector();
@@ -44 +45 @@
               { ReSize(n, lcv, fzero); }
   void Realloc(sa_size_t n, short lcv=SameVectorType, bool force=false);
+    
+  // Remplissage from/to a STL vector
+  sa_size_t FillFr(const vector<T>& v,bool noresize=false);
+  sa_size_t FillTo(vector<T>& v,bool addtoend=false);
 
   // Sub-Vector extraction $CHECK$ Reza 03/2000  Doit-on declarer cette methode const ?