Changeset 38bb4c in git

Timestamp:

Mar 27, 1997, 10:34:59 AM (27 years ago)

Author:

Jens Schmidt <schmidt@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4393f610eaeba2ada7a840e5fc6196a1e5af0940

Parents:

3a3fce2f74ca58f98b7d975613f96b97f81dfaa3

Message:

debug output changed to DEBOUT


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

File:

• factory/fac_berlekamp.cc (modified) (5 diffs)

factory/fac_berlekamp.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fac_berlekamp.cc,v 1.0 1996-05-17 10:59:45 stobbe Exp $
+// $Id: fac_berlekamp.cc,v 1.1 1997-03-27 09:34:59 schmidt Exp $
 
 /*
 $Log: not supported by cvs2svn $
+Revision 1.0  1996/05/17 10:59:45  stobbe
+Initial revision
+
 */
-
 #include "assert.h"
+#include "debug.h"
+
 #include "cf_defs.h"
+
 #include "fac_berlekamp.h"
 #include "ffops.h"
@@ -17 +22 @@
 #include "fac_sqrfree.h"
 #include "cf_util.h"
+
+#ifdef DEBUGOUTPUT
+void QprintFF( int ** Q, int n )
+{
+    for ( int i = 0; i < n; i++ ) {
+        for ( int j = 0; j < n; j++ )
+            cerr << Q[i][j] << "  ";
+        cerr << endl;
+    }
+    cerr << endl;
+}
+#endif /* DEBUGOUTPUT */
+
+#ifdef DEBUGOUTPUT
+void QprintGF( int ** Q, int n )
+{
+    for ( int i = 0; i < n; i++ ) {
+        for ( int j = 0; j < n; j++ ) {
+            gf_print( cerr, Q[i][j] );
+            cerr << "  ";
+        }
+        cerr << endl;
+    }
+    cerr << endl;
+}
+#endif /* DEBUGOUTPUT */
 
 void QmatFF ( const CanonicalForm & f, int ** Q, int p )
@@ -176 +207 @@
 }
 
-void QprintFF( int ** Q, int n )
-{
-    for ( int i = 0; i < n; i++ ) {
-        for ( int j = 0; j < n; j++ )
-            cerr << Q[i][j] << "  ";
-        cerr << endl;
-    }
-    cerr << endl;
-}
-
-void QprintGF( int ** Q, int n )
-{
-    for ( int i = 0; i < n; i++ ) {
-        for ( int j = 0; j < n; j++ ) {
-            gf_print( cerr, Q[i][j] );
-            cerr << "  ";
-        }
-        cerr << endl;
-    }
-    cerr << endl;
-}
-
 CanonicalForm cfFromIntVec( int * a, int n, const Variable & x )
 {
@@ -230 +239 @@
         Q[i] = new int[n];
     QmatFF( f, Q, p );
-//    QprintFF( Q, n );
+#ifdef DEBUGOUTPUT
+    DEBOUTLN( cerr, "Q = ", ' ' );
+    QprintFF( Q, n );
+#endif /* DEBUGOUTPUT */
     k = nullSpaceFF( Q, B, n );
-//    QprintFF( Q, n );
+#ifdef DEBUGOUTPUT
+    DEBOUTLN( cerr, "Q = ", ' ' );
+    QprintFF( Q, n );
+#endif /* DEBUGOUTPUT */
     F.insert( CFFactor( f, 1 ) );
     r = 1;
@@ -275 +290 @@
         Q[i] = new int[n];
     QmatGF( f, Q, gf_q );
-//    QprintGF( Q, n );
+#ifdef DEBUGOUTPUT
+    DEBOUTLN( cerr, "Q = ", ' ' );
+    QprintGF( Q, n );
+#endif /* DEBUGOUTPUT */
     k = nullSpaceGF( Q, B, n );
-//    QprintFF( Q, n );
+#ifdef DEBUGOUTPUT
+    DEBOUTLN( cerr, "Q = ", ' ' );
+    QprintFF( Q, n );
+#endif /* DEBUGOUTPUT */
     F.insert( CFFactor( f, 1 ) );
     r = 1;