Changeset 57f13b in git

Timestamp:

Mar 27, 1997, 10:54:41 AM (27 years ago)

Author:

Jens Schmidt <schmidt@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

83452f672f51e8f1610d8f803fd147fd3c2cd574

Parents:

043814c307adc58ae0e7174dc880bfb222e8e6dd

Message:

timing output changed to TIMING
debug output rewritten
debug output changed to DEBOUT


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

File:

• factory/fac_univar.cc (modified) (17 diffs)

factory/fac_univar.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fac_univar.cc,v 1.4 1996-07-12 08:37:20 stobbe Exp $
+// $Id: fac_univar.cc,v 1.5 1997-03-27 09:54:41 schmidt Exp $
 
 /*
 $Log: not supported by cvs2svn $
+Revision 1.4  1996/07/12 08:37:20  stobbe
+"ZFactorizeUnivariate: now handles constants of the squarefree decomposition
+"
+
 Revision 1.3  1996/06/26 13:17:03  stobbe
 "ZFactorizeUnivariate: now handles the sign of the argument right.
@@ -22 +26 @@
 */
 
-//#define TIMING
-
-#ifndef NDEBUG
-//#define DEBUGOUTPUT
-#endif
-
-#ifdef TIMING
-#include <sys/times.h>
-#endif
-
 #include <math.h>
+
 #include "assert.h"
+#include "debug.h"
+#include "timing.h"
+
 #include "cf_defs.h"
+
 #include "fac_util.h"
 #include "fac_univar.h"
@@ -43 +42 @@
 #include "fac_sqrfree.h"
 
+TIMING_DEFINE_PRINT(fac_choosePrimes);
+TIMING_DEFINE_PRINT(fac_facModPrimes);
+TIMING_DEFINE_PRINT(fac_liftFactors);
+TIMING_DEFINE_PRINT(fac_combineFactors);
+
 #define MAX_FP_FAC 3
 
@@ -50 +54 @@
 iextgcd ( const CanonicalForm & f, const CanonicalForm & g, CanonicalForm & a, CanonicalForm & b );
 
-#ifndef NDEBUG
-
+#ifdef DEBUGOUTPUT
 static void
 hprint ( int * a )
@@ -63 +66 @@
         i++;
     }
-    cerr << ")" << endl;
-}
-
+    cerr << ")" << endl << endl;
+}
 #endif
 
@@ -245 +247 @@
     int * kvals = new int[no_iter];
 
-    DEBOUT( cerr, "quadratic lift called with p = ", p );
-    DEBOUTLN( cerr, "  and k = ", k );
+    DEBOUTSL( cerr );
+    DEBOUT( cerr, "quadratic lift called with p = " << p << "  and k = " << k );
+    DEBOUTENDL( cerr );
     for ( j = 0, i = k; i > 1; i = ( i+1 ) / 2, j++ ) kvals[j] = i;
     kvals[j] = 1;
@@ -273 +276 @@
             j--;
             setCharacteristic( p, kvals[j+1] );
-            DEBOUT( cerr, "lifting from p^", kvals[j+1] );
-            DEBOUTLN( cerr, " to p^", kvals[j] );
+            DEBOUTSL( cerr );
+            DEBOUT( cerr, "lifting from p^" << kvals[j+1] << " to p^" << kvals[j] );
+            DEBOUTENDL( cerr );
             c = mapinto( c );
             DEBOUTLN( cerr, " !!! g = ", mapinto( g ) );
@@ -395 +399 @@
         Dh = new int [n]; Dh[0] = n;
         exp = J.getItem().exp();
-#ifdef TIMING
-        struct tms ts, te;
-        times( &ts );
-#endif
+        TIMING_START(fac_choosePrimes);
         ok = choosePrimes( p, f );
-#ifdef TIMING
-        times( &te );
-        cout.setf( ios::fixed, ios::floatfield );
-        cout.precision(2);
-        cout << "time to choose the primes: "
-             << float(te.tms_utime-ts.tms_utime) / CLK_TCK << " sec" << endl;
-#endif
+        TIMING_END_AND_PRINT(fac_choosePrimes, "time to choose the primes: ");
         if ( ! ok ) {
-            cerr << "factorize warnig: no good prime found" << endl;
-            cerr << f << endl;
+            DEBOUTLN( cerr, "error: no good prime found to factorize ", f );
+            ASSERT( 0, "error: no good prime found" );
             ZF.append( CFFactor( f, exp ) );
         }
         else {
-#ifdef TIMING
-            times( &ts );
-#endif
+            TIMING_START(fac_facModPrimes);
             for ( i = 0; i < MAX_FP_FAC; i++ ) {
                 setCharacteristic( p[i] );
@@ -424 +417 @@
 //              else
 //                  F[i] = FpFactorizeUnivariateCZ( fp, true );
-                DEBOUT( cerr, "F[i] = ", F[i] );
-                DEBOUTLN( cerr, ", p = ", p[i] );
+                DEBOUTSL( cerr );
+                DEBOUT( cerr, "F[i] = " << F[i] << ", p = " << p[i] );
+                DEBOUTENDL( cerr );
             }
-#ifdef TIMING
-        times( &te );
-        cout.setf( ios::fixed, ios::floatfield );
-        cout.precision(2);
-        cout << "time to factorize mod primes: "
-             << float(te.tms_utime-ts.tms_utime) / CLK_TCK << " sec" << endl;
-#endif
+            TIMING_END_AND_PRINT(fac_facModPrimes, "time to factorize mod primes: ");
             setCharacteristic( 0 );
 #ifdef DEBUGOUTPUT
+            DEBOUTLN( cerr, "D = ", ' ' );
             hprint( D );
 #endif
@@ -441 +430 @@
             hgroup( D );
 #ifdef DEBUGOUTPUT
+            DEBOUTLN( cerr, "D = ", ' ' );
             hprint( D );
 #endif
@@ -447 +437 @@
                 hgroup( Dh );
 #ifdef DEBUGOUTPUT
-                cerr << "Dh = ";
+                DEBOUTLN( cerr, "Dh = ", ' ' );
                 hprint( Dh );
 #endif
                 hintersect( D, Dh );
 #ifdef DEBUGOUTPUT
-                cerr << "D = ";
+                DEBOUTLN( cerr, "D = ", ' ' );
                 hprint( D );
 #endif
@@ -475 +465 @@
             F[j].sort( cmpFactor );
             I = F[j]; i = 0;
-#ifdef TIMING
-            times( &ts );
-#endif
+            TIMING_START(fac_liftFactors);
             while ( I.hasItem() ) {
                 DEBOUTLN( cerr, "factor to lift = ", I.getItem().factor() );
@@ -491 +479 @@
                     fp /= I.getItem().factor();
                     ZF.append( CFFactor( dummy1, exp ) );
-                    I.remove( 0 ); 
+                    I.remove( 0 );
                     I = F[j];
                     i = 0;
@@ -507 +495 @@
                 }
             }
-#ifdef TIMING
-        times( &te );
-        cout.setf( ios::fixed, ios::floatfield );
-        cout.precision(2);
-        cout << "time to lift the factors: "
-             << float(te.tms_utime-ts.tms_utime) / CLK_TCK << " sec" << endl;
-#endif
+            TIMING_END_AND_PRINT(fac_liftFactors, "time to lift the factors: ");
             DEBOUTLN( cerr, "ZF = ", ZF );
             initHG( Dh, theFactors );
             hgroup( Dh );
 #ifdef DEBUGOUTPUT
-            cerr << "Dh = ";
+            DEBOUTLN( cerr, "Dh = ", ' ' );
             hprint( Dh );
 #endif
@@ -527 +509 @@
             DEBOUTLN( cerr, "theFactors = ", theFactors );
             DEBOUTLN( cerr, "f = ", f );
-            DEBOUT( cerr, "p = ", pk.getp() );
-            DEBOUTLN( cerr, ", k = ", pk.getk() );
-#ifdef DEBUGOUTPUT
+            DEBOUTSL( cerr );
+            DEBOUT( cerr, "p = " << pk.getp() << ", k = " << pk.getk() );
+            DEBOUTENDL( cerr );
+#ifdef DEBUGOUTPUT
+            DEBOUTLN( cerr, "D = ", ' ' );
             hprint( D );
 #endif
@@ -535 +519 @@
             (void)iextgcd( pk.getpk(), lf, dummy1, recip_lf );
             DEBOUTLN( cerr, "recip_lf = ", recip_lf );
-#ifdef TIMING
-            times( &ts );
-#endif
+            TIMING_START(fac_combineFactors);
             for ( i = 1; i < D[0]; i++ )
                 if ( D[i] != 0 )
@@ -543 +525 @@
             if ( degree( f ) > 0 )
                 ZF.append( CFFactor( f, exp ) );
-#ifdef TIMING
-        times( &te );
-        cout.setf( ios::fixed, ios::floatfield );
-        cout.precision(2);
-        cout << "time to combine the factors: "
-             << float(te.tms_utime-ts.tms_utime) / CLK_TCK << " sec" << endl;
-#endif
+            TIMING_END_AND_PRINT(fac_combineFactors, "time to combine the factors: ");
         }
     }