Changeset eafa0ed in git


Ignore:
Timestamp:
Oct 25, 2011, 5:11:44 PM (12 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
c3238c9cf73749e83476377e7c488cf63eca07fd
Parents:
0033111f9b9caf502a298c422c3cbea31cee1927
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-10-25 17:11:44+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:14:10+01:00
Message:
fix Old/weight.tst (removed pFDegOld, pLDegOld -> strat->pOrigFDeg etc)
Location:
kernel
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • kernel/kstd1.cc

    r0033111 reafa0ed  
    134134static int doRed (LObject* h, TObject* with,BOOLEAN intoT,kStrategy strat)
    135135{
    136   poly hp;
    137136  int ret;
    138137#if KDEBUG > 0
    … …  
    182181int redEcart (LObject* h,kStrategy strat)
    183182{
    184   poly pi;
    185183  int i,at,ei,li,ii;
    186184  int j = 0;
    … …  
    930928    //if (TEST_OPT_WEIGHTM)
    931929    //{
    932     //  pRestoreDegProcs(currRing,pFDegOld, pLDegOld);
     930    //  pRestoreDegProcs(currRing,strat->pOrigFDeg, strat->pOrigLDeg);
    933931    //  if (strat->tailRing != currRing)
    934932    //  {
    … …  
    983981void enterSMora (LObject p,int atS,kStrategy strat, int atR = -1)
    984982{
    985   int i;
    986983  enterSBba(p, atS, strat, atR);
    987984  #ifdef KDEBUG
    … …  
    10371034void enterSMoraNF (LObject p, int atS,kStrategy strat, int atR = -1)
    10381035{
    1039   int i;
    1040 
    10411036  enterSBba(p, atS, strat, atR);
    10421037  if ((!strat->kHEdgeFound) || (strat->kNoether!=NULL)) HEckeTest(p.p,strat);
    … …  
    10491044void initBba(ideal F,kStrategy strat)
    10501045{
    1051   int i;
    1052   idhdl h;
    10531046 /* setting global variables ------------------- */
    10541047  strat->enterS = enterSBba;
    … …  
    10801073//  {
    10811074//    //interred  machen   Aenderung
    1082 //    pFDegOld=pFDeg;
    1083 //    pLDegOld=pLDeg;
     1075//    strat->pOrigFDeg=pFDeg;
     1076//    strat->pOrigLDeg=pLDeg;
    10841077//    //h=ggetid("ecart");
    10851078//    //if ((h!=NULL) /*&& (IDTYP(h)==INTVEC_CMD)*/)
    … …  
    11071100{
    11081101  int i,j;
    1109   idhdl h;
    11101102
    11111103  strat->NotUsedAxis = (BOOLEAN *)omAlloc(((currRing->N)+1)*sizeof(BOOLEAN));
    … …  
    11351127   *intvec ecart and set ecartWeights
    11361128   */
    1137 //  if ((TEST_OPT_WEIGHTM)&&(F!=NULL))
    1138 //  {
    1139 //    //interred  machen   Aenderung
    1140 //    pFDegOld=pFDeg;
    1141 //    pLDegOld=pLDeg;
    1142 //    //h=ggetid("ecart");
    1143 //    //if ((h!=NULL) /*&& (IDTYP(h)==INTVEC_CMD)*/)
    1144 //    //{
    1145 //    //  ecartWeights=iv2array(IDINTVEC(h));
    1146 //    //}
    1147 //    //else
    1148 //    {
    1149 //      ecartWeights=(short *)omAlloc(((currRing->N)+1)*sizeof(short));
    1150 //      /*uses automatic computation of the ecartWeights to set them*/
    1151 //      kEcartWeights(F->m,IDELEMS(F)-1,ecartWeights);
    1152 //    }
    1153 //
    1154 //    pSetDegProcs(currRing,totaldegreeWecart, maxdegreeWecart);
    1155 //    if (TEST_OPT_PROT)
    1156 //    {
    1157 //      for(i=1; i<=(currRing->N); i++)
    1158 //        Print(" %d",ecartWeights[i]);
    1159 //      PrintLn();
    1160 //      mflush();
    1161 //    }
    1162 //  }
     1129  if ((TEST_OPT_WEIGHTM)&&(F!=NULL))
     1130  {
     1131    //interred  machen   Aenderung
     1132    strat->pOrigFDeg=currRing->pFDeg;
     1133    strat->pOrigLDeg=currRing->pLDeg;
     1134    ecartWeights=(short *)omAlloc(((currRing->N)+1)*sizeof(short));
     1135    /*uses automatic computation of the ecartWeights to set them*/
     1136    kEcartWeights(F->m,IDELEMS(F)-1,ecartWeights,currRing);
     1137
     1138    pSetDegProcs(currRing,totaldegreeWecart, maxdegreeWecart);
     1139    if (TEST_OPT_PROT)
     1140    {
     1141      for(i=1; i<=(currRing->N); i++)
     1142        Print(" %d",ecartWeights[i]);
     1143      PrintLn();
     1144      mflush();
     1145    }
     1146  }
    11631147  kOptimizeLDeg(currRing->pLDeg, strat);
    11641148}
    … …  
    14041388//  if (TEST_OPT_WEIGHTM)
    14051389//  {
    1406 //    pRestoreDegProcs(currRing,pFDegOld, pLDegOld);
     1390//    pRestoreDegProcs(currRing,strat->pOrigFDeg, strat->pOrigLDeg);
    14071391//    if (ecartWeights)
    14081392//    {
    … …  
    15321516//  if ((TEST_OPT_WEIGHTM)&&(F!=NULL))
    15331517//  {
    1534 //    pRestoreDegProcs(currRing,pFDegOld, pLDegOld);
     1518//    pRestoreDegProcs(currRing,strat->pOrigFDeg, strat->pOrigLDeg);
    15351519//    if (ecartWeights)
    15361520//    {
    … …  
    16701654//  if ((TEST_OPT_WEIGHTM)&&(F!=NULL))
    16711655//  {
    1672 //    pFDeg=pFDegOld;
    1673 //    pLDeg=pLDegOld;
     1656//    pFDeg=strat->pOrigFDeg;
     1657//    pLDeg=strat->pOrigLDeg;
    16741658//    if (ecartWeights)
    16751659//    {
    … …  
    16841668}
    16851669
    1686 pFDegProc pFDegOld;
    1687 pLDegProc pLDegOld;
    16881670intvec * kModW, * kHomW;
    16891671
    … …  
    17401722    currRing->pLexOrder=FALSE;
    17411723    strat->kHomW=kHomW=vw;
    1742     pFDegOld = currRing->pFDeg;
    1743     pLDegOld = currRing->pLDeg;
     1724    strat->pOrigFDeg = currRing->pFDeg;
     1725    strat->pOrigLDeg = currRing->pLDeg;
    17441726    pSetDegProcs(currRing,kHomModDeg);
    17451727    toReset = TRUE;
    … …  
    17651747      if (vw == NULL)
    17661748      {
    1767         pFDegOld = currRing->pFDeg;
    1768         pLDegOld = currRing->pLDeg;
     1749        strat->pOrigFDeg = currRing->pFDeg;
     1750        strat->pOrigLDeg = currRing->pLDeg;
    17691751        pSetDegProcs(currRing,kModDeg);
    17701752        toReset = TRUE;
    … …  
    18271809  {
    18281810    kModW = NULL;
    1829     pRestoreDegProcs(currRing,pFDegOld, pLDegOld);
     1811    pRestoreDegProcs(currRing,strat->pOrigFDeg, strat->pOrigLDeg);
    18301812  }
    18311813  currRing->pLexOrder = b;
    … …  
    18621844    currRing->pLexOrder=FALSE;
    18631845    strat->kHomW=kHomW=vw;
    1864     pFDegOld = currRing->pFDeg;
    1865     pLDegOld = currRing->pLDeg;
     1846    strat->pOrigFDeg = currRing->pFDeg;
     1847    strat->pOrigLDeg = currRing->pLDeg;
    18661848    pSetDegProcs(currRing,kHomModDeg);
    18671849    toReset = TRUE;
    … …  
    18871869      if (vw == NULL)
    18881870      {
    1889         pFDegOld = currRing->pFDeg;
    1890         pLDegOld = currRing->pLDeg;
     1871        strat->pOrigFDeg = currRing->pFDeg;
     1872        strat->pOrigLDeg = currRing->pLDeg;
    18911873        pSetDegProcs(currRing,kModDeg);
    18921874        toReset = TRUE;
    … …  
    19201902  {
    19211903    kModW = NULL;
    1922     pRestoreDegProcs(currRing,pFDegOld, pLDegOld);
     1904    pRestoreDegProcs(currRing,strat->pOrigFDeg, strat->pOrigLDeg);
    19231905  }
    19241906  currRing->pLexOrder = b;
    … …  
    19881970      strat->kModW = *w;
    19891971      assume(currRing->pFDeg != NULL && currRing->pLDeg != NULL);
    1990       pFDegOld = currRing->pFDeg;
    1991       pLDegOld = currRing->pLDeg;
     1972      strat->pOrigFDeg = currRing->pFDeg;
     1973      strat->pOrigLDeg = currRing->pLDeg;
    19921974      pSetDegProcs(currRing,kModDeg);
    19931975
    … …  
    20312013  if (toReset)
    20322014  {
    2033     pRestoreDegProcs(currRing,pFDegOld, pLDegOld);
     2015    pRestoreDegProcs(currRing,strat->pOrigFDeg, strat->pOrigLDeg);
    20342016    kModW = NULL;
    20352017  }
    … …  
    22972279    {
    22982280      strat->kModW = kModW = w;
    2299       pFDegOld = currRing->pFDeg;
    2300       pLDegOld = currRing->pLDeg;
     2281      strat->pOrigFDeg = currRing->pFDeg;
     2282      strat->pOrigLDeg = currRing->pLDeg;
    23012283      pSetDegProcs(currRing,kModDeg);
    23022284      toReset = TRUE;
    … …  
    23592341    else
    23602342    {
    2361       int deg_before=olddeg;
    23622343      if (TEST_OPT_PROT)
    23632344        message(strat->P.pFDeg(),
    … …  
    25042485//  if (TEST_OPT_WEIGHTM)
    25052486//  {
    2506 //    pRestoreDegProcs(currRing,pFDegOld, pLDegOld);
     2487//    pRestoreDegProcs(currRing,strat->pOrigFDeg, strat->pOrigLDeg);
    25072488//    if (ecartWeights)
    25082489//    {

  • kernel/kstd1.h

    r0033111 reafa0ed  
    5555
    5656
    57 extern pFDegProc pFDegOld;
    58 extern pLDegProc pLDegOld;
    5957extern intvec * kModW;
    6058extern intvec * kHomW;

  • kernel/kstdfac.cc

    r0033111 reafa0ed  
    878878  /* complete reduction of the standard basis--------- */
    879879  /* release temp data-------------------------------- */
    880   exitBuchMora(strat);
    881880  if (TEST_OPT_WEIGHTM)
    882881  {
    883     pRestoreDegProcs(currRing,pFDegOld, pLDegOld);
     882    pRestoreDegProcs(currRing,strat->pOrigFDeg, strat->pOrigLDeg);
    884883    if (ecartWeights)
    885884    {
    … …  
    888887    }
    889888  }
     889  exitBuchMora(strat);
    890890  if (TEST_OPT_PROT) { PrintLn(); messageStat(srmax,lrmax,0,strat); }
    891891  if (Q!=NULL) updateResult(strat->Shdl,Q,strat);
    … …  
    926926      kModW = *w;
    927927      strat->kModW = *w;
    928       pFDegOld = currRing->pFDeg;
    929       pLDegOld = currRing->pLDeg;
     928      strat->pOrigFDeg = currRing->pFDeg;
     929      strat->pOrigLDeg = currRing->pLDeg;
    930930      pSetDegProcs(currRing,kModDeg);
    931931      toReset = TRUE;
    … …  
    10291029  if (toReset)
    10301030  {
    1031     pRestoreDegProcs(currRing,pFDegOld, pLDegOld);
     1031    pRestoreDegProcs(currRing,strat->pOrigFDeg, strat->pOrigLDeg);
    10321032    kModW = NULL;
    10331033  }
Note: See TracChangeset for help on using the changeset viewer.