Changeset 327d41 in git

Timestamp:

Jul 25, 2011, 5:28:06 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

630dad1a4f9f6b630b4dcfa05851a5869b7fe25b

Parents:

aef70f76c5e0aef2ebdc9ad5da55a5e309d3bef4

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-07-25 17:28:06+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:53:33+01:00

Message:

removed strat->kIdeal

Location:

kernel

Files:

• gr_kstd2.cc (modified) (1 diff)
• kstd1.cc (modified) (3 diffs)
• kstd2.cc (modified) (1 diff)
• kstdfac.cc (modified) (3 diffs)
• kutil.cc (modified) (3 diffs)
• kutil.h (modified) (1 diff)
• mod2.h (modified) (1 diff)

kernel/gr_kstd2.cc

@@ -1014 +1014 @@
   else
     strat->initEcartPair = initEcartPairBba;
-  strat->kIdeal = NULL;
-  //if (strat->ak==0) strat->kIdeal->rtyp=IDEAL_CMD;
-  //else              strat->kIdeal->rtyp=MODUL_CMD;
-  //strat->kIdeal->data=(void *)strat->Shdl;
-  if ((TEST_OPT_WEIGHTM)&&(F!=NULL))
-  {
-     //interred  machen   Aenderung
-     pFDegOld=pFDeg;
-     pLDegOld=pLDeg;
-  //   h=ggetid("ecart");
-  //   if ((h!=NULL) && (IDTYP(h)==INTVEC_CMD))
-  //   {
-  //     ecartWeights=iv2array(IDINTVEC(h));
-  //   }
-  //   else
-    {
-      ecartWeights=(short *)omAlloc(((currRing->N)+1)*sizeof(short));
-      /*uses automatic computation of the ecartWeights to set them*/
-      kEcartWeights(F->m,IDELEMS(F)-1,ecartWeights);
-    }
-    pFDeg=totaldegreeWecart;
-    pLDeg=maxdegreeWecart;
-    for(i=1; i<=(currRing->N); i++)
-      Print(" %d",ecartWeights[i]);
-    PrintLn();
-    mflush();
-  }
+//  if ((TEST_OPT_WEIGHTM)&&(F!=NULL))
+//  {
+//     //interred  machen   Aenderung
+//     pFDegOld=pFDeg;
+//     pLDegOld=pLDeg;
+//  //   h=ggetid("ecart");
+//  //   if ((h!=NULL) && (IDTYP(h)==INTVEC_CMD))
+//  //   {
+//  //     ecartWeights=iv2array(IDINTVEC(h));
+//  //   }
+//  //   else
+//    {
+//      ecartWeights=(short *)omAlloc(((currRing->N)+1)*sizeof(short));
+//      /*uses automatic computation of the ecartWeights to set them*/
+//      kEcartWeights(F->m,IDELEMS(F)-1,ecartWeights);
+//    }
+//    pFDeg=totaldegreeWecart;
+//    pLDeg=maxdegreeWecart;
+//    for(i=1; i<=(currRing->N); i++)
+//      Print(" %d",ecartWeights[i]);
+//    PrintLn();
+//    mflush();
+//  }
 }
 

kernel/kstd1.cc

@@ -516 +516 @@
     if (p_LmShortDivisibleBy(strat->T[j].GetLmTailRing(), strat->sevT[j], H.GetLmTailRing(), not_sev, strat->tailRing))
     {
-      //if (strat->interpt) test_int_std(strat->kIdeal);
       /*- remember the found T-poly -*/
       poly pi = strat->T[j].p;
@@ -1077 +1076 @@
   else
     strat->initEcartPair = initEcartPairBba;
-  strat->kIdeal = NULL;
-  //if (strat->ak==0) strat->kIdeal->rtyp=IDEAL_CMD;
-  //else              strat->kIdeal->rtyp=MODUL_CMD;
-  //strat->kIdeal->data=(void *)strat->Shdl;
 //  if ((TEST_OPT_WEIGHTM)&&(F!=NULL))
 //  {
@@ -1246 +1241 @@
 #endif
     if (lrmax< strat->Ll) lrmax=strat->Ll; /*stat*/
-    //test_int_std(strat->kIdeal);
     #ifdef KDEBUG
     if (TEST_OPT_DEBUG) messageSets(strat);

kernel/kstd2.cc

@@ -1983 +1983 @@
   else
     strat->initEcartPair = initEcartPairBba;
-  strat->kIdeal = NULL;
-  //if (strat->ak==0) strat->kIdeal->rtyp=IDEAL_CMD;
-  //else              strat->kIdeal->rtyp=MODUL_CMD;
-  //strat->kIdeal->data=(void *)strat->Shdl;
 //  if ((TEST_OPT_WEIGHTM)&&(F!=NULL))
 //  {

kernel/kstdfac.cc

@@ -205 +205 @@
     memcpy(s->NotUsedAxis,o->NotUsedAxis,currRing->N*sizeof(BOOLEAN));
   }
-  s->kIdeal=NULL;
   //s->P=s->L[s->Ll+1];
   s->P.Init(o->tailRing);
@@ -327 +326 @@
   for (si=strat->sl; si>0; si--)
   {
-    //if (strat->interpt) test_int_std(strat->kIdeal);
     strat->S[si] = redtailBba(strat->S[si],si-1,strat);
     if (TEST_OPT_INTSTRATEGY)
@@ -564 +562 @@
     if (strat->Ll > lrmax) lrmax =strat->Ll;/*stat.*/
     if (TEST_OPT_DEBUG) messageSets(strat);
-    //test_int_std(strat->kIdeal);
     if (strat->Ll== 0) strat->interpt=TRUE;
     if (TEST_OPT_DEGBOUND

kernel/kutil.cc

@@ -5966 +5966 @@
     // /*Shdl=*/initS(F, Q,strat); /*sets also S, ecartS, fromQ */
   }
-  strat->kIdeal = NULL;
   strat->fromT = FALSE;
   strat->noTailReduction = !TEST_OPT_REDTAIL;
@@ -5993 +5992 @@
   pLmDelete(&strat->tail);
   strat->syzComp=0;
-  if (strat->kIdeal!=NULL)
-  {
-    omFreeBin(strat->kIdeal, sleftv_bin);
-    strat->kIdeal=NULL;
-  }
 }
 
@@ -6972 +6966 @@
     // /*Shdl=*/initS(F, Q,strat); /*sets also S, ecartS, fromQ */
   }
-  strat->kIdeal = NULL;
   strat->fromT = FALSE;
   strat->noTailReduction = !TEST_OPT_REDTAIL;

kernel/kutil.h

@@ -289 +289 @@
   BOOLEAN * pairtest;/*used for enterOnePair*/
   poly tail;
-  leftv kIdeal;
   intvec * kModW;
   intvec * kHomW;

kernel/mod2.h

@@ -73 +73 @@
 /* SIZEOF_LONG == SIZEOF_VOIDP is guaranteed by configure */
 #define ALIGN_8
-#define LOG_SIZEOF_LONG  3
-#define LOG_SIZEOF_VOIDP 3
-#else
-#define LOG_SIZEOF_LONG  2
-#define LOG_SIZEOF_VOIDP 2
 #endif