Changeset ea5feb2 in git

Timestamp:

Oct 19, 2018, 8:41:16 AM (6 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

818f44cc2595a5708ca93b629ecbff680947d9ff

Parents:

ab6ae3e4daabcf18b48dab4c572a7e169b83bbd1

Message:

fixes check which and if an element from S needs to be replaced

File:

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

kernel/GBEngine/kutil.cc

@@ -9462 +9462 @@
   assume(p.pLength == 0 || pLength(p.p) == p.pLength || rIsSyzIndexRing(currRing)); // modulo syzring
 
-  int i, pos;
-
-  pos = posInS(strat, strat->sl, p.p, p.ecart);
-
-  pp_Test(p.p, currRing, p.tailRing);
-  assume(p.FDeg == p.pFDeg());
-
+  int i, j, pos;
   poly tp = strat->T[tj].p;
-  /* remove useless pairs from L set */
-  for (i = 0; i <= strat->Ll; ++i) {
-    if (strat->L[i].p1 != NULL && pLtCmp(tp, strat->L[i].p1) == 0) {
-      deleteInL(strat->L, &(strat->Ll), i, strat);
-      i--;
-      continue;
-    }
-    if (strat->L[i].p2 != NULL && pLtCmp(tp, strat->L[i].p2) == 0) {
-      deleteInL(strat->L, &(strat->Ll), i, strat);
-      i--;
-    }
-  }
+
   /* enter p to T set */
   enterT(p, strat);
-  /* generate new pairs with p, probably removing older, now useless pairs */
-  superenterpairs(p.p, strat->sl, p.ecart, pos, strat, strat->tl);
-  /* enter p to S set */
-  strat->enterS(p, pos, strat, strat->tl);
+
+  for (j = 0; j <= strat->sl; ++j) {
+    if (pLtCmp(tp, strat->S[j]) == 0) {
+      break;
+    }
+  }
+  /* it may be that the exchanged element is only in T and not in S,
+         * then we only need to add the element to T (done above), but
+         * nothing else needs to be done */
+  if (j <= strat->sl) {
+    deleteInS(j, strat);
+
+    pos = posInS(strat, strat->sl, p.p, p.ecart);
+
+    pp_Test(p.p, currRing, p.tailRing);
+    assume(p.FDeg == p.pFDeg());
+
+    /* remove useless pairs from L set */
+    for (i = 0; i <= strat->Ll; ++i) {
+      if (strat->L[i].p1 != NULL && pLtCmp(tp, strat->L[i].p1) == 0) {
+        deleteInL(strat->L, &(strat->Ll), i, strat);
+        i--;
+        continue;
+      }
+      if (strat->L[i].p2 != NULL && pLtCmp(tp, strat->L[i].p2) == 0) {
+        deleteInL(strat->L, &(strat->Ll), i, strat);
+        i--;
+      }
+    }
+    /* generate new pairs with p, probably removing older, now useless pairs */
+    superenterpairs(p.p, strat->sl, p.ecart, pos, strat, strat->tl);
+    /* enter p to S set */
+    strat->enterS(p, pos, strat, strat->tl);
+  }
 }