Changeset e533660 in git


Ignore:
Timestamp:
Jul 25, 2011, 1:34:29 PM (13 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c7af8613769b29c741d6c338945669719f1fc4f8')
Children:
e844211499629f2cedd7bb181881b1d27ea94d53
Parents:
f599a4630de86cfe7321b4799a84af04bac22291
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-07-25 13:34:29+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:53:32+01:00
Message:
fix kstd2.cc
File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/kstd2.cc

    rf599a46 re533660  
    195195  poly tmp2, tmp3;
    196196  poly lead_mult = p_ISet(1, tailRing);
    197   if (leadRing->ch <= k_ind2 + a_ind2)
    198   {
    199     int too_much = k_ind2 + a_ind2 - leadRing->ch;
     197  if (n_GetChar(leadRing->cf) <= k_ind2 + a_ind2)
     198  {
     199    int too_much = k_ind2 + a_ind2 - n_GetChar(leadRing->cf);
    200200    int s_exp;
    201201    zeroPoly = p_ISet(a, tailRing);
     
    10201020
    10211021#ifdef HAVE_TAIL_RING
    1022   if(!idIs0(F) &&(!rField_is_Ring()))  // create strong gcd poly computes with tailring and S[i] ->to be fixed
     1022  if(!idIs0(F) &&(!rField_is_Ring(currRing)))  // create strong gcd poly computes with tailring and S[i] ->to be fixed
    10231023    kStratInitChangeTailRing(strat);
    10241024#endif
     
    10441044    if (strat->Ll== 0) strat->interpt=TRUE;
    10451045    if (TEST_OPT_DEGBOUND
    1046         && ((strat->honey && (strat->L[strat->Ll].ecart+pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
    1047             || ((!strat->honey) && (pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))))
     1046        && ((strat->honey && (strat->L[strat->Ll].ecart+currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
     1047            || ((!strat->honey) && (currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))))
    10481048    {
    10491049      /*
     
    10541054      while ((strat->Ll >= 0)
    10551055        && (strat->L[strat->Ll].p1!=NULL) && (strat->L[strat->Ll].p2!=NULL)
    1056         && ((strat->honey && (strat->L[strat->Ll].ecart+pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
    1057             || ((!strat->honey) && (pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg)))
     1056        && ((strat->honey && (strat->L[strat->Ll].ecart+currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
     1057            || ((!strat->honey) && (currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg)))
    10581058        )
    10591059        deleteInL(strat->L,&strat->Ll,strat->Ll,strat);
     
    12791279  /* release temp data-------------------------------- */
    12801280  exitBuchMora(strat);
    1281   if (TEST_OPT_WEIGHTM)
    1282   {
    1283     pRestoreDegProcs(pFDegOld, pLDegOld);
    1284     if (ecartWeights)
    1285     {
    1286       omFreeSize((ADDRESS)ecartWeights,((currRing->N)+1)*sizeof(short));
    1287       ecartWeights=NULL;
    1288     }
    1289   }
     1281//  if (TEST_OPT_WEIGHTM)
     1282//  {
     1283//    pRestoreDegProcs(currRing,pFDegOld, pLDegOld);
     1284//    if (ecartWeights)
     1285//    {
     1286//      omFreeSize((ADDRESS)ecartWeights,((currRing->N)+1)*sizeof(short));
     1287//      ecartWeights=NULL;
     1288//    }
     1289//  }
    12901290  if (TEST_OPT_PROT) messageStat(srmax,lrmax,hilbcount,strat);
    12911291  if (Q!=NULL) updateResult(strat->Shdl,Q,strat);
     
    13451345    if (TEST_OPT_PROT) { PrintS("t"); mflush(); }
    13461346    #ifdef HAVE_RINGS
    1347     if (rField_is_Ring())
     1347    if (rField_is_Ring(currRing))
    13481348    {
    13491349      p = redtailBba_Z(p,max_ind,strat);
     
    14201420        if (TEST_OPT_PROT) { PrintS("t"); mflush(); }
    14211421        #ifdef HAVE_RINGS
    1422         if (rField_is_Ring())
     1422        if (rField_is_Ring(currRing))
    14231423        {
    14241424          p = redtailBba_Z(p,max_ind,strat);
     
    15071507    if (strat->Ll== 0) strat->interpt=TRUE;
    15081508    if (TEST_OPT_DEGBOUND
    1509         && ((strat->honey && (strat->L[strat->Ll].ecart+pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
    1510             || ((!strat->honey) && (pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))))
     1509        && ((strat->honey && (strat->L[strat->Ll].ecart+currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
     1510            || ((!strat->honey) && (currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))))
    15111511    {
    15121512      /*
     
    15171517      while ((strat->Ll >= 0)
    15181518        && (strat->L[strat->Ll].p1!=NULL) && (strat->L[strat->Ll].p2!=NULL)
    1519         && ((strat->honey && (strat->L[strat->Ll].ecart+pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
    1520             || ((!strat->honey) && (pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg)))
     1519        && ((strat->honey && (strat->L[strat->Ll].ecart+currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
     1520            || ((!strat->honey) && (currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg)))
    15211521        )
    15221522        deleteInL(strat->L,&strat->Ll,strat->Ll,strat);
     
    17911791  /* release temp data-------------------------------- */
    17921792  exitBuchMora(strat);
    1793   if (TEST_OPT_WEIGHTM)
    1794   {
    1795     pRestoreDegProcs(pFDegOld, pLDegOld);
    1796     if (ecartWeights)
    1797     {
    1798       omFreeSize((ADDRESS)ecartWeights,((currRing->N)+1)*sizeof(short));
    1799       ecartWeights=NULL;
    1800     }
    1801   }
     1793//  if (TEST_OPT_WEIGHTM)
     1794//  {
     1795//    pRestoreDegProcs(currRing,pFDegOld, pLDegOld);
     1796//    if (ecartWeights)
     1797//    {
     1798//      omFreeSize((ADDRESS)ecartWeights,((currRing->N)+1)*sizeof(short));
     1799//      ecartWeights=NULL;
     1800//    }
     1801//  }
    18021802  if (TEST_OPT_PROT) messageStat(srmax,lrmax,hilbcount,strat);
    18031803  if (Q!=NULL) updateResult(strat->Shdl,Q,strat);
     
    19871987  //else              strat->kIdeal->rtyp=MODUL_CMD;
    19881988  //strat->kIdeal->data=(void *)strat->Shdl;
    1989   if ((TEST_OPT_WEIGHTM)&&(F!=NULL))
    1990   {
    1991     //interred  machen   Aenderung
    1992     pFDegOld=pFDeg;
    1993     pLDegOld=pLDeg;
    1994     //h=ggetid("ecart");
    1995     //if ((h!=NULL) /*&& (IDTYP(h)==INTVEC_CMD)*/)
    1996     //{
    1997     //  ecartWeights=iv2array(IDINTVEC(h));
    1998     //}
    1999     //else
    2000     {
    2001       ecartWeights=(short *)omAlloc(((currRing->N)+1)*sizeof(short));
    2002       /*uses automatic computation of the ecartWeights to set them*/
    2003       kEcartWeights(F->m,IDELEMS(F)-1,ecartWeights);
    2004     }
    2005     pRestoreDegProcs(totaldegreeWecart, maxdegreeWecart);
    2006     if (TEST_OPT_PROT)
    2007     {
    2008       for(i=1; i<=(currRing->N); i++)
    2009         Print(" %d",ecartWeights[i]);
    2010       PrintLn();
    2011       mflush();
    2012     }
    2013   }
     1989//  if ((TEST_OPT_WEIGHTM)&&(F!=NULL))
     1990//  {
     1991//    //interred  machen   Aenderung
     1992//    pFDegOld=currRing->pFDeg;
     1993//    pLDegOld=pLDeg;
     1994//    //h=ggetid("ecart");
     1995//    //if ((h!=NULL) /*&& (IDTYP(h)==INTVEC_CMD)*/)
     1996//    //{
     1997//    //  ecartWeights=iv2array(IDINTVEC(h));
     1998//    //}
     1999//    //else
     2000//    {
     2001//      ecartWeights=(short *)omAlloc(((currRing->N)+1)*sizeof(short));
     2002//      /*uses automatic computation of the ecartWeights to set them*/
     2003//      kEcartWeights(F->m,IDELEMS(F)-1,ecartWeights,currRing);
     2004//    }
     2005//    pRestoreDegProcs(currRing,totaldegreeWecart, maxdegreeWecart);
     2006//    if (TEST_OPT_PROT)
     2007//    {
     2008//      for(i=1; i<=(currRing->N); i++)
     2009//        Print(" %d",ecartWeights[i]);
     2010//      PrintLn();
     2011//      mflush();
     2012//    }
     2013//  }
    20142014}
    20152015#endif
Note: See TracChangeset for help on using the changeset viewer.