Changeset f7f084 in git for kernel/kutil.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/kutil.cc

    rfaa12b1 rf7f084  
    59375937  strat->S      =   strat->Shdl->m;
    59385938  strat->sig    =   (poly *)omAlloc0(i*sizeof(poly));
    5939   if (!strat->incremental)
     5939  if (strat->sbaOrder != 1)
    59405940  {
    59415941    strat->syz    = (poly *)omAlloc0(i*sizeof(poly));
     
    59995999      // => we can keep the underlying monomial order and get a Schreyer
    60006000      //    order without any bigger overhead
    6001       if (!strat->incremental)
     6001      if (strat->sbaOrder != 1)
    60026002      {
    60036003        p_ExpVectorAdd (h.sig,F->m[i],currRing);
     
    60366036      }
    60376037      /*
    6038       if (!strat->incremental)
     6038      if (strat->sbaOrder != 1)
    60396039      {
    60406040        for(j=0;j<i;j++)
     
    73417341   *****************************************/
    73427342  //strat->rewCrit1     = faugereRewCriterion;
    7343   if (strat->incremental)
     7343  if (strat->sbaOrder == 1)
    73447344  {
    73457345    strat->syzCrit  = syzCriterionInc;
     
    77657765  omFreeSize((ADDRESS)strat->syz,(strat->syzmax)*sizeof(poly));
    77667766  omFreeSize((ADDRESS)strat->sevSyz,(strat->syzmax)*sizeof(unsigned long));
    7767   if (strat->incremental)
     7767  if (strat->sbaOrder == 1)
    77687768  {
    77697769    omFreeSize(strat->syzIdx,(strat->syzidxmax)*sizeof(int));
     
    82548254{
    82558255  int n = rBlocks(r); // Including trailing zero!
    8256   // if incremental => use (C,monomial order from r)
    8257   if (strat->incremental)
     8256  // if sbaOrder == 1 => use (C,monomial order from r)
     8257  if (strat->sbaOrder == 1)
    82588258  {
    82598259    if (r->order[0] == ringorder_C || r->order[0] == ringorder_c)
     
    82988298  }
    82998299
    8300   // not incremental => use Schreyer order
     8300  // not sbaOrder == 1 => use Schreyer order
    83018301  // this is done by a trick when initializing the signatures
    83028302  // in initSLSba():
Note: See TracChangeset for help on using the changeset viewer.