Changeset 1103 in Sophya for trunk/SophyaLib/TArray/tarray.cc

Timestamp:

Jul 27, 2000, 2:00:10 AM (25 years ago)

Author:

ansari

Message:

Suite operations entre matrices de <> MemOrg, Amelioration des Sequences - Reza 27/7/2000

File:

• trunk/SophyaLib/TArray/tarray.cc (modified) (3 diffs)

trunk/SophyaLib/TArray/tarray.cc

@@ -200 +200 @@
 {
   string exmsg = "TArray<T>::CloneOrShare()";
-  if (!UpdateSizes(a.ndim_, a.size_, a.step_, a.offset_, exmsg))  throw( ParmError(exmsg) );
+  if (!UpdateSizes(a, exmsg))  throw( ParmError(exmsg) );
   mNDBlock.CloneOrShare(a.mNDBlock);
+  if (mInfo) {delete mInfo; mInfo = NULL;}
+  if (a.mInfo) mInfo = new DVList(*(a.mInfo));
 }
 
@@ -209 +211 @@
 {
   string exmsg = "TArray<T>::Share()";
-  if (!UpdateSizes(a.ndim_, a.size_, a.step_, a.offset_, exmsg))  throw( ParmError(exmsg) );
+  if (!UpdateSizes(a, exmsg))  throw( ParmError(exmsg) );
   mNDBlock.Share(a.mNDBlock);
+  if (mInfo) {delete mInfo; mInfo = NULL;}
+  if (a.mInfo) mInfo = new DVList(*(a.mInfo));
 }
 
@@ -363 +367 @@
  */
 template <class T>
-TArray<T>& TArray<T>::SetSeq(Sequence seq)
+TArray<T>& TArray<T>::SetSeq(Sequence const & seq)
 {
   if (NbDimensions() < 1) 
     throw RangeCheckError("TArray<T>::SetSeq(Sequence ) - Not Allocated Array ! ");
+  
   T * pe;
   uint_8 j,k;
-  if (AvgStep() > 0)   {  // regularly spaced elements
-    uint_8 step = AvgStep();
-    pe = Data();
-    for(k=0; k<totsize_; k++ )  pe[k*step] = (T) seq(k);
-  }
-  else {    // Non regular data spacing ...
-    //    uint_4 ka = MaxSizeKA();
-    uint_4 ka = 0;
-    uint_8 step = Step(ka);
-    uint_8 gpas = Size(ka);
-    uint_8 naxa = Size()/Size(ka);
-    for(j=0; j<naxa; j++)  {
-      pe = mNDBlock.Begin()+Offset(ka,j);
-      for(k=0; k<gpas; k++)  pe[k*step] = (T) seq(j*gpas+k);
-    }
+  int ka;
+  if (arrtype_ == 0)  ka = 0;
+  else ka = macoli_;
+  uint_8 step = Step(ka);
+  uint_8 gpas = Size(ka);
+  uint_8 naxa = Size()/Size(ka);
+  for(j=0; j<naxa; j++)  {
+    pe = mNDBlock.Begin()+Offset(ka,j);
+#if !defined(__GNUG__)
+    for(k=0; k<gpas; k++)  pe[k*step] = (T) seq(j*gpas+k);
+#else
+    // g++ (up to 2.95.1) se melange les pinceaux  s'il y a le cast (T) pour l'instanciation des complexes 
+    for(k=0; k<gpas; k++)  pe[k*step] = seq(j*gpas+k);
+#endif
   }
   return(*this);