Changeset 1683 in Sophya for trunk/SophyaLib/TArray

Timestamp:

Oct 11, 2001, 5:22:03 PM (24 years ago)

Author:

lemeur

Message:

methode iterative pour analyse harmonique

File:

• trunk/SophyaLib/TArray/triangmtx.h (modified) (3 diffs)

trunk/SophyaLib/TArray/triangmtx.h

@@ -15 +15 @@
 
 namespace SOPHYA {
-
+  
 //! Class for inferior triangular matrix (base class for the class Alm)
 template <class T>
@@ -35 +35 @@
   }
 
-//! Equal operator
-inline TriangularMatrix<T>& operator = (const TriangularMatrix<T>& a)
-{
-  elem_=a.elem_;
-  long_diag_ = a.long_diag_;
-  return *this;
-}
+TriangularMatrix<T>& SetT(T a)
+  {
+    if (long_diag_ < 1)
+    throw RangeCheckError("TriangularMatrix<T>::SetT(T )  - TriangularMatrix not dimensionned ! ");
+    elem_ = a;
+    return (*this);
+  }
 
 //! () operator : access to elements row \b l and column \b m
 inline T& operator()(int l, int m) 
   {
-      return  elem_(adr_ij(l,m));
+      return  elem_(indexOfElement(l,m));
   }
+
+inline T& operator()(int index) 
+  {
+      return  elem_(index);
+  }
+
+
 //! () operator : access to elements row \b l and column \b m
 inline T const& operator()(int l, int m) const 
   {
-      return *(elem_.Begin()+ adr_ij(l,m));
+      return *(elem_.Begin()+ indexOfElement(l,m));
   }
+
+inline T const& operator()(int index) const 
+  {
+      return *(elem_.Begin()+ index);
+  }
+
 
 //! Return number of rows
 inline  int_4  rowNumber() const {return (int_4)long_diag_;}
 
+void Print(int nbLignes=0)
+  {
+    if (nbLignes == 0 ) nbLignes = long_diag_;
+    cout << " ***** matrice triangulaire : ********* " << endl;
+    for (int k=0; k < nbLignes; k++)
+      {
+        for (int kc = 0; kc <= k ; kc++)
+          {
+            cout << " " << elem_(indexOfElement(k,kc));
+          }
+        cout << endl;
+      }
+    cout << "---------------- fin matrice ------------" << endl;
+  }
+
+  //Return pointer to first element address
+  //inline T* Data()  {return elem_.Begin();}
+
+//! compute the address of an element in the single array representing the matrix
+inline uint_4 indexOfElement(int i,int j) const 
+{
+  //  return(i*(i+1)/2+j);
+  // the (inferior triangular )matrix is stored column by column
+  return(i+ long_diag_*j-j*(j+1)/2);
+}
+
 private: 
-//! compute the address of an element in the single array representing the matrix
-inline uint_4 adr_ij(int i,int j) const 
-{
-  //  int adr= i*(i+1)/2+j;
-  //  if ( adr >= elem_.Size() || adr <0 )
-  //{
-  // cout << " attention depassement dans triangularMatrix " << endl;
-  // cout << " l= " << i << " m= " << j << " tableau reserve longueur " << elem_.Size() << endl; 
-  //}
-  return(i*(i+1)/2+j);
-}
 
 uint_4 long_diag_;    //!< size of the square matrix
@@ -74 +102 @@
 
   };
-
+  
 }   // namespace SOPHYA