Changeset 5c51ab in git

Timestamp:

Nov 20, 2018, 10:08:44 PM (5 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

6b0b41353343d43decc1e6b69445b44cca8cd850

Parents:

462eb908e8ae9d64d947350f904778404a6b4528

Message:

Remove updateSShift

Location:

kernel/GBEngine

Files:

• kstd2.cc (modified) (1 diff)
• kutil.cc (modified) (4 diffs)
• kutil.h (modified) (1 diff)

kernel/GBEngine/kstd2.cc

@@ -4130 +4130 @@
   initBbaShift(strat); /* DONE */
   /*set enterS, spSpolyShort, reduce, red, initEcart, initEcartPair*/
-  /*Shdl=*/initBuchMora(F, Q,strat); /* updateS with no toT, i.e. no init for T */
-  updateSShift(strat); /* initializes T */
+  /*Shdl=*/initBuchMora(F, Q,strat);
   if (strat->minim>0) strat->M=idInit(IDELEMS(F),F->rank);
   reduc = olddeg = 0;

kernel/GBEngine/kutil.cc

@@ -9151 +9151 @@
         enterT(h,strat);
         strat->S_2_R[i] = strat->tl;
+#ifdef HAVE_SHIFTBBA
+        if (currRing->isLPring)
+          enterTShift(h, strat);
+#endif
       }
     }
@@ -9247 +9251 @@
       enterT(h,strat);
       strat->S_2_R[i] = strat->tl;
+#ifdef HAVE_SHIFTBBA
+      if (currRing->isLPring)
+        enterTShift(h, strat);
+#endif
     }
     if (suc!= -1) updateS(toT,strat);
@@ -10252 +10260 @@
   )
   {
-#ifdef HAVE_SHIFTBBA
-    if (currRing->isLPring)
-      updateS(FALSE,strat); // T is filled by updateSShift() later
-    else
-#endif
     updateS(TRUE,strat);
   }
@@ -12172 +12175 @@
 
 #ifdef HAVE_SHIFTBBA
-/* including the self pairs */
-void updateSShift(kStrategy strat)
-{
-  /* to use after updateS(toT=FALSE,strat) */
-  /* fills T with shifted elt's of S */
-  int i;
-  LObject h;
-  int atT = -1; // or figure out smth better
-  strat->tl = -1; // init
-  for (i=0; i<=strat->sl; i++)
-  {
-    memset(&h,0,sizeof(h));
-    h.p =  strat->S[i];
-    strat->initEcart(&h);
-    h.sev = strat->sevS[i];
-    h.t_p = NULL;
-    h.GetTP(); // creates correct t_p
-    /*puts the elements of S with their shifts to T*/
-    //    int atT, int uptodeg, int lV)
-    strat->S_2_R[i] = strat->tl + 1; // the el't with shift 0 will be inserted first
-    // need a small check for above; we insert >=1 elements
-    // insert this check into kTest_TS ?
-    enterTShift(h,strat,atT);
-  }
-  /* what about setting strat->tl? */
-}
-#endif
-
-#ifdef HAVE_SHIFTBBA
 /*1
 * put the pairs (sh \dot s[i],p)  into the set B, ecart=ecart(p)

kernel/GBEngine/kutil.h

@@ -857 +857 @@
 void enterpairsShift (poly h,int k,int ecart,int pos,kStrategy strat, int atR);
 
-void updateSShift(kStrategy strat);
-
 void initBbaShift(kStrategy strat);