Changeset fee33e in git


Ignore:
Timestamp:
Jul 2, 2012, 7:50:07 AM (11 years ago)
Author:
Christian Eder
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')
Children:
0758b5a070556dd402b297144aae88721940fd10
Parents:
1bc7d4ac8a4fd3280459ab78ca65bd4e60dd2c93
git-author:
Christian Eder <ederc@mathematik.uni-kl.de>2012-07-02 07:50:07+02:00
git-committer:
Christian Eder <ederc@mathematik.uni-kl.de>2012-07-05 16:12:50+02:00
Message:
fixes signature-based stuff in kstd2.cc for spielwiese
File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/kstd2.cc

    r1bc7d4a rfee33e  
    5757#include <kernel/khstd.h>
    5858#include <polys/kbuckets.h>
     59#include <polys/prCopy.h>
    5960//#include "cntrlc.h"
    6061#include <polys/weight.h>
     
    14971498    {
    14981499      rChangeCurrRing (sRing);
    1499       F = idrMoveR (F0, currRingOld);
     1500      F = idrMoveR (F0, currRingOld, currRing);
    15001501    }
    15011502  }
     
    15131514  int   olddeg,reduc;
    15141515  int hilbeledeg=1,hilbcount=0,minimcnt=0;
     1516  long zeroreductions = 0;
    15151517  LObject L;
    15161518  BOOLEAN withT     = FALSE;
     
    15551557
    15561558#ifdef HAVE_TAIL_RING
    1557   if(!idIs0(F) &&(!rField_is_Ring()))  // create strong gcd poly computes with tailring and S[i] ->to be fixed
     1559  if(!idIs0(F) &&(!rField_is_Ring(currRing)))  // create strong gcd poly computes with tailring and S[i] ->to be fixed
    15581560    kStratInitChangeTailRing(strat);
    15591561#endif
     
    15801582    if (strat->Ll== 0) strat->interpt=TRUE;
    15811583    if (TEST_OPT_DEGBOUND
    1582         && ((strat->honey && (strat->L[strat->Ll].ecart+pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
    1583             || ((!strat->honey) && (pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))))
     1584        && ((strat->honey && (strat->L[strat->Ll].ecart+currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
     1585            || ((!strat->honey) && (currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))))
    15841586    {
    15851587      /*
     
    15901592      while ((strat->Ll >= 0)
    15911593        && (strat->L[strat->Ll].p1!=NULL) && (strat->L[strat->Ll].p2!=NULL)
    1592         && ((strat->honey && (strat->L[strat->Ll].ecart+pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
    1593             || ((!strat->honey) && (pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg)))
     1594        && ((strat->honey && (strat->L[strat->Ll].ecart+currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
     1595            || ((!strat->honey) && (currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg)))
    15941596        )
    15951597        deleteInL(strat->L,&strat->Ll,strat->Ll,strat);
     
    19721974
    19731975  exitSba(strat);
    1974   if (TEST_OPT_WEIGHTM)
    1975   {
    1976     pRestoreDegProcs(pFDegOld, pLDegOld);
    1977     if (ecartWeights)
    1978     {
    1979       omFreeSize((ADDRESS)ecartWeights,(pVariables+1)*sizeof(short));
    1980       ecartWeights=NULL;
    1981     }
    1982   }
    1983   if (TEST_OPT_PROT) messageStat(srmax,lrmax,hilbcount,strat);
     1976//  if (TEST_OPT_WEIGHTM)
     1977//  {
     1978//    pRestoreDegProcs(pFDegOld, pLDegOld);
     1979//    if (ecartWeights)
     1980//    {
     1981//      omFreeSize((ADDRESS)ecartWeights,(pVariables+1)*sizeof(short));
     1982//      ecartWeights=NULL;
     1983//    }
     1984//  }
     1985  if (TEST_OPT_PROT) messageStat(hilbcount,strat);
    19841986  if (Q!=NULL) updateResult(strat->Shdl,Q,strat);
    19851987
     
    20022004  {
    20032005    rChangeCurrRing (currRingOld);
    2004     F0          = idrMoveR (F, sRing);
    2005     strat->Shdl = idrMoveR_NoSort (strat->Shdl, sRing);
     2006    F0          = idrMoveR (F, sRing, currRing);
     2007    strat->Shdl = idrMoveR_NoSort (strat->Shdl, sRing, currRing);
    20062008    rDelete (sRing);
    20072009  }
     
    22082210      if (h.p!=NULL)
    22092211      {
    2210         if (pOrdSgn==-1)
     2212        if (currRing->OrdSgn==-1)
    22112213        {
    22122214          cancelunit(&h); 
Note: See TracChangeset for help on using the changeset viewer.