Changeset f7f084 in git for kernel/kstd2.cc


Ignore:
Timestamp:
Nov 28, 2013, 8:16:24 PM (9 years ago)
Author:
Christian Eder
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'cbf866d4f8c3861325311c042cb2033c053453b2')
Children:
f397dc928c632a2acc5076b2121dcedf217f5494
Parents:
faa12b153d136fe6d92324f9d140a98f250566f5
git-author:
Christian Eder <ederc@mathematik.uni-kl.de>2013-11-28 20:16:24+01:00
git-committer:
Christian Eder <ederc@mathematik.uni-kl.de>2013-12-12 13:51:26+01:00
Message:
changes incremental flag to sbaOrder, no longer BOOLEAN
=> preparation in order to introduce more module orders for sba
File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/kstd2.cc

    rfaa12b1 rf7f084  
    6363
    6464// counts sba's reduction steps
    65 #if SBA_PRNT_REDUCTION_STEPS
     65#if SBA_PRINT_REDUCTION_STEPS
    6666long sba_reduction_steps;
    6767long sba_interreduction_steps;
     
    16751675  //    induced Schreyer order.
    16761676  // The corresponding orders are computed in sbaRing(), depending
    1677   // on the flag strat->incremental
     1677  // on the flag strat->sbaOrder
    16781678#if SBA_PRINT_ZERO_REDUCTIONS
    16791679  long zeroreductions           = 0;
     
    17011701  ring sRing, currRingOld;
    17021702  currRingOld  = currRing;
    1703   if (strat->incremental)
     1703  if (strat->sbaOrder == 1)
    17041704  {
    17051705    sRing = sbaRing(strat);
     
    18041804      else strat->noClearS=TRUE;
    18051805    }
    1806     if (strat->incremental && pGetComp(strat->L[strat->Ll].sig) != strat->currIdx)
     1806    if (strat->sbaOrder == 1 && pGetComp(strat->L[strat->Ll].sig) != strat->currIdx)
    18071807    {
    18081808      strat->currIdx  = pGetComp(strat->L[strat->Ll].sig);
     
    19691969    // remove sigsafe label since it is no longer valid for the next element to
    19701970    // be reduced
    1971     if (strat->incremental)
     1971    if (strat->sbaOrder == 1)
    19721972    {
    19731973      for (int jj = 0; jj<strat->tl+1; jj++)
     
    20172017      // enter into S, L, and T
    20182018      //if ((!TEST_OPT_IDLIFT) || (pGetComp(strat->P.p) <= strat->syzComp))
    2019       if(!strat->incremental)
     2019      if(!strat->sbaOrder == 1)
    20202020      {
    20212021        BOOLEAN overwrite = TRUE;
     
    22292229  }
    22302230#endif
    2231   if (strat->incremental && sRing!=currRingOld)
     2231  if (strat->sbaOrder == 1 && sRing!=currRingOld)
    22322232  {
    22332233    rChangeCurrRing (currRingOld);
Note: See TracChangeset for help on using the changeset viewer.