Changeset a8c3e0a in git


Ignore:
Timestamp:
Apr 24, 1998, 7:19:29 PM (26 years ago)
Author:
Jens Schmidt <schmidt@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b52fc4b2495505785981d640dcf7eb3e456778ef')
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:
1 edited

Legend:

Unmodified
Added
Removed
  • Singular/clapsing.cc

    ra6cbe4 ra8c3e0a  
    33*  Computer Algebra System SINGULAR     *
    44****************************************/
    5 // $Id: clapsing.cc,v 1.33 1998-04-23 10:17:03 schmidt Exp $
     5// $Id: clapsing.cc,v 1.34 1998-04-24 17:19:29 schmidt Exp $
    66/*
    77* ABSTRACT: interface between Singular and factory
     
    2727// FACTORY_GCD_TEST: use new gcd instead of old one.
    2828// FACTORY_GCD_STAT: print statistics on polynomials.  Works only
    29 //   with appropriately translated new gcd.
     29//   with the file `gcd_stat.cc' and `gcd_stat.h'.
    3030// FACTORY_GCD_TIMING: accumulate time used for gcd calculations.
    3131//   Time may be printed (and reset) with `system("gcdtime");'.
     
    4141
    4242#ifdef FACTORY_GCD_STAT
    43 #define FACTORY_GCD_TEST
     43#include "gcd_stat.h"
     44#define FACTORY_GCDSTAT( tag, f, g, d ) \
     45  printGcdStat( tag, f, g, d, rPar( currRing ) == 1 )
     46#define FACTORY_CONTSTAT( tag, f ) \
     47  printContStat( tag, f, rPar( currRing ) == 1 )
     48#else
     49#define FACTORY_GCDSTAT( tag, f, g, d )
     50#define FACTORY_CONTSTAT( tag, f )
    4451#endif
    4552
     
    411418      p = pNext( p );
    412419#ifdef FACTORY_GCD_STAT
    413       fprintf( stderr, "cont:\t" );
    414 #endif
     420      // save g
     421      CanonicalForm gOld = g;
     422#endif
     423
    415424#ifdef FACTORY_GCD_TEST
    416425      g = CFPrimitiveGcdUtil::gcd( g, h );
     
    418427      g = gcd( g, h );
    419428#endif
     429
     430      FACTORY_GCDSTAT( "cont", gOld, h, g );
    420431      FACTORY_CFTROUT( "g = ", g );
    421432      L.append( h );
     
    423434    TIMING_END( contentTimer );
    424435    FACTORY_CFTROUT( "C = ", g );
     436    FACTORY_CONTSTAT( "CONT", g );
    425437    if ( g == 1 )
    426438    {
     
    981993 alg res;
    982994
    983 #ifdef FACTORY_GCD_STAT
    984  fprintf( stderr, "algLcm:\t" );
    985 #endif
    986 
    987995 if (currRing->minpoly!=NULL)
    988996 {
     
    10391047 ff=gg=NULL;
    10401048
    1041 #ifdef FACTORY_GCD_STAT
    1042  fprintf( stderr, "alCont:\t" );
    1043 #endif
    1044 
    10451049 if (currRing->minpoly!=NULL)
    10461050 {
Note: See TracChangeset for help on using the changeset viewer.