Changeset 15a55a5 in git

Timestamp:

Sep 14, 2018, 4:50:10 PM (6 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

b8c7320badf49a7c36b996413b1bf90743b4a312

Parents:

5292886b6f6adce1c6a27dacf4fe27712caac11f

Message:

New pairs

Location:

kernel/GBEngine

Files:

• kspoly.cc (modified) (6 diffs)
• kutil.cc (modified) (6 diffs)
• shiftgb.cc (modified) (4 diffs)
• shiftgb.h (modified) (1 diff)

kernel/GBEngine/kspoly.cc

@@ -940 +940 @@
     // note: because of the crits, p2 is never shifted
     int split = p_mFirstVblock(p1, tailRing);
-    // TODO: shouldn't we use p1 AND p2 here??
     k_SplitFrame(m1, m12, split, tailRing);
     k_SplitFrame(m2, m22, split, tailRing);
@@ -946 +945 @@
     n_Delete(&(m1->coef), tailRing->cf);
     n_Delete(&(m2->coef), tailRing->cf);
-
-    a1 = p_LPshift(p_Copy(a1, tailRing), 1 - split, tailRing); // unshift a1
   }
 
@@ -1008 +1005 @@
     p_LmDelete(m22, tailRing);
     // m2 is already deleted
-    p_Delete(&a1, tailRing); // a1 is a copy: safe to destroy
   }
 
@@ -1127 +1123 @@
 {
   poly a1 = pNext(p1), a2 = pNext(p2);
+#ifdef HAVE_SHIFTBBA
+  int shift1, shift2;
+  if (tailRing->isLPring) {
+    // assume: LM is shifted, tail unshifted
+    assume(p_FirstVblock(a1, tailRing) <= 1);
+    assume(p_FirstVblock(a2, tailRing) <= 1);
+    // save the shift of the LM so we can shift the other monomials on demand
+    shift1 = p_mFirstVblock(p1, tailRing) - 1;
+    shift2 = p_mFirstVblock(p2, tailRing) - 1;
+  }
+#endif
   long c1=p_GetComp(p1, currRing),c2=p_GetComp(p2, currRing);
   long c;
@@ -1157 +1164 @@
 #endif
 
+#ifdef HAVE_SHIFTBBA
+  // shift the next monomial on demand
+  if (tailRing->isLPring)
+  {
+    a1 = p_LPCopyAndShiftLM(a1, shift1, tailRing);
+    a2 = p_LPCopyAndShiftLM(a2, shift2, tailRing);
+  }
+#endif
   if (a1==NULL)
   {
@@ -1379 +1394 @@
     }
 #endif
+#ifdef HAVE_SHIFTBBA
+    if (tailRing->isLPring)
+    {
+      a1 = p_LPCopyAndShiftLM(a1, shift1, tailRing);
+      a2 = p_LPCopyAndShiftLM(a2, shift2, tailRing);
+    }
+#endif
     if (a2==NULL)
     {

kernel/GBEngine/kutil.cc

@@ -12049 +12049 @@
 static void enterOnePairManyShifts (int i, poly p, int ecart, int isFromQ, kStrategy strat, int atR)
 {
-  /* p comes from strat->P.p, that is LObject with LM in currRing and Tail in tailRing */
-
-  assume(p_LmCheckIsFromRing(p,currRing));
-  assume(p_CheckIsFromRing(pNext(p),strat->tailRing));
+  poly s = strat->S[i];
+  assume(i<=strat->sl); // from OnePair
 
   /* cycles through all shifts of s[i] until uptodeg - lastVblock(s[i]) */
   /* that is create the pairs (f, s \dot g)  */
-
-  poly qq = strat->S[i]; //  lm in currRing, tail in tailRing
 
   //  poly q = pCopy(pHead(strat->S[i])); // lm in currRing
@@ -12066 +12062 @@
   /* hence, a total number of elt's to add is: */
   /*  int toInsert = 1 + (uptodeg-1) - (pLastVblock(p.p, lV) -1);  */
-  int toInsert =  itoInsert(qq, strat->tailRing);
-
-#ifdef KDEBUG
-    if (TEST_OPT_DEBUG)
-    {
-      //      Print("entered ManyShifts: with toInsert=%d",toInsert); PrintLn();
-    }
-#endif
-
-  assume(i<=strat->sl); // from OnePair
+  int toInsert =  itoInsert(s, currRing);
+
 
   /* these vars hold for all shifts of s[i] */
@@ -12090 +12078 @@
   }
 
-  int j;
-
-  poly q/*, s*/;
-
   // for the 0th shift: insert the orig. pair
-  enterOnePairShift(qq, p, ecart, isFromQ, strat, -1, ecartq, qfromQ, 0, i);
-
-  for (j=1; j<= toInsert; j++)
-  {
-    //    q = pLPshift(strat->S[i],j,uptodeg,lV);
-    q = p_LPshiftT(qq, j, strat, currRing);
-    //    q = p_mLPshift(qq,j,uptodeg,lV,currRing); // lm in currRing, shift this monomial
-    //    s = p_LPshift(pNext(qq), j, uptodeg, lV, strat->tailRing); // from tailRing
-    //    pNext(q) = s; // in tailRing
-    /* here we need to call enterOnePair with two polys ... */
-
-#ifdef KDEBUG
-    //if (TEST_OPT_DEBUG)
-    //{
-    //      PrintS("ManyShifts: calling enterOnePairShift(q,p)");      PrintLn();
-    //}
-#endif
-    //kFindInTShift(q,atR,strat);
+  enterOnePairShift(s, p, ecart, isFromQ, strat, -1, ecartq, qfromQ, 0, i);
+
+  for (int j = 1; j <= toInsert; j++)
+  {
+    poly q = pLPCopyAndShiftLM(s, j);
     enterOnePairShift(q, p, ecart, isFromQ, strat, -1, ecartq, qfromQ, j, i);
   }
@@ -12125 +12096 @@
 void enterOnePairSelfShifts (poly qq, poly p, int ecart, int isFromQ, kStrategy strat, int /*atR*/)
 {
-
-  /* format: p,qq are in LObject form: lm in CR, tail in TR */
-  /* for true self pairs qq ==p  */
-  /* we test both qq and p */
-  assume(p_LmCheckIsFromRing(qq,currRing));
-  assume(p_CheckIsFromRing(pNext(qq),strat->tailRing));
-  assume(p_LmCheckIsFromRing(p,currRing));
-  assume(p_CheckIsFromRing(pNext(p),strat->tailRing));
-
-  /* since this proc is applied twice for (h, s*g) and (g,s*h), init j with 1 only */
-
-  //  int j = 0;
-  int j = 1;
-
-  /* for such self pairs start with 1, not with 0 */
-  if (qq == p) j=1;
-
   /* should cycle through all shifts of q until uptodeg - lastVblock(q) */
   /* that is create the pairs (f, s \dot g)  */
 
-  int toInsert =  itoInsert(qq, strat->tailRing);
-
-#ifdef KDEBUG
-  //if (TEST_OPT_DEBUG)
-  //{
-  //      Print("entered SelfShifts: with toInsert=%d",toInsert); PrintLn();
-  //}
-#endif
-
-  poly q;
+  int toInsert =  itoInsert(qq, currRing);
 
   /* these vars hold for all shifts of s[i] */
@@ -12160 +12105 @@
   int qfromQ = 0; // strat->fromQ[i];
 
-  for (; j<= toInsert; j++)
-  {
-    //    q = pLPshift(strat->S[i],j,uptodeg,lV);
-    /* we increase shifts by one; must delete q there*/
-    //    q = qq; q = pMoveCurrTail2poly(q,strat);
-    //    q = pLPshift(q,j,uptodeg,lV); //,currRing);
-    q = p_LPshiftT(qq, j, strat, currRing);
-    //    q = p_mLPshift(qq,j,uptodeg,lV,currRing); // lm in currRing, shift this monomial
-    //    s = p_LPshift(pNext(qq), j, uptodeg, lV, strat->tailRing); // from tailRing
-    //    pNext(q) = s; // in tailRing
-    /* here we need to call enterOnePair with two polys ... */
-#ifdef KDEBUG
-    //if (TEST_OPT_DEBUG)
-    //{
-    //      PrintS("SelfShifts: calling enterOnePairShift(q,p)");      PrintLn();
-    //}
-#endif
+  /* since this proc is applied twice for (h, s*g) and (g,s*h), init j with 1 */
+  for (int j = 1; j<= toInsert; j++)
+  {
+    poly q = pLPCopyAndShiftLM(qq, j);
     enterOnePairShift(q, p, ecart, isFromQ, strat, -1, ecartq, qfromQ, j, -1);
   }
@@ -12596 +12528 @@
   for (int i = 1; i <= toInsert; i++)
   {
-    poly shifted = p_mLPshift(p_Head(p.p, currRing), i, currRing);
-    pNext(shifted) = pNext(p.p);
     LObject qq;
-    qq.p = shifted; // don't use Set() because it'll test the poly order
+    qq.p = pLPCopyAndShiftLM(p.p, i); // don't use Set() because it'll test the poly order
     qq.shift = i;
     strat->initEcart(&qq); // initEcartBBA sets length, pLength, FDeg and ecart

kernel/GBEngine/shiftgb.cc

@@ -35 +35 @@
 #define freeT(A,v) omFreeSize((ADDRESS)A,(v+1)*sizeof(int))
 
-poly p_LPshiftT(poly p, int sh, kStrategy strat, const ring r)
-{
-  /* assume shift takes place, shifts the poly p by sh */
-  /* p is like TObject: lm in currRing = r, tail in tailRing  */
-  /* copies p */
-
-  if (p==NULL) return(p);
-
-  assume(p_LmCheckIsFromRing(p,r));
-  assume(p_CheckIsFromRing(pNext(p),strat->tailRing));
-
-  /* assume sh and uptodeg agree  TODO check */
-
-  if (sh == 0) return(p); /* the zero shift */
-
-  poly q   = NULL;
-  poly s   = p_mLPshift(p_Head(p,r), sh, r); // lm in currRing
-  /* pNext(s) will be fixed below */
-  poly pp = pNext(p);
-
-  while (pp != NULL)
-  {
-    poly h=p_mLPshift(p_Head(pp,strat->tailRing),sh,strat->tailRing);
-    pIter(pp);
-
-    q = p_Add_q(q, h,strat->tailRing);
-  }
-  pNext(s) = q;
-  /* int version: returns TRUE if it was successful */
-  return(s);
-}
-
 poly p_LPshift(poly p, int sh, const ring r)
 {
-  /* assume shift takes place */
-  /* shifts the poly p from the ring r by sh */
-
-  /* assume sh and uptodeg agree TODO check */
-
-  if (sh == 0) return(p); /* the zero shift */
+  if (sh == 0 || p == NULL) return(p);
 
   poly q  = NULL;
@@ -91 +54 @@
 poly p_mLPshift(poly p, int sh, const ring r)
 {
-  /* p is a monomial from the ring r */
-
-  int lV = r->isLPring;
-
   if (sh == 0 || p == NULL || p_LmIsConstantComp(p,r)) return(p);
+
+  int lV = r->isLPring;
 
   int L = p_mLastVblock(p,r);
@@ -126 +87 @@
   //  p_SetCoeff0(m,p_GetCoeff(p,r),r);
   return(p);
+}
+
+poly p_LPCopyAndShiftLM(poly p, int sh, const ring r)
+{
+  if (sh == 0 || p == NULL) return p;
+  poly q = p_mLPshift(p_Head(p, r), sh, r);
+  pNext(q) = pNext(p);
+  return q;
 }
 
@@ -328 +297 @@
   m1 = p_GetExp_k_n(m1, hole, r->N, r);
 
-  p_LPshift(m2, 1 - p_mFirstVblock(m2, r), r);
+  p_mLPshift(m2, 1 - p_mFirstVblock(m2, r), r);
   p_SetCoeff(m1, m1Coeff, r);
 }

kernel/GBEngine/shiftgb.h

@@ -12 +12 @@
 #include "polys/nc/nc.h"
 
-poly p_LPshiftT(poly p, int sh, kStrategy strat, const ring r);
-
 poly p_LPshift(poly p, int sh, const ring r);
 poly p_mLPshift(poly p, int sh, const ring r);
+poly p_LPCopyAndShiftLM(poly p, int sh, const ring r);
 
+#define pLPshift(p, sh) p_LPshift(p, sh, currRing)
+#define pmLPshift(p, sh) p_mLPshift(p, sh, currRing)
+#define pLPCopyAndShiftLM(p, sh) p_LPCopyAndShiftLM(p, sh, currRing)
+
+int p_LastVblock(poly p, const ring r);
 int p_mLastVblock(poly p, const ring r);
-int p_LastVblock(poly p, const ring r);
 
 #define pLastVblock(p) p_LastVblock(p,currRing)