Changeset 6d77472 in git


Ignore:
Timestamp:
Nov 28, 2013, 5:14:07 PM (9 years ago)
Author:
Christian Eder
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '48f1dd268d0ff74ef2f7dccbf02545425002ddcc')
Children:
faa12b153d136fe6d92324f9d140a98f250566f5
Parents:
f3e25c24fb9167335fed07b0b1d94ea513423a4b
git-author:
Christian Eder <ederc@mathematik.uni-kl.de>2013-11-28 17:14:07+01:00
git-committer:
Christian Eder <ederc@mathematik.uni-kl.de>2013-12-12 13:51:26+01:00
Message:
removes debug printing, improves options
File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/kstd2.cc

    rf3e25c r6d77472  
    5555#define SBA_TAIL_RED                        1
    5656#define SBA_PRODUCT_CRITERION               0
    57 #define SBA_PRINT_ZERO_REDUCTIONS           1
    58 #define SBA_PRINT_REDUCTION_STEPS           1
    59 #define SBA_PRINT_OPERATIONS                1
    60 #define SBA_PRINT_INTERREDUCTION_STEPS      1
    61 #define SBA_PRINT_INTERREDUCTION_OPERATIONS 1
    62 #define SBA_PRINT_SIZE_G                    1
    63 #define SBA_PRINT_SIZE_SYZ                  1
     57#define SBA_PRINT_ZERO_REDUCTIONS           0
     58#define SBA_PRINT_REDUCTION_STEPS           0
     59#define SBA_PRINT_OPERATIONS                0
     60#define SBA_PRINT_SIZE_G                    0
     61#define SBA_PRINT_SIZE_SYZ                  0
    6462#define SBA_PRINT_PRODUCT_CRITERION         0
    6563
    6664// counts sba's reduction steps
     65#if SBA_PRNT_REDUCTION_STEPS
    6766long sba_reduction_steps;
     67long sba_interreduction_steps;
     68#endif
     69#if SBA_PRINT_OPERATIONS
    6870long sba_operations;
    69 
    70 // counts interreduction steps if sba is used incrementally
    71 long sba_interreduction_steps;
    7271long sba_interreduction_operations;
     72#endif
     73
    7374/***********************************************
    7475 * SBA stuff -- done
     
    476477
    477478    ksReducePoly(h, &(strat->T[ii]), NULL, NULL, strat);
    478 #if SBA_PRINT_INTERREDUCTION_STEPS
     479#if SBA_PRINT_REDUCTION_STEPS
    479480    sba_interreduction_steps++;
    480481#endif
    481 #if SBA_PRINT_INTERREDUCTION_OPERATIONS
     482#if SBA_PRINT_REDUCTION_OPERATIONS
    482483    sba_interreduction_operations  +=  pLength(strat->T[ii].p);
    483484#endif
     
    927928
    928929    ksReducePoly(h, &(strat->T[ii]), NULL, NULL, strat);
    929 #if SBA_PRINT_INTERREDUCTION_STEPS
     930#if SBA_PRINT_REDUCTION_STEPS
    930931    sba_interreduction_steps++;
    931932#endif
    932 #if SBA_PRINT_INTERREDUCTION_OPERATIONS
     933#if SBA_PRINT_REDUCTION_OPERATIONS
    933934    sba_interreduction_operations  +=  pLength(strat->T[ii].p);
    934935#endif
     
    11031104    number coef;
    11041105    ksReducePoly(h,&(strat->T[ii]),strat->kNoetherTail(),&coef,strat);
    1105 #if SBA_PRINT_INTERREDUCTION_STEPS
     1106#if SBA_PRINT_REDUCTION_STEPS
    11061107    sba_interreduction_steps++;
    11071108#endif
    1108 #if SBA_PRINT_INTERREDUCTION_OPERATIONS
     1109#if SBA_PRINT_REDUCTION_OPERATIONS
    11091110    sba_interreduction_operations  +=  pLength(strat->T[ii].p);
    11101111#endif
     
    16751676  // The corresponding orders are computed in sbaRing(), depending
    16761677  // on the flag strat->incremental
     1678#if SBA_PRINT_ZERO_REDUCTIONS
    16771679  long zeroreductions           = 0;
     1680#endif
     1681#if SBA_PRINT_PRODUCT_CRITERION
    16781682  long product_criterion        = 0;
     1683#endif
     1684#if SBA_PRINT_SIZE_G
    16791685  long size_g                   = 0;
     1686#endif
     1687#if SBA_PRINT_SIZE_SYZ
    16801688  long size_syz                 = 0;
     1689#endif
    16811690  // global variable
     1691#if SBA_PRINT_REDUCTION_STEPS
    16821692  sba_reduction_steps           = 0;
     1693  sba_interreduction_steps      = 0;
     1694#endif
     1695#if SBA_PRINT_OPERATIONS
    16831696  sba_operations                = 0;
    1684   sba_interreduction_steps      = 0;
    16851697  sba_interreduction_operations = 0;
     1698#endif
    16861699
    16871700  ideal F = F0;
     
    21162129      // pair was not detected by the rewritten criterion in strat->red = redSig
    21172130      if (red_result!=2) {
     2131#if SBA_PRINT_ZERO_REDUCTIONS
    21182132        zeroreductions++;
     2133#endif
    21192134        enterSyz(strat->P,strat);
    21202135//#if 1
     
    22362251  printf("----------------------------------------------------------\n");
    22372252  printf("ZERO REDUCTIONS:            %ld\n",zeroreductions);
     2253  zeroreductions  = 0;
    22382254#endif
    22392255#if SBA_PRINT_REDUCTION_STEPS
    22402256  printf("----------------------------------------------------------\n");
    2241   printf("TOP S-REDUCTIONS:           %ld\n",sba_reduction_steps);
     2257  printf("S-REDUCTIONS:               %ld\n",sba_reduction_steps);
    22422258#endif
    22432259#if SBA_PRINT_OPERATIONS
    22442260  printf("OPERATIONS:                 %ld\n",sba_operations);
    22452261#endif
    2246 #if SBA_PRINT_INTERREDUCTION_STEPS
     2262#if SBA_PRINT_REDUCTION_STEPS
    22472263  printf("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - \n");
    22482264  printf("INTERREDUCTIONS:            %ld\n",sba_interreduction_steps);
    22492265#endif
    2250 #if SBA_PRINT_INTERREDUCTION_OPERATIONS
     2266#if SBA_PRINT_REDUCTION_OPERATIONS
    22512267  printf("INTERREDUCTION OPERATIONS:  %ld\n",sba_interreduction_operations);
    22522268#endif
    2253 #if SBA_PRINT_INTERREDUCTION_STEPS
     2269#if SBA_PRINT_REDUCTION_STEPS
    22542270  printf("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - \n");
    22552271  printf("ALL REDUCTIONS:             %ld\n",sba_reduction_steps+sba_interreduction_steps);
    2256 #endif
    2257 #if SBA_PRINT_INTERREDUCTION_OPERATIONS
     2272  sba_interreduction_steps  = 0;
     2273  sba_reduction_steps       = 0;
     2274#endif
     2275#if SBA_PRINT_OPERATIONS
    22582276  printf("ALL OPERATIONS:             %ld\n",sba_operations+sba_interreduction_operations);
     2277  sba_interreduction_operations = 0;
     2278  sba_operations                = 0;
    22592279#endif
    22602280#if SBA_PRINT_SIZE_G
    22612281  printf("----------------------------------------------------------\n");
    22622282  printf("SIZE OF G:                  %ld\n",size_g);
     2283  size_g  = 0;
    22632284#endif
    22642285#if SBA_PRINT_SIZE_SYZ
    22652286  printf("SIZE OF SYZ:                %ld\n",size_syz);
    22662287  printf("----------------------------------------------------------\n");
     2288  size_syz  = 0;
    22672289#endif
    22682290#if SBA_PRINT_PRODUCT_CRITERION
    22692291  printf("PRODUCT CRITERIA:           %ld\n",product_criterion);
    2270 #endif
    2271   zeroreductions                = 0;
    2272   size_g                        = 0;
    2273   size_syz                      = 0;
    2274   product_criterion             = 0;
    2275   sba_reduction_steps           = 0;
    2276   sba_operations                = 0;
    2277   sba_interreduction_steps      = 0;
    2278   sba_interreduction_operations = 0;
     2292  product_criterion = 0;
     2293#endif
    22792294  return (strat->Shdl);
    22802295}
Note: See TracChangeset for help on using the changeset viewer.