Changeset a8c3e0a in git

Timestamp:

Apr 24, 1998, 7:19:29 PM (26 years ago)

Author:

Jens Schmidt <schmidt@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4d6662737b3e034cc8acdb8b5c50847ca9517b02

Parents:

a6cbe423758d9484cc34ee5530a1aa5a9a149481

Message:

	* clapsing.cc (FACTORY_GCD_STAT, singclap_divide_content):
	  dependency on FACTORY_GCD_TEST removed.  Statistics are now done
 	  using `FACTORY_GCDSTAT' and `FCATORY_CONTSTAT' which are defined
 	  to expand to nothing if `FACTORY_GCD_TIMING' is off.


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

File:

• Singular/clapsing.cc (modified) (8 diffs)

Singular/clapsing.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapsing.cc,v 1.33 1998-04-23 10:17:03 schmidt Exp $
+// $Id: clapsing.cc,v 1.34 1998-04-24 17:19:29 schmidt Exp $
 /*
 * ABSTRACT: interface between Singular and factory
@@ -27 +27 @@
 // FACTORY_GCD_TEST: use new gcd instead of old one.
 // FACTORY_GCD_STAT: print statistics on polynomials.  Works only
-//   with appropriately translated new gcd.
+//   with the file `gcd_stat.cc' and `gcd_stat.h'.
 // FACTORY_GCD_TIMING: accumulate time used for gcd calculations.
 //   Time may be printed (and reset) with `system("gcdtime");'.
@@ -41 +41 @@
 
 #ifdef FACTORY_GCD_STAT
-#define FACTORY_GCD_TEST
+#include "gcd_stat.h"
+#define FACTORY_GCDSTAT( tag, f, g, d ) \
+  printGcdStat( tag, f, g, d, rPar( currRing ) == 1 )
+#define FACTORY_CONTSTAT( tag, f ) \
+  printContStat( tag, f, rPar( currRing ) == 1 )
+#else
+#define FACTORY_GCDSTAT( tag, f, g, d )
+#define FACTORY_CONTSTAT( tag, f )
 #endif
 
@@ -411 +418 @@
       p = pNext( p );
 #ifdef FACTORY_GCD_STAT
-      fprintf( stderr, "cont:\t" );
-#endif
+      // save g
+      CanonicalForm gOld = g;
+#endif
+
 #ifdef FACTORY_GCD_TEST
       g = CFPrimitiveGcdUtil::gcd( g, h );
@@ -418 +427 @@
       g = gcd( g, h );
 #endif
+
+      FACTORY_GCDSTAT( "cont", gOld, h, g );
       FACTORY_CFTROUT( "g = ", g );
       L.append( h );
@@ -423 +434 @@
     TIMING_END( contentTimer );
     FACTORY_CFTROUT( "C = ", g );
+    FACTORY_CONTSTAT( "CONT", g );
     if ( g == 1 )
     {
@@ -981 +993 @@
  alg res;
 
-#ifdef FACTORY_GCD_STAT
- fprintf( stderr, "algLcm:\t" );
-#endif
-
  if (currRing->minpoly!=NULL)
  {
@@ -1039 +1047 @@
  ff=gg=NULL;
 
-#ifdef FACTORY_GCD_STAT
- fprintf( stderr, "alCont:\t" );
-#endif
-
  if (currRing->minpoly!=NULL)
  {