Changeset 3bf64a6 in git for factory/cf_linsys.cc

Timestamp:

Mar 26, 1997, 5:46:46 PM (27 years ago)

Author:

Jens Schmidt <schmidt@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

997ae52cc016de635cf7ac2687d7d95c40adbeaf

Parents:

2774a5efedabf00a28e744ed367ffce6ba3d7a58

Message:

debug output rewritten
debug output changed to DEBOUT


git-svn-id: file:///usr/local/Singular/svn/trunk@86 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• factory/cf_linsys.cc (modified) (12 diffs)

factory/cf_linsys.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: cf_linsys.cc,v 1.3 1996-12-05 18:24:54 schmidt Exp $
+// $Id: cf_linsys.cc,v 1.4 1997-03-26 16:46:46 schmidt Exp $
 
 /*
 $Log: not supported by cvs2svn $
+Revision 1.3  1996/12/05 18:24:54  schmidt
+``Unconditional'' check-in.
+Now it is my turn to develop factory.
+
 Revision 1.2  1996/07/15 08:33:18  stobbe
 "changed interface to linearSystemSolve to use the class CFMatrix
@@ -17 +21 @@
 */
 
-#define TIMING
-
+#include "assert.h"
+#include "debug.h"
 #include "timing.h"
 
-#include "assert.h"
 #include "cf_defs.h"
+
 #include "cf_primes.h"
 #include "canonicalform.h"
@@ -138 +142 @@
         pno = 0;
         do {
-            DEBOUT( cerr, "trying prime(", pno ); DEBOUTLN( cerr, ") = ", ' ' );
+            DEBOUTSL( cerr );
+            DEBOUT( cerr, "trying prime(" << pno << ") = " );
             p = cf_getBigPrime( pno );
-            cout << p << endl;
+            DEBOUT( cerr, p );
+            DEBOUTENDL( cerr );
             setCharacteristic( p );
             // map matrix into char p
@@ -159 +165 @@
         while ( Q < B && pno < cf_getNumBigPrimes() ) {
             do {
-                cout << "trying prime(" << pno << ") = " << flush;
+                DEBOUTSL( cerr );
+                DEBOUT( cerr, "trying prime(" << pno << ") = " );
                 p = cf_getBigPrime( pno );
-                cout << p << endl;
+                DEBOUT( cerr, p );
+                DEBOUTENDL( cerr );
                 setCharacteristic( p );
                 for ( i = 0; i < rows; i++ )
@@ -215 +223 @@
     return ok;
 }
-        
+
 CanonicalForm
 determinant( const CFMatrix & M, int rows )
@@ -244 +252 @@
 
         CFArray X(1,n), Q(1,n);
-        
+
         while ( pno < n ) {
             p = cf_getBigPrime( pno );
@@ -253 +261 @@
             TIMING_END(det_mapping);
             pno++;
-            cerr << "."; cerr.flush();
+            DEBOUT( cerr, "." );
             TIMING_START(det_determinant);
             intdet = determinant( mm, rows );
@@ -341 +349 @@
         // initialize the result matrix with first solution
         // solve mod p
-        cerr << "."; cerr.flush();
+        DEBOUT( cerr, "." );
         intdet = determinant( mm, rows );
         setCharacteristic( 0 );
@@ -359 +367 @@
             // initialize the result matrix with first solution
             // solve mod p
-            cerr << "."; cerr.flush();
+            DEBOUT( cerr, "." );
             intdet = determinant( mm, rows );
             setCharacteristic( 0 );
@@ -377 +385 @@
                 } while ( ! ok && cf_getNumPrimes() > pno );
                 // solve mod p
-                cerr << "."; cerr.flush();
+                DEBOUT( cerr, "." );
                 intdet = determinant( mm, rows );
                 // found a solution mod p
@@ -388 +396 @@
                 pcount++;
             }
-            cerr << "*"; cerr.flush();
+            DEBOUT( cerr, "*" );
             chineseRemainder( det, Q, qdet, q, detnew, qnew );
             Q = qnew;
@@ -537 +545 @@
     multiplier = 1;
     divisor = 1;
-    
+
     for ( i = 0; i < n; i++ ) {
         //find "pivot"