Changeset 594652 in git

Timestamp:

Sep 22, 2022, 12:09:05 PM (19 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5bec8f88c9ee2573d328cf7c3aff2bcb301d2395

Parents:

dfe0aba7819331fbb350a4fae5165e4edf3b13ab

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2022-09-22 12:09:05+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2022-09-22 13:44:03+02:00

Message:

opt: id_DelDiv,id_Head, removed id_DelDiv_*

Files:

• kernel/combinatorics/hilb.cc (modified) (4 diffs)
• libpolys/polys/simpleideals.cc (modified) (5 diffs)
• libpolys/polys/simpleideals.h (modified) (1 diff)

kernel/combinatorics/hilb.cc

@@ -1708 +1708 @@
 {
   // e=max(0,p-q) for all exps
-  for(int i=1;i<=src->N;i++)
-  {
-    p_SetExp(p,i,si_max(0L,p_GetExp(p,i,src)-exp_q[i]),src);
+  for(int i=src->N;i>0;i--)
+  {
+    int pi=p_GetExp(p,i,src)-exp_q[i];
+    if (pi<0) pi=0;
+    p_SetExp(p,i,pi,src);
   }
   #ifdef PDEBUG
@@ -1800 +1802 @@
     //idSkipZeroes(J);
     ideal J=id_CopyFirstK(A,i,src);
-    for(int ii=1;ii<=src->N;ii++)
+    for(int ii=src->N;ii>0;ii--)
       exp_q[ii]=p_GetExp(A->m[i],ii,src);
     for(int ii=0;ii<i;ii++) p_Div_hi(J->m[ii],exp_q,src);
-    id_DelDiv_Sorted(J,src);
+    id_DelDiv(J,src);
     // search linear elems:
     int k=0;
@@ -1811 +1813 @@
       {
         k++;
-        p_Delete(&J->m[ii],src);
+        p_LmDelete(&J->m[ii],src);
       }
     }
@@ -1889 +1891 @@
   }
   else AA=A;
-  id_DelDiv_Sorted(AA,src);
+  id_DelDiv(AA,src);
   idSkipZeroes(AA);
    /* sort */

libpolys/polys/simpleideals.cc

@@ -349 +349 @@
 }
 
-/// delete id[j], if LT(j) == coeff*mon*LT(i) (j>i)
+/// delete id[j], if LT(j) == coeff*mon*LT(i)
 static void id_DelDiv_SEV(ideal id, int k,const ring r)
 {
@@ -355 +355 @@
   long *sev=(long*)omAlloc0(kk*sizeof(long));
   while(id->m[k]==NULL) k--;
+  BOOLEAN only_lm=r->cf->has_simple_Alloc;
+  if (!only_lm)
+  {
+    for (int i=k; i>=0; i--)
+    {
+      if((id->m[i]!=NULL) && (pNext(id->m[i])!=NULL))
+      {
+        only_lm=FALSE;
+        break;
+      }
+    }
+  }
   for (int i=k; i>=0; i--)
   {
     if(id->m[i]!=NULL)
+    {
       sev[i]=p_GetShortExpVector(id->m[i],r);
-  }
-  for (int i=0; i<k; i++)
-  {
-    if (id->m[i] != NULL)
-    {
-      poly m_i=id->m[i];
-      for (int j=i+1; j<=k; j++)
-      {
-        if (id->m[j]!=NULL)
+    }
+  }
+  if (only_lm)
+  {
+    for (int i=0; i<k; i++)
+    {
+      if (id->m[i] != NULL)
+      {
+        poly m_i=id->m[i];
+        long sev_i=sev[i];
+        for (int j=i+1; j<=k; j++)
         {
-          if (p_LmShortDivisibleBy(m_i, sev[i],r, id->m[j],~sev[j],r))
+          if (id->m[j]!=NULL)
           {
-            p_Delete(&id->m[j],r);
-          }
-          else if (p_LmShortDivisibleBy(id->m[j],sev[j],r, m_i,~sev[i],r))
-          {
-            p_Delete(&id->m[i],r);
-            break;
+            if (p_LmShortDivisibleBy(m_i, sev_i,r, id->m[j],~sev[j],r))
+            {
+              p_LmFree(&id->m[j],r);
+            }
+            else if (p_LmShortDivisibleBy(id->m[j],sev[j],r, m_i,~sev_i,r))
+            {
+              p_LmFree(&id->m[i],r);
+              break;
+            }
           }
         }
@@ -382 +400 @@
     }
   }
-  omFreeSize(sev,kk*sizeof(long));
-}
-
-/// delete id[j], if LT(j) == coeff*mon*LT(i) (j>i)
-/// assume LC(j)==NULL or n_Delete==ndDelete
-static void id_DelDiv_SEV0(ideal id, int k,const ring r)
-{
-  int kk = k+1;
-  long *sev=(long*)omAlloc0(kk*sizeof(long));
-  while(id->m[k]==NULL) k--;
-  for (int i=k; i>=0; i--)
-  {
-    if(id->m[i]!=NULL)
-      sev[i]=p_GetShortExpVector(id->m[i],r);
-  }
-  for (int i=0; i<k; i++)
-  {
-    if (id->m[i] != NULL)
-    {
-      poly m_i=id->m[i];
-      for (int j=i+1; j<=k; j++)
-      {
-        if (id->m[j]!=NULL)
+  else
+  {
+    for (int i=0; i<k; i++)
+    {
+      if (id->m[i] != NULL)
+      {
+        poly m_i=id->m[i];
+        long sev_i=sev[i];
+        for (int j=i+1; j<=k; j++)
         {
-          if (p_LmShortDivisibleBy(m_i, sev[i],r, id->m[j],~sev[j],r))
+          if (id->m[j]!=NULL)
           {
-            p_LmFree(&id->m[j],r);
-          }
-          else if (p_LmShortDivisibleBy(id->m[j],sev[j],r, m_i,~sev[i],r))
-          {
-            p_LmFree(&id->m[i],r);
-            break;
+            if (p_LmShortDivisibleBy(m_i, sev_i,r, id->m[j],~sev[j],r))
+            {
+              p_Delete(&id->m[j],r);
+            }
+            else if (p_LmShortDivisibleBy(id->m[j],sev[j],r, m_i,~sev_i,r))
+            {
+              p_Delete(&id->m[i],r);
+              break;
+            }
           }
         }
@@ -487 +494 @@
     }
   }
-}
-
-/// delete id[j], if LT(j) == coeff*mon*LT(i) (j>i)
-void id_DelDiv_Sorted(ideal id, const ring r)
-{
-  int k = IDELEMS(id)-1;
-  if (r->cf->has_simple_Alloc)
-    id_DelDiv_SEV0(id,k,r);
-  else
-    id_DelDiv_SEV(id,k,r);
 }
 
@@ -1396 +1393 @@
   ideal m = idInit(IDELEMS(h),h->rank);
 
-  for (int i=IDELEMS(h)-1;i>=0; i--)
-    if (h->m[i]!=NULL)
-      m->m[i]=p_Head(h->m[i],r);
+  if (r->cf->has_simple_Alloc)
+  {
+    for (int i=IDELEMS(h)-1;i>=0; i--)
+      if (h->m[i]!=NULL)
+        m->m[i]=p_CopyPowerProduct0(h->m[i],pGetCoeff(h->m[i]),r);
+  }
+  else
+  {
+    for (int i=IDELEMS(h)-1;i>=0; i--)
+      if (h->m[i]!=NULL)
+        m->m[i]=p_Head(h->m[i],r);
+  }
 
   return m;

libpolys/polys/simpleideals.h

@@ -110 +110 @@
 void id_DelLmEquals(ideal id, const ring r);
 void id_DelDiv(ideal id, const ring r);
-void id_DelDiv_Sorted(ideal id, const ring r);
 BOOLEAN id_IsConstant(ideal id, const ring r);