Changeset 2985

Timestamp:

07/02/08 06:34:35 (2 months ago)

Author:

dumas

Message:

optimied out some unnecessary tests

Files:

• trunk/linbox/linbox/algorithms/gauss.inl (modified) (7 diffs)

trunk/linbox/linbox/algorithms/gauss.inl

@@ -5 +5 @@
  *
  * Written by Jean-Guillaume Dumas <Jean-Guillaume.Dumas@imag.fr>
- * Time-stamp: <09 Feb 07 11:25:51 Jean-Guillaume.Dumas@imag.fr> 
+ * Time-stamp: <23 May 08 09:52:20 Jean-Guillaume.Dumas@imag.fr> 
  *
  * -----------------------------------------------------------
@@ -153 +153 @@
                             _F.mul (tmp, headcoeff, lignepivot[l].second);
 
-                            if (! _F.isZero (tmp)) {
+//                             if (! _F.isZero (tmp)) {
                                 ++columns[j_piv];
                                 construit[j++] = E (j_piv, tmp);
-                            }
+//                             } else 
+//                                 std::cerr << "NEVER HAPPENED" << std::endl;
+                      
                         }
 
@@ -346 +348 @@
                             Element tmp;
                             _F.mul (tmp, headcoeff, lignepivot[l].second);
-                            if (! _F.isZero (tmp))
+//                             if (! _F.isZero (tmp))
                                 construit[j++] = E (j_piv, tmp);
+//                             else
+//                                 std::cerr << "NEVER HAPPENED" << std::endl;
                         }
                         l++;
@@ -481 +485 @@
                                                Element          &determinant)
     {
- //        std::cerr << "SFP BEG : lignepivot: [";
+ 
+//        std::cerr << "SFP BEG : lignepivot: [";
 //         for(typename Vector::const_iterator refs =  lignepivot.begin();
 //             refs != lignepivot.end() ;
@@ -490 +495 @@
 
         long nj =  lignepivot.size ();
+
         bool pivoting = false;
 
@@ -647 +653 @@
                     commentator.report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
                         << "Fillin (" << indcol << "/" << Ni << ") = "
-                        << sl << std::endl;
+                        << sl 
+                        << " (" << double(sl)*100.0/double(Ni-k)/double(Nj-k) << "%, "
+                        << double(sl)/double(Ni-k) << " avg)"
+                        << std::endl;
 #endif 
                 }
             
                 if (s) {
+                        // Row permutation for the sparsest row
                     for (l = k + 1; l < Ni; ++l)
                         if (((sl = LigneA[l].size ()) < s) && (sl)) {
@@ -696 +706 @@
             
             commentator.report (Commentator::LEVEL_IMPORTANT, PARTIAL_RESULT)
-                << "Fillin (" << indcol << "/" << Ni << ") = " << sl << std::endl;
+                << "Fillin (" << indcol << "/" << Ni << ") = " << sl 
+                << std::endl;
 #endif