Changeset 8a58fa in git for libpolys

Timestamp:

Jun 10, 2022, 2:33:49 PM (23 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e5347a518adabdab778b23f992a5d83d9cfde542

Parents:

d5f87688187dd104c5351832901927cfcc3a725a

Message:

add id_DelDiv_Sorted (for hilbert_series)

Location:

libpolys/polys

Files:

• simpleideals.cc (modified) (3 diffs)
• simpleideals.h (modified) (1 diff)

libpolys/polys/simpleideals.cc

@@ -355 +355 @@
   int i, j;
   int k = IDELEMS(id)-1;
-  for (i=k-1; i>=0; i--)
-  {
-    if (id->m[i] != NULL)
-    {
-      for (j=k; j>i; j--)
-      {
-        if (id->m[j]!=NULL)
+#ifdef HAVE_RINGS
+  if (rField_is_Ring(r))
+  {
+    for (i=k-1; i>=0; i--)
+    {
+      if (id->m[i] != NULL)
+      {
+        for (j=k; j>i; j--)
         {
-#ifdef HAVE_RINGS
-          if (rField_is_Ring(r))
+          if (id->m[j]!=NULL)
           {
             if (p_DivisibleByRingCase(id->m[i], id->m[j],r))
@@ -376 +376 @@
             }
           }
-          else
+        }
+      }
+    }
+  }
+  else
 #endif
+  {
+    /* the case of a coefficient field: */
+    for (i=k-1; i>=0; i--)
+    {
+      if (id->m[i] != NULL)
+      {
+        for (j=k; j>i; j--)
+        {
+          if (id->m[j]!=NULL)
           {
-            /* the case of a coefficient field: */
             if (p_DivisibleBy(id->m[i], id->m[j],r))
             {
@@ -389 +401 @@
               break;
             }
+          }
+        }
+      }
+    }
+  }
+}
+
+/// delete id[j], if LT(j) == coeff*mon*LT(i) (j>i)
+void id_DelDiv_Sorted(ideal id, const ring r)
+{
+  id_Test(id, r);
+
+  int i, j;
+  int k = IDELEMS(id)-1;
+  for (i=0; i<k; i++)
+  {
+    if (id->m[i] != NULL)
+    {
+      for (j=i+1; j<=k; j++)
+      {
+        if (id->m[j]!=NULL)
+        {
+          if (p_DivisibleBy(id->m[i], id->m[j],r))
+          {
+            p_Delete(&id->m[j],r);
+            if (j==k) k--;
+            while(id->m[k]==NULL) k--;
+          }
+          else if (p_DivisibleBy(id->m[j], id->m[i],r))
+          {
+            p_Delete(&id->m[i],r);
+            break;
           }
         }

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);