Changeset 83f82e5 in git

Timestamp:

Oct 5, 2018, 12:08:36 PM (6 years ago)

Author:

Christian Eder

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

3b1ebbd6601fe3c4fc0b0d4b475b35d8b831fbba

Parents:

85fb25bbf3405cac363858b74d2615e61408f47b

git-author:

Christian Eder <ederc@mathematik.uni-kl.de>2018-10-05 12:08:36+02:00

git-committer:

Christian Eder <ederc@mathematik.uni-kl.de>2018-10-05 12:37:42+02:00

Message:

adds replacement function for L, S, and T

File:

• kernel/GBEngine/kutil.cc (modified) (1 diff)

kernel/GBEngine/kutil.cc

@@ -9656 +9656 @@
 * puts p to the set T at position atT
 */
+void replaceInLAndSAndT(LObject &p, kStrategy strat, int pos)
+{
+  p.GetP(strat->lmBin);
+  if (strat->homog) strat->initEcart(&p);
+      strat->redTailChange=FALSE;
+      if ((TEST_OPT_INTSTRATEGY) || (rField_is_Ring(currRing)))
+      {
+        p.pCleardenom();
+        if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
+        {
+          p.p = redtailBba(&p,strat->sl,strat, FALSE,!TEST_OPT_CONTENTSB);
+          p.pCleardenom();
+          if (strat->redTailChange) { p.t_p=NULL; }
+        }
+      }
+
+  assume(strat->tailRing == p.tailRing);
+  assume(p.pLength == 0 || pLength(p.p) == p.pLength || rIsSyzIndexRing(currRing)); // modulo syzring
+
+  int i, j, posS, irpos;
+
+  irpos = strat->T[pos].i_r;
+  posS  = posInS(strat, strat->sl, p.p, p.ecart);
+  clearSbatch(p.p, strat->sl, posS, strat);
+  pp_Test(p.p, currRing, p.tailRing);
+  assume(p.FDeg == p.pFDeg());
+  assume(!p.is_normalized || nIsOne(pGetCoeff(p.p)));
+
+  if (currRing != strat->tailRing) {
+      p.t_p = p.GetLmTailRing();
+  }
+  if ((strat->tailBin != NULL) && (pNext(p.p) != NULL))
+  {
+    pNext(p.p)=p_ShallowCopyDelete(pNext(p.p),
+                                   (strat->tailRing != NULL ?
+                                    strat->tailRing : currRing),
+                                   strat->tailBin);
+    if (p.t_p != NULL) pNext(p.t_p) = pNext(p.p);
+  }
+  /* replace all pairs where p.p appears as a generator */
+  for (i = 0; i <= strat->Ll; ++i) {
+    if (strat->L[i].p1 != NULL && strat->L[i].p2 != NULL) {
+      if (pLmEqual(strat->L[i].p1, p.p)) {
+        number d, s, t;
+        /* we need to check if we need to replace a strong poly or a usual spoly */
+        d = n_ExtGcd(pGetCoeff(strat->L[i].p1), pGetCoeff(strat->L[i].p2), &s, &t, currRing->cf);
+        if (nIsZero(s) || nIsZero(t)) {
+          j = replaceOneSPoly(p.p, strat->L[i].p2, strat, i);
+          strat->L[i].i_r1  = irpos; // might have changed
+        } else {
+          j = replaceOneStrongPoly(p.p, strat->L[i].p2, strat, i);
+          if (j == 0) {
+            i--;
+          } else {
+            strat->L[i].i_r1  = irpos; // might have changed
+          }
+        }
+        nDelete(&d);
+        nDelete(&s);
+        nDelete(&t);
+        continue;
+      }
+      if (pLmEqual(strat->L[i].p2, p.p)) {
+        number d, s, t;
+        /* we need to check if we need to replace a strong poly or a usual spoly */
+        d = n_ExtGcd(pGetCoeff(strat->L[i].p1), pGetCoeff(strat->L[i].p2), &s, &t, currRing->cf);
+
+        if (nIsZero(s) || nIsZero(t)) {
+          j = replaceOneSPoly(strat->L[i].p1, p.p, strat, i);
+          strat->L[i].i_r2  = irpos; // might have changed
+        } else {
+          j = replaceOneStrongPoly(strat->L[i].p1, p.p, strat, i);
+          if (j == 0) {
+            i--;
+          } else {
+            strat->L[i].i_r2  = irpos; // might have changed
+          }
+        }
+        nDelete(&d);
+        nDelete(&s);
+        nDelete(&t);
+      }
+    }
+  }
+
+  strat->enterS(p, posS, strat, irpos);
+  strat->T[pos].Delete();
+  strat->T[pos] = (TObject) p;
+  strat->T[pos].i_r = irpos;
+
+  if (pNext(p.p) != NULL)
+    strat->T[pos].max_exp = p_GetMaxExpP(pNext(p.p), strat->tailRing);
+  else
+    strat->T[pos].max_exp = NULL;
+
+  strat->R[irpos] = &(strat->T[pos]);
+  assume(p.sev == 0 || pGetShortExpVector(p.p) == p.sev);
+  strat->sevT[pos] = (p.sev == 0 ? pGetShortExpVector(p.p) : p.sev);
+}
+
 void enterT(LObject &p, kStrategy strat, int atT)
 {