Changeset 15b211 in git


Ignore:
Timestamp:
Nov 21, 2013, 6:42:17 PM (9 years ago)
Author:
Christian Eder
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '48f1dd268d0ff74ef2f7dccbf02545425002ddcc')
Children:
f59aaade492b9527e048de83ffcb97228e48208b
Parents:
f1babfbabc0fc2906b36df32051eaaf09673dc6f
git-author:
Christian Eder <ederc@mathematik.uni-kl.de>2013-11-21 18:42:17+01:00
git-committer:
Christian Eder <ederc@mathematik.uni-kl.de>2013-12-12 13:51:25+01:00
Message:
1. adds operation counting in sba
2. enables partial tailred for incremental sba
File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/kstd2.cc

    rf1babf r15b211  
    4848#endif
    4949
    50 #define F5C       0
     50#define F5C       1
    5151#if F5C
    5252  #define F5CTAILRED 1
     
    5656#define SBA_PRINT_ZERO_REDUCTIONS     1
    5757#define SBA_PRINT_REDUCTION_STEPS     1
     58#define SBA_PRINT_OPERATIONS          1
    5859#define SBA_PRINT_SIZE_G              1
    5960#define SBA_PRINT_SIZE_SYZ            1
     
    6162
    6263long sba_reduction_steps;
     64long sba_operations;
    6365/***********************************************
    6466 * SBA stuff -- done
     
    623625    sigSafe = ksReducePolySig(h, &(strat->T[ii]), strat->S_2_R[ii], NULL, NULL, strat);
    624626#if SBA_PRINT_REDUCTION_STEPS
    625     sba_reduction_steps++;
     627    if (sigSafe != 3)
     628      sba_reduction_steps++;
     629#endif
     630#if SBA_PRINT_OPERATIONS
     631    if (sigSafe != 3)
     632      sba_operations  +=  pLength(strat->T[ii].p);
    626633#endif
    627634    // if reduction has taken place, i.e. the reduction was sig-safe
     
    15141521  // global variable
    15151522  sba_reduction_steps     = 0;
     1523  sba_operations          = 0;
    15161524
    15171525  ideal F = F0;
     
    15401548  int hilbeledeg=1,hilbcount=0,minimcnt=0;
    15411549  LObject L;
    1542   // BOOLEAN withT     = FALSE;
     1550  BOOLEAN withT     = FALSE;
    15431551  strat->max_lower_index = 0;
    15441552
     
    20662074  printf("TOP S-REDUCTIONS:  %ld\n",sba_reduction_steps);
    20672075#endif
     2076#if SBA_OPERATIONS
     2077  printf("OPERATIONS:        %ld\n",sba_operations);
     2078#endif
    20682079#if SBA_PRINT_SIZE_G
    20692080  printf("SIZE OF G:         %ld\n",size_g);
     
    20802091  product_criterion   = 0;
    20812092  sba_reduction_steps = 0;
     2093  sba_operations      = 0;
    20822094  return (strat->Shdl);
    20832095}
     
    24022414      // therefore we call pContent instead of pNorm
    24032415#if F5CTAILRED
     2416      BOOLEAN withT = TRUE;
    24042417      if ((TEST_OPT_INTSTRATEGY) || (rField_is_Ring(currRing)))
    24052418      {
Note: See TracChangeset for help on using the changeset viewer.