Changeset 3db016 in git for kernel

Timestamp:

Oct 4, 2018, 2:21:59 PM (6 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

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

Children:

ebecd1b8b9d5d33b4cf7ba45c6db2ba7a6c31384f5d9018e6b9faaaf85ea0bc0a9a604290c0fa495

Parents:

032719177d9c8df44dff0988eee8f371af017fb4

Message:

Remove kernel dependency from libpolys and improve perfomance

Location:

kernel/GBEngine

Files:

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

kernel/GBEngine/kspoly.cc

@@ -21 +21 @@
 #endif
 #include "kernel/GBEngine/shiftgb.h"
+#include "polys/shiftop.h"
 
 #ifdef KDEBUG

kernel/GBEngine/shiftgb.cc

@@ -31 +31 @@
 #include "kernel/GBEngine/shiftgb.h"
 #include "polys/nc/sca.h"
-
-
-#define freeT(A,v) omFreeSize((ADDRESS)A,(v+1)*sizeof(int))
-
-poly p_LPshift(poly p, int sh, const ring r)
-{
-  if (sh == 0 || p == NULL) return(p);
-
-  poly q  = NULL;
-  poly pp = p;
-  while (pp!=NULL)
-  {
-    poly h=pp;
-    pIter(pp);
-    pNext(h)=NULL;
-    h=p_mLPshift(h,sh,r);
-    q = p_Add_q(q, h,r);
-  }
-  return(q);
-}
-
-poly p_mLPshift(poly p, int sh, const ring r)
-{
-  if (sh == 0 || p == NULL || p_LmIsConstantComp(p,r)) return(p);
-
-  int lV = r->isLPring;
-
-  int L = p_mLastVblock(p,r);
-  assume(L+sh>=1);
-  assume(L+sh<=r->N/lV);
-
-  int *e=(int *)omAlloc0((r->N+1)*sizeof(int));
-  int *s=(int *)omAlloc0((r->N+1)*sizeof(int));
-  p_GetExpV(p,e,r);
-
-  int j;
-  //  for (j=1; j<=r->N; j++)
-  // L*lV gives the last position of the last block
-  for (j=1; j<= L*lV ; j++)
-  {
-    assume(e[j]<=1);
-    if (e[j]==1)
-    {
-      assume(j + (sh*lV)<=r->N);
-      assume(j + (sh*lV)>=1);
-      s[j + (sh*lV)] = e[j]; /* actually 1 */
-    }
-  }
-  p_SetExpV(p,s,r);
-  freeT(e, r->N);
-  freeT(s, r->N);
-  /*  pSetm(m); */ /* done in the pSetExpV */
-  /* think on the component and coefficient */
-  //  number c = pGetCoeff(p);
-  //  p_SetCoeff0(m,p_GetCoeff(p,r),r);
-  return(p);
-}
+#include "polys/shiftop.h"
 
 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);
+
+  poly q = p_Head(p, r);
+  p_mLPshift(q, sh, r);
   pNext(q) = pNext(p);
   return q;
-}
-
-/* returns the number of maximal block */
-/* appearing among the monomials of p */
-/* the 0th block is the 1st one */
-int p_LastVblock(poly p, const ring r)
-{
-  poly q = p;
-  int ans = 0;
-  while (q!=NULL)
-  {
-    int ansnew = p_mLastVblock(q, r);
-    ans    = si_max(ans,ansnew);
-    pIter(q);
-  }
-  return(ans);
-}
-
-/* for a monomial p, returns the number of the last block */
-/* where a nonzero exponent is sitting */
-int p_mLastVblock(poly p, const ring r)
-{
-  if (p == NULL || p_LmIsConstantComp(p,r))
-  {
-    return(0);
-  }
-
-  int lV = r->isLPring;
-  int *e=(int *)omAlloc0((r->N+1)*sizeof(int));
-  p_GetExpV(p,e,r);
-  int j,b;
-  j = r->N;
-  while ( (!e[j]) && (j>=1) ) j--;
-  freeT(e, r->N);
-  assume(j>0);
-  b = (int)((j+lV-1)/lV); /* the number of the block, >=1 */
-  return (b);
-}
-
-/* returns the number of maximal block */
-/* appearing among the monomials of p */
-/* the 0th block is the 1st one */
-int p_FirstVblock(poly p, const ring r)
-{
-  if (p == NULL) {
-    return 0;
-  }
-
-  poly q = p;
-  int ans = p_mFirstVblock(q, r);
-  while (q!=NULL)
-  {
-    int ansnew = p_mFirstVblock(q, r);
-    if (ansnew > 0) { // don't count constants
-      ans = si_min(ans,ansnew);
-    }
-    pIter(q);
-  }
-  /* do not need to delete q */
-  return(ans);
-}
-
-/* for a monomial p, returns the number of the first block */
-/* where a nonzero exponent is sitting */
-int p_mFirstVblock(poly p, const ring r)
-{
-  if (p == NULL || p_LmIsConstantComp(p,r))
-  {
-    return(0);
-  }
-
-  int lV = r->isLPring;
-  int *e=(int *)omAlloc0((r->N+1)*sizeof(int));
-  p_GetExpV(p,e,r);
-  int j,b;
-  j = 1;
-  while ( (!e[j]) && (j<=r->N-1) ) j++;
-  freeT(e, r->N);
-  assume(j <= r->N);
-  b = (int)(j+lV-1)/lV; /* the number of the block, 1<= b <= r->N  */
-  return (b);
 }
 
@@ -212 +77 @@
   }
   /* do not need e anymore */
-  freeT(e, currRing->N);
+  omFreeSize((ADDRESS) e, (currRing->N+1)*sizeof(int));
 
   if (j==0) goto ret_true;
@@ -225 +90 @@
     if (B[j]!=1)
     {
-      freeT(B, b);
+      omFreeSize((ADDRESS) B, (b+1)*sizeof(int));
       return(0);
     }
   }
  ret_true:
-  freeT(B, b);
+  omFreeSize((ADDRESS) B, (b+1)*sizeof(int));
   return(1);
 }
@@ -297 +162 @@
   m1 = p_GetExp_k_n(m1, hole, r->N, r);
 
-  p_mLPshift(m2, 1 - p_mFirstVblock(m2, r), r);
+  p_mLPunshift(m2, r);
   p_SetCoeff(m1, m1Coeff, r);
+
+  assume(pFirstVblock(m1,r) <= 1);
+  assume(pFirstVblock(m2,r) <= 1);
 }
 

kernel/GBEngine/shiftgb.h

@@ -12 +12 @@
 #include "polys/nc/nc.h"
 
-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);
-
-#define pLastVblock(p) p_LastVblock(p,currRing)
-#define pmLastVblock(p) p_mLastVblock(p,currRing)
-
-int p_FirstVblock(poly p, const ring r);
-int p_mFirstVblock(poly p, const ring r);
-
-#define pFirstVblock(p) p_FirstVblock(p,currRing)
-#define pmFirstVblock(p) p_mFirstVblock(p,currRing)
 
 int isInV(poly p, const ring r);