Changeset 813 in Sophya for trunk/SophyaLib/TArray/sopemtx.cc

Timestamp:

Apr 5, 2000, 5:44:19 PM (25 years ago)

Author:

ansari

Message:

Correction bug/amelioarions TArray,TMatrix,TVector - Reza 5/4/2000

File:

• trunk/SophyaLib/TArray/sopemtx.cc (modified) (6 diffs)

trunk/SophyaLib/TArray/sopemtx.cc

@@ -63 +63 @@
 
   uint_4 IMaxAbs(uint_4 first=0);
+  void Print(ostream & os) const ;
 
   static void Swap(TMatrixRC<T>& rc1, TMatrixRC<T>& rc2);
@@ -105 +106 @@
 template <class T>
 inline uint_4 TMatrixRC<T>::Step(const TMatrix<T>& m, TRCKind rckind)
-  { switch (rckind) { case TmatrixRow  : return m.Step(m.RowsKA());
-                      case TmatrixCol  : return m.Step(m.ColsKA());
+  { switch (rckind) { case TmatrixRow  : return m.Step(m.ColsKA());
+                      case TmatrixCol  : return m.Step(m.RowsKA());
                       case TmatrixDiag : return (m.Step(m.RowsKA())+m.Step(m.ColsKA())); }
     return 0; }
@@ -333 +334 @@
 
 template <class T>
+void TMatrixRC<T>::Print(ostream & os) const
+{
+  os << " TMatrixRC<T>::Print(ostream & os) " << NElts() << " Kind=" 
+     << kind << " Index=" << index << " Step= " << step << endl;
+  for(uint_4 i=0; i<NElts(); i++) {
+    os << (*this)(i);
+    if (kind == TmatrixCol)  os << endl;
+    else os << ", "; 
+  }
+  os << endl;
+}
+
+template <class T>
 void TMatrixRC<T>::Swap(TMatrixRC<T>& rc1, TMatrixRC<T>& rc2)
 {
@@ -435 +449 @@
 
 for(uint_4 l=0; l<n; l++) {
-  if (fabs(a(l,l)) <= 1.e-50) return 0.0;
+  if (fabs((double)a(l,l)) <= 1.e-50) return 0.0;
   TMatrixRC<T>::Row(b, l) /= a(l,l);
 }
@@ -447 +461 @@
 {
 TMatrix<T> a(A);
-TMatrix<T> b(a.NCols(),a.NRows());  b = 1.;
-if(fabs(GausPiv(a,b)) < 1.e-50)
+TMatrix<T> b(a.NCols(),a.NRows());  b = IdentityMatrix(1.);
+if(fabs((double)GausPiv(a,b)) < 1.e-50)
   throw(MathExc("TMatrix Inverse() Singular OMatrix"));
 return b;
@@ -578 +592 @@
 
 
-
+void _ZZ_TestTMatrixRC_YY_(TMatrix<r_8> & m)
+{
+  cout << " ::::: _ZZ_TestTMatrixRC_YY_ :::: M= \n" << m << endl;
+  TMatrixRC<r_8> l0 = TMatrixRC<r_8>::Row(m,0);
+  cout << "TMatrixRC<r_8>::Row(m,0) = \n" ;
+  l0.Print(cout);
+  TMatrixRC<r_8> l1 = TMatrixRC<r_8>::Row(m,1);
+  cout << "TMatrixRC<r_8>::Row(m,1) = \n" ;
+  l1.Print(cout);
+  l0.SetRow(2);
+  cout << "TMatrixRC<r_8>::l0.SetRow(2 = \n" ;
+  l0.Print(cout);
+
+  TMatrixRC<r_8> c0 = TMatrixRC<r_8>::Col(m,0);
+  cout << "TMatrixRC<r_8>::Col(m,0) = \n" ;
+  c0.Print(cout);
+  TMatrixRC<r_8> c1 = TMatrixRC<r_8>::Col(m,1);
+  cout << "TMatrixRC<r_8>::Col(m,1) = \n" ;
+  c1.Print(cout);  
+  c0.SetCol(2);
+  cout << "TMatrixRC<r_8>::c0.SetCol(2) = \n" ;
+  c0.Print(cout);
+  TMatrixRC<r_8> c00 = TMatrixRC<r_8>::Col(m,0);
+  TMatrixRC<r_8>::Swap(c0, c00);
+  cout << " :::::  M Apres Swap = \n" << m << endl;
+  
+}
 
 ///////////////////////////////////////////////////////////////