Changeset 1c94e4 in git


Ignore:
Timestamp:
Feb 25, 2013, 7:43:37 PM (10 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '5a0dde71de01068fad5736a17555c993ecbbf495')
Children:
1ebec3c7efad1d47983c6cf8615fcf49efdc661a
Parents:
9d68fdf479afa832b1ae8fbea4d7345ac1b18fbd
Message:
Fixing firstUpdate (un-commented code)
Location:
kernel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • kernel/kstd1.cc

    r9d68fd r1c94e4  
    925925    assume(kTest_TS(strat));
    926926    strat->update = (strat->tl == -1);
    927     //if (TEST_OPT_WEIGHTM)
    928     //{
    929     //  pRestoreDegProcs(currRing,strat->pOrigFDeg, strat->pOrigLDeg);
    930     //  if (strat->tailRing != currRing)
    931     //  {
    932     //    strat->tailRing->pFDeg = strat->pOrigFDeg_TailRing;
    933     //    strat->tailRing->pLDeg = strat->pOrigLDeg_TailRing;
    934     //  }
    935     //  int i;
    936     //  for (i=strat->Ll; i>=0; i--)
    937     //  {
    938     //    strat->L[i].SetpFDeg();
    939     //  }
    940     //  for (i=strat->tl; i>=0; i--)
    941     //  {
    942     //    strat->T[i].SetpFDeg();
    943     //  }
    944     //  if (ecartWeights)
    945     //  {
    946     //    omFreeSize((ADDRESS)ecartWeights,((currRing->N)+1)*sizeof(short));
    947     //    ecartWeights=NULL;
    948     //  }
    949     //}
     927    if (TEST_OPT_WEIGHTM)
     928    {
     929      pRestoreDegProcs(currRing,strat->pOrigFDeg, strat->pOrigLDeg);
     930      if (strat->tailRing != currRing)
     931      {
     932        strat->tailRing->pFDeg = strat->pOrigFDeg_TailRing;
     933        strat->tailRing->pLDeg = strat->pOrigLDeg_TailRing;
     934      }
     935      int i;
     936      for (i=strat->Ll; i>=0; i--)
     937      {
     938        strat->L[i].SetpFDeg();
     939      }
     940      for (i=strat->tl; i>=0; i--)
     941      {
     942        strat->T[i].SetpFDeg();
     943      }
     944      if (ecartWeights)
     945      {
     946        omFreeSize((ADDRESS)ecartWeights,(rVar(currRing)+1)*sizeof(short));
     947        ecartWeights=NULL;
     948      }
     949    }
    950950    if (TEST_OPT_FASTHC)
    951951    {
  • kernel/kutil.cc

    r9d68fd r1c94e4  
    85538553    if(TEST_OPT_DEGBOUND)
    85548554      Print(" degBound: %d\n", Kstd1_deg);
    8555     #ifndef NDEBUG
     8555   
     8556    if( ecartWeights != NULL )
     8557    {
     8558       PrintS("ecartWeights: ");
     8559       for (int i = rVar(currRing); i > 0; i--)
     8560         Print("%hd ", ecartWeights[i]);
     8561       PrintLn();
     8562       assume( TEST_OPT_WEIGHTM );
     8563    }
     8564     
     8565#ifndef NDEBUG
    85568566    rDebugPrint(currRing);
    8557     #endif
     8567#endif
    85588568}
    85598569
Note: See TracChangeset for help on using the changeset viewer.