Changeset dc0f002 in git

Timestamp:

Jun 1, 2018, 8:40:44 PM (6 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

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

Children:

6762a65369cd0f5360fcace6708a983889b21d71

Parents:

f5850b632ea8ec8eaa23aca3fefbf32685cac3be

Message:

Clean ups

Files:

• kernel/GBEngine/kInline.h (modified) (2 diffs)
• kernel/GBEngine/kspoly.cc (modified) (13 diffs)
• kernel/GBEngine/kutil.h (modified) (1 diff)
• kernel/GBEngine/shiftgb.cc (modified) (2 diffs)
• kernel/GBEngine/shiftgb.h (modified) (1 diff)
• libpolys/polys/kbuckets.cc (modified) (3 diffs)
• libpolys/polys/kbuckets.h (modified) (1 diff)
• libpolys/polys/shiftop.cc (modified) (9 diffs)

kernel/GBEngine/kInline.h

@@ -26 +26 @@
 #include "kernel/polys.h"
 
+#include "kernel/GBEngine/shiftgb.h"
 
 #define HAVE_TAIL_BIN
@@ -591 +592 @@
 //    tailRing->p_Procs->p_Minus_mm_Mult_qq(pNext(_p), m, q, shorter,spNoether, tailRing, last);
 //    pLength += lq - shorter;
-  }
-}
-
-KINLINE void sLObject::Tail_Minus_mm1_Mult_qq_Mult_mm2(poly m1, poly q, poly m2, int lq, poly spNoether)
-{
-  if (bucket != NULL)
-  {
-    kBucket_Minus_m1_Mult_p_Mult_m2(bucket, m1, q, m2, &lq, NULL); // check if we need noether
-  }
-  else
-  {
-    if (lq<=0) lq= ::pLength(q);
-    poly _p = (t_p != NULL ? t_p : p);
-    assume(_p != NULL);
-
-    int lp=pLength-1;
-    pNext(_p) = p_Minus_mm_Mult_qq( pNext(_p), m1, p_Mult_mm(q, m2, tailRing), lp, lq,
-        spNoether, tailRing );
-    pLength=lp+1;
-    return;
   }
 }

kernel/GBEngine/kspoly.cc

@@ -20 +20 @@
 #include "kernel/polys.h"
 #endif
+#include "kernel/GBEngine/shiftgb.h"
 
 #ifdef KDEBUG
@@ -123 +124 @@
   }
 
-  int holeStart = tailRing->isLPring * p_mFirstVblock(p2, tailRing->isLPring, tailRing);
-  // n1 and n2 is already set to 1
-  poly n1 = p_GetExp_k_n(lm, holeStart, tailRing->N, tailRing);
-  poly n2 = p_GetExp_k_n(lm, 1, holeStart, tailRing);
+  poly lmRight;
+  if (tailRing->isLPring) {
+    k_SplitFrame(p2, lm, lmRight, tailRing);
+  }
 
   // take care of coef buisness
@@ -135 +136 @@
     int ct = ksCheckCoeff(&an, &bn, tailRing->cf);    // Calculate special LC
     p_SetCoeff(lm, bn, tailRing);
-    p_SetCoeff(n1, bn, tailRing);
     if ((ct == 0) || (ct == 2))
       PR->Tail_Mult_nn(an);
@@ -143 +143 @@
   else
   {
-    p_SetCoeff(n1, pGetCoeff(lm), tailRing);
     if (coef != NULL) *coef = n_Init(1, tailRing->cf);
   }
+
 
   // and finally,
   if (tailRing->isLPring) {
-    PR->Tail_Minus_mm1_Mult_qq_Mult_mm2(n1, t2, n2, pLength(t2), spNoether);
+    PR->Tail_Minus_mm_Mult_qq(lm, tailRing->p_Procs->pp_Mult_mm(t2, lmRight, tailRing), pLength(t2), spNoether);
   } else {
     PR->Tail_Minus_mm_Mult_qq(lm, t2, pLength(t2) /*PW->GetpLength() - 1*/, spNoether);
@@ -265 +265 @@
   }
 
+  poly lmRight;
+  if (tailRing->isLPring) {
+    k_SplitFrame(p2, lm, lmRight, tailRing);
+  }
+
   // take care of coef buisness
   if (! n_IsOne(pGetCoeff(p2), tailRing))
@@ -284 +289 @@
 
   // and finally,
-  PR->Tail_Minus_mm_Mult_qq(lm, t2, pLength(t2) /*PW->GetpLength() - 1*/, spNoether);
+  if (tailRing->isLPring) {
+    PR->Tail_Minus_mm_Mult_qq(lm, tailRing->p_Procs->pp_Mult_mm(t2, lmRight, tailRing), pLength(t2), spNoether);
+  } else {
+    PR->Tail_Minus_mm_Mult_qq(lm, t2, pLength(t2) /*PW->GetpLength() - 1*/, spNoether);
+  }
   assume(PW->GetpLength() == pLength(PW->p != NULL ? PW->p : PW->t_p));
   PR->LmDeleteAndIter();
@@ -471 +480 @@
   }
 
+  poly lmRight;
+  if (tailRing->isLPring) {
+    k_SplitFrame(p2, lm, lmRight, tailRing);
+  }
+
   // take care of coef buisness
   if (! n_IsOne(pGetCoeff(p2), tailRing->cf))
@@ -490 +504 @@
 
   // and finally,
-  PR->Tail_Minus_mm_Mult_qq(lm, t2, PW->GetpLength() - 1, spNoether);
+  if (tailRing->isLPring) {
+    PR->Tail_Minus_mm_Mult_qq(lm, tailRing->p_Procs->pp_Mult_mm(t2, lmRight, tailRing), pLength(t2), spNoether);
+  } else {
+    PR->Tail_Minus_mm_Mult_qq(lm, t2, PW->GetpLength() - 1, spNoether);
+  }
   assume(PW->GetpLength() == pLength(PW->p != NULL ? PW->p : PW->t_p));
   PR->LmDeleteAndIter();
@@ -709 +727 @@
     }
   }
+
+  poly lmRight;
+  if (tailRing->isLPring) {
+    k_SplitFrame(p2, lm, lmRight, tailRing);
+  }
+
   // take care of coef buisness
   if(rField_is_Ring(currRing))
@@ -735 +759 @@
 
   // and finally,
-  PR->Tail_Minus_mm_Mult_qq(lm, t2, PW->GetpLength() - 1, spNoether);
+  if (tailRing->isLPring) {
+    PR->Tail_Minus_mm_Mult_qq(lm, tailRing->p_Procs->pp_Mult_mm(t2, lmRight, tailRing), pLength(t2), spNoether);
+  } else {
+    PR->Tail_Minus_mm_Mult_qq(lm, t2, PW->GetpLength() - 1, spNoether);
+  }
   assume(PW->GetpLength() == pLength(PW->p != NULL ? PW->p : PW->t_p));
   PR->LmDeleteAndIter();
@@ -812 +840 @@
     k_GetLeadTerms(p1, p2, currRing, m1, m2, tailRing);
 
+  poly m12, m22;
+  if (tailRing->isLPring)
+  {
+    k_SplitFrame(p1, m1, m12, tailRing);
+    k_SplitFrame(p1, m2, m22, tailRing);
+    // manually free the coeffs, because pSetCoeff0 is used in the next step
+    n_Delete(&(m1->coef), tailRing->cf);
+    n_Delete(&(m2->coef), tailRing->cf);
+  }
+
   pSetCoeff0(m1, lc2);
   pSetCoeff0(m2, lc1);  // and now, m1 * LT(p1) == m2 * LT(p2)
@@ -843 +881 @@
   }
   else
-    a2 = tailRing->p_Procs->pp_Mult_mm(a2, m2, tailRing);
+    if (tailRing->isLPring) {
+      // m2*a2*m22
+      a2 = tailRing->p_Procs->pp_Mult_mm(tailRing->p_Procs->pp_mm_Mult(a2, m2, tailRing), m22, tailRing);
+    } else {
+      a2 = tailRing->p_Procs->pp_Mult_mm(a2, m2, tailRing);
+    }
 #ifdef HAVE_RINGS
   if (!(rField_is_Domain(currRing))) l2 = pLength(a2);
@@ -850 +893 @@
   Pair->SetLmTail(m2, a2, l2, use_buckets, tailRing);
 
-  // get m2*a2 - m1*a1
-  Pair->Tail_Minus_mm_Mult_qq(m1, a1, l1, spNoether);
+  if (tailRing->isLPring) {
+    // get m2*a2*m22 - m1*a1*m12
+    Pair->Tail_Minus_mm_Mult_qq(m1, tailRing->p_Procs->p_Mult_mm(a1, m12, tailRing), l1, spNoether);
+  } else {
+    // get m2*a2 - m1*a1
+    Pair->Tail_Minus_mm_Mult_qq(m1, a1, l1, spNoether);
+  }
 
   // Clean-up time
   Pair->LmDeleteAndIter();
   p_LmDelete(m1, tailRing);
+  if (tailRing->isLPring) {
+    p_LmDelete(m12, tailRing);
+    p_LmDelete(m22, tailRing);
+  }
 
   if (co != 0)

kernel/GBEngine/kutil.h

@@ -212 +212 @@
                          int use_bucket, ring r);
   KINLINE void Tail_Minus_mm_Mult_qq(poly m, poly qq, int lq, poly spNoether);
-  KINLINE void Tail_Minus_mm1_Mult_qq_Mult_mm2(poly m1, poly qq, poly m2, int lq, poly spNoether);
   KINLINE void Tail_Mult_nn(number n);
   // deletes bucket, makes sure that p and t_p exists

kernel/GBEngine/shiftgb.cc

@@ -98 +98 @@
   /* p is a monomial from the ring r */
 
-  if (sh == 0 || p == NULL) return(p); /* the zero shift */
+  if (sh == 0 || p == NULL || p_LmIsConstant(p,r)) return(p);
 
   int L = p_mLastVblock(p,lV,r);
   assume(L+sh>=1);
   assume(L+sh<=uptodeg);
+  if (!(L+sh<=uptodeg)){
+    int i = 5;
+  }
 
   int *e=(int *)omAlloc0((r->N+1)*sizeof(int));
@@ -465 +468 @@
 
 #endif
+
+// splits a frame (e.g. x(1)*y(5)) m1 into m1 and m2 (e.g. m1=x(1) and m2=y(1)) according to p
+void k_SplitFrame(const poly p, poly &m1, poly &m2, const ring r) {
+  int lV = r->isLPring;
+  int uptodeg = r->N/lV;
+
+  number m1Coeff = pGetCoeff(m1);
+
+  int hole = lV * p_mFirstVblock(p, lV, r);
+  m2 = p_GetExp_k_n(m1, 1, hole, r);
+  m1 = p_GetExp_k_n(m1, hole, r->N, r);
+
+  p_LPshift(m2, 1 - p_mFirstVblock(m2, lV, r), uptodeg, lV, r);
+  p_SetCoeff(m1, m1Coeff, r);
+}

kernel/GBEngine/shiftgb.h

@@ -46 +46 @@
 int itoInsert(poly p, int uptodeg, int lV, const ring r);
 
+void k_SplitFrame(const poly p, poly &m1, poly &m2, const ring r);
 #endif
 #endif

libpolys/polys/kbuckets.cc

@@ -724 +724 @@
   {
     pSetCoeff0(m, n_InpNeg(pGetCoeff(m),r->cf));
-    p1=pp_Mult_mm(p,m,r);
+    p1=r->p_Procs->pp_mm_Mult(p,m,r);
     pSetCoeff0(m, n_InpNeg(pGetCoeff(m),r->cf));
     l1=pLength(p1);
@@ -766 +766 @@
       else
       {
-        p1 = r->p_Procs->pp_Mult_mm(p1, m, r);
+        p1 = r->p_Procs->pp_mm_Mult(p1, m, r);
       }
       pSetCoeff0(m, n_InpNeg(pGetCoeff(m),r->cf));
@@ -791 +791 @@
 #else // HAVE_PSEUDO_BUCKETS
   bucket->p = p_Minus_mm_Mult_qq(bucket->p, m,  p,
-                               bucket->l, l1,
-                               spNoether, r);
-#endif
-}
-
-//////////////////////////////////////////////////////////////////////////
-///
-/// Bpoly == Bpoly - m1*p*m2; where m1 and m2 are monoms
-/// Does not destroy p, m1 and m2
-/// assume (*l <= 0 || pLength(p) == *l)
-void kBucket_Minus_m1_Mult_p_Mult_m2(kBucket_pt bucket, poly m1, poly p, poly m2, int *l, poly spNoether)
-{
-  assume(*l <= 0 || pLength(p) == *l);
-  int i, l1;
-  poly p1 = p;
-  ring r = bucket->bucket_ring;
-
-  if (*l <= 0)
-  {
-    l1 = pLength(p1);
-    *l = l1;
-  }
-  else
-    l1 = *l;
-
-  if (m1 == NULL || m2 == NULL || p == NULL) return;
-
-#ifndef HAVE_PSEUDO_BUCKETS
-  kBucketMergeLm(bucket);
-  kbTest(bucket);
-  i = pLogLength(l1);
-
-#if defined(HAVE_PLURAL)
-  if ((rField_is_Ring(r) && !(rField_is_Domain(r)))
-  ||(rIsPluralRing(r)))
-  {
-    pSetCoeff0(m1, n_InpNeg(pGetCoeff(m1),r->cf));
-    p1=pp_Mult_mm(r->p_Procs->pp_mm_Mult(p, m1, r),m2,r);
-    pSetCoeff0(m1, n_InpNeg(pGetCoeff(m1),r->cf));
-    l1=pLength(p1);
-    i = pLogLength(l1);
-  }
-  else
-#endif
-  {
-    if ((i <= bucket->buckets_used) && (bucket->buckets[i] != NULL))
-    {
-      assume(pLength(bucket->buckets[i])==(unsigned)bucket->buckets_length[i]);
-//#ifdef USE_COEF_BUCKETS
-//     if(bucket->coef[i]!=NULL)
-//     {
-//       poly mult=p_Mult_mm(bucket->coef[i],m,r);
-//       bucket->coef[i]=NULL;
-//       p1 = p_Minus_mm_Mult_qq(bucket->buckets[i], mult, p1,
-//                               bucket->buckets_length[i], l1,
-//                             spNoether, r);
-//     }
-//     else
-//#endif
-      MULTIPLY_BUCKET(bucket,i);
-      p1 = p_Minus_mm_Mult_qq(bucket->buckets[i], m1, p_Mult_mm(p1, m2, r),
-                            bucket->buckets_length[i], l1,
-                            spNoether, r);
-      l1 = bucket->buckets_length[i];
-      bucket->buckets[i] = NULL;
-      bucket->buckets_length[i] = 0;
-      i = pLogLength(l1);
-    }
-    else
-    {
-      pSetCoeff0(m1, n_InpNeg(pGetCoeff(m1),r->cf));
-      if (spNoether != NULL)
-      {
-        l1 = -1;
-        p1 = r->p_Procs->pp_Mult_mm_Noether(r->p_Procs->pp_mm_Mult(p1, m1, r), m2, spNoether, l1, r);
-        i = pLogLength(l1);
-      }
-      else
-      {
-        p1 = r->p_Procs->pp_Mult_mm(r->p_Procs->pp_mm_Mult(p1, m1, r), m2, r);
-      }
-      pSetCoeff0(m1, n_InpNeg(pGetCoeff(m1),r->cf));
-    }
-  }
-
-  while (bucket->buckets[i] != NULL)
-  {
-    //kbTest(bucket);
-    MULTIPLY_BUCKET(bucket,i);
-    p1 = p_Add_q(p1, bucket->buckets[i],
-                 l1, bucket->buckets_length[i], r);
-    bucket->buckets[i] = NULL;
-    bucket->buckets_length[i] = 0;
-    i = pLogLength(l1);
-  }
-
-  bucket->buckets[i] = p1;
-  bucket->buckets_length[i]=l1;
-  if (i >= bucket->buckets_used)
-    bucket->buckets_used = i;
-  else
-    kBucketAdjustBucketsUsed(bucket);
-#else // HAVE_PSEUDO_BUCKETS
-  bucket->p = p_Minus_mm_Mult_qq(bucket->p, m1, p_Mult_mm(p, m2, r),
                                bucket->l, l1,
                                spNoether, r);

libpolys/polys/kbuckets.h

@@ -134 +134 @@
 //////////////////////////////////////////////////////////////////////////
 ///
-/// Bpoly == Bpoly - m1*p*m2; where m1 and m2 are monoms
-/// Does not destroy p, m1 and m2 (TODO: rename into kBucket_Minus_mm1_Mult_pp_Mult_mm2!?)
-/// assume (*l <= 0 || pLength(p) == *l)
-void kBucket_Minus_m1_Mult_p_Mult_m2(kBucket_pt bucket, poly m1, poly p, poly m2, int *l, poly spNother = NULL);
-
-//////////////////////////////////////////////////////////////////////////
-///
 /// Bpoly == Bpoly + m*p; where m is a monom
 /// Does not destroy p and m

libpolys/polys/shiftop.cc

@@ -1 +1 @@
 #include "shiftop.h"
 
-#define SHIFT_MULT_DEBUG
+/* #define SHIFT_MULT_DEBUG */
+#define SHIFT_MULT_WARNINGS
 
 #ifdef SHIFT_MULT_DEBUG
@@ -14 +15 @@
 
   int lV = ri->isLPring;
-  if (p_mFirstVblock(m,lV,ri) < p_mFirstVblock(p,lV,ri)) {
-    // TODO remove this
-    PrintS("WARNING: auto switch to shift_pp_mm_Mult");
-    return shift_pp_mm_Mult(p, m, ri);
-  }
 
   // we just shift m and then call the commutative multiplication
@@ -24 +20 @@
   int pshift = p_LastVblock(p, lV, ri);
   int mshift = p_mFirstVblock(m, lV, ri) - 1;
-#ifdef SHIFT_MULT_DEBUG
+#ifdef SHIFT_MULT_WARNINGS
+  // only needed because our examples still use x(1)*y(2) etc on the interface level
   if (mshift > 0) {
     PrintLn();
@@ -53 +50 @@
 
   int lV = ri->isLPring;
-  if (p_mFirstVblock(m,lV,ri) < p_mFirstVblock(p,lV,ri)) {
-    // TODO remove this
-    Print("WARNING: auto switch to shift_p_mm_Mult");
-    return shift_p_mm_Mult(p, m, ri);
-  }
 
   // we just shift m and then call the commutative multiplication
@@ -63 +55 @@
   int pshift = p_LastVblock(p, lV, ri);
   int mshift = p_mFirstVblock(m, lV, ri) - 1;
-#ifdef SHIFT_MULT_DEBUG
+#ifdef SHIFT_MULT_WARNINGS
+  // only needed because our examples still use x(1)*y(2) etc on the interface level
   if (mshift > 0) {
     PrintLn(); Print("WARNING: m is already shifted"); PrintLn();
@@ -90 +83 @@
 
   int lV = ri->isLPring;
-  if (p_mFirstVblock(p,lV,ri) < p_mFirstVblock(m,lV,ri)) {
-    // TODO remove this
-    PrintS("WARNING: auto switch to shift_pp_Mult_mm");
-    return shift_pp_Mult_mm(p, m, ri);
-  }
 
   // we just shift m and then call the commutative multiplication
@@ -100 +88 @@
   int mshift = p_mLastVblock(m, lV, ri);
   int pshift = p_FirstVblock(p, lV, ri) - 1;
-#ifdef SHIFT_MULT_DEBUG
+#ifdef SHIFT_MULT_WARNINGS
+  // only needed because our examples still use x(1)*y(2) etc on the interface level
   if (pshift > 0) {
     PrintLn(); PrintS("WARNING: p is already shifted"); PrintLn();
@@ -128 +117 @@
 
   int lV = ri->isLPring;
-  if (p_mFirstVblock(p,lV,ri) < p_mFirstVblock(m,lV,ri)) {
-    // TODO remove this
-    Print("WARNING: auto switch to shift_p_Mult_mm");
-    return shift_p_Mult_mm(p, m, ri);
-  }
 
   // we just shift m and then call the commutative multiplication
@@ -138 +122 @@
   int mshift = p_mLastVblock(m, lV, ri);
   int pshift = p_FirstVblock(p, lV, ri) - 1;
-#ifdef SHIFT_MULT_DEBUG
+#ifdef SHIFT_MULT_WARNINGS
+  // only needed because our examples still use x(1)*y(2) etc on the interface level
   if (pshift > 0) {
     PrintLn(); PrintS("WARNING: p is already shifted"); PrintLn();