Changeset b981502 in git


Ignore:
Timestamp:
Jan 4, 2007, 11:42:46 AM (17 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b21a664aa22dc6e196223af8a74ad4885e83547c')
Children:
dfd4fc6ea94830e53cf1a0e58c158d96a83f0b47
Parents:
2a289e745e1424ffd122e32acdcfe8fe0f9a1a93
Message:
*hannes:  syzComp handling


git-svn-id: file:///usr/local/Singular/svn/trunk@9623 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
kernel
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • kernel/kstd1.cc

    r2a289e rb981502  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kstd1.cc,v 1.15 2007-01-03 00:17:10 motsak Exp $ */
     4/* $Id: kstd1.cc,v 1.16 2007-01-04 10:42:45 Singular Exp $ */
    55/*
    66* ABSTRACT:
     
    264264      // this has the side effect of setting h->length
    265265      h->ecart = h->pLDeg(strat->LDegLast) - h->GetpFDeg();
    266 
     266#if 0
    267267    if (strat->syzComp!=0)
    268268    {
     
    277277      }
    278278    }
     279#endif
    279280    /*- try to reduce the s-polynomial -*/
    280281    pass++;
     
    373374    h->SetShortExpVector();
    374375
     376#if 0
    375377    if ((strat->syzComp!=0) && !strat->honey)
    376378    {
     
    387389      }
    388390    }
     391#endif   
    389392    if (!strat->homog)
    390393    {
     
    20172020  {
    20182021#ifdef NO_LDEG
    2019     if (!strat->syzComp)
     2022    if (strat->syzComp==0)
    20202023      return TRUE;
    20212024#else
    2022     if ((strat->homog || strat->honey) && !strat->syzComp)
     2025    if ((strat->homog || strat->honey) && (strat->syzComp==0))
    20232026      return TRUE;
    20242027#endif
     
    20272030  {
    20282031    assume(strat->red == redEcart);
    2029     if (strat->honey && !strat->syzComp)
     2032    if (strat->honey && (strat->syzComp==0))
    20302033      return TRUE;
    20312034  }
  • kernel/kstd2.cc

    r2a289e rb981502  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kstd2.cc,v 1.31 2007-01-03 00:17:10 motsak Exp $ */
     4/* $Id: kstd2.cc,v 1.32 2007-01-04 10:42:46 Singular Exp $ */
    55/*
    66*  ABSTRACT -  Kernel: alg. of Buchberger
     
    12061206
    12071207      // enter into S, L, and T
    1208       if ((!TEST_OPT_IDLIFT) || (pGetComp(strat->P.p) <= strat->syzComp))
     1208      //if ((!TEST_OPT_IDLIFT) || (pGetComp(strat->P.p) <= strat->syzComp))
    12091209        enterT(strat->P, strat);
    12101210#ifdef HAVE_RING2TOM
     
    12281228      else
    12291229      {
    1230         strat->P.Delete();
     1230      //  strat->P.Delete(); // syzComp test: it is in T
    12311231      }
    12321232#if 0
  • kernel/kutil.cc

    r2a289e rb981502  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kutil.cc,v 1.40 2007-01-03 00:17:10 motsak Exp $ */
     4/* $Id: kutil.cc,v 1.41 2007-01-04 10:42:46 Singular Exp $ */
    55/*
    66* ABSTRACT: kernel: utils for kStd
     
    320320        L->ecart = 0;
    321321        L->length = 1;
    322         if (L->pLength > 0) L->pLength = 1;
     322        //if (L->pLength > 0)s
     323        L->pLength = 1;
    323324        if (L->last != NULL) L->last = p;
    324325
     
    929930      if (pOrdSgn != -1 || kFindInT(set[j].p, strat) < 0)
    930931      {
    931         // assure that for global ordereings kFindInT fails
     932        // assure that for global orderings kFindInT fails
    932933        assume(pOrdSgn == -1 || kFindInT(set[j].p, strat) < 0);
    933934        set[j].Delete();
     
    10011002  h->FDeg = h->pFDeg();
    10021003  h->ecart = h->pLDeg() - h->FDeg;
    1003   h->length=h->GetpLength();
     1004  h->pLength=h->GetpLength();
     1005  // h->length is set by h->pLDeg
    10041006}
    10051007
     
    10081010  h->FDeg = h->pFDeg();
    10091011  (*h).ecart = 0;
    1010   h->length=h->GetpLength();
     1012  h->pLength=h->GetpLength();
     1013  h->pLDeg();
     1014  // h->length is set by h->pLDeg
    10111015}
    10121016
     
    10291033*if ecart1<=ecart2 it returns TRUE
    10301034*/
    1031 BOOLEAN sugarDivisibleBy(int ecart1, int ecart2)
     1035static inline BOOLEAN sugarDivisibleBy(int ecart1, int ecart2)
    10321036{
    10331037  return (ecart1 <= ecart2);
     
    24842488  int j = pos;
    24852489  if ( (!strat->fromT)
    2486   && ((strat->syzComp==0)
    2487     ||(pGetComp(h)<=strat->syzComp)))
     2490  && (1//(strat->syzComp==0)
     2491    //||(pGetComp(h)<=strat->syzComp)))
     2492  ))
    24882493  {
    24892494    //Print("start clearS k=%d, pos=%d, sl=%d\n",k,pos,strat->sl);
     
    26082613    i++;
    26092614    if (i >= strat->sl) break;
    2610     if ((strat->syzComp==0) || (pGetComp(strat->S[i])<=strat->syzComp))
     2615    if (1//(strat->syzComp==0) || (pGetComp(strat->S[i])<=strat->syzComp))
     2616    )
    26112617    {
    26122618      j=i;
     
    47734779      {
    47744780        change=FALSE;
    4775         if (((strat->syzComp==0) || (pGetComp(strat->S[i])<=strat->syzComp))
     4781        if (1//((strat->syzComp==0) || (pGetComp(strat->S[i])<=strat->syzComp))
    47764782        && ((strat->fromQ==NULL) || (strat->fromQ[i]==0)))
    47774783        {
     
    48614867      {
    48624868        change=FALSE;
    4863         if (((strat->syzComp==0) || (pGetComp(strat->S[i])<=strat->syzComp))
     4869        if (1//((strat->syzComp==0) || (pGetComp(strat->S[i])<=strat->syzComp))
    48644870        && ((strat->fromQ==NULL) || (strat->fromQ[i]==0)))
    48654871        {
Note: See TracChangeset for help on using the changeset viewer.