Changeset ac5926 in git for libpolys

Timestamp:

Aug 29, 2022, 3:45:05 PM (20 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

295424033ae789da33cc0fe7c27571815b5ce280

Parents:

cacb13f363f9ecf08a35d85136d1a5f52bcc974f

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2022-08-29 15:45:05+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2022-08-29 15:50:42+02:00

Message:

ksCheckCoeff: ring case: reduce(a,b): do not multiply a

Location:

libpolys/polys

Files:

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

libpolys/polys/kbuckets.cc

@@ -1081 +1081 @@
 //
 
-extern int ksCheckCoeff(number *a, number *b);
-
 number kBucketPolyRed(kBucket_pt bucket,
                       poly p1, int l1,
@@ -1428 +1426 @@
 *       3  ->  a == 1,  b == 1
 *   this value is used to control the spolys
+*   reduce is set inside "NF" -> a should be 1
 */
-int ksCheckCoeff(number *a, number *b, const coeffs r)
+int ksCheckCoeff(number *a, number *b, const coeffs r, BOOLEAN reduce)
 {
   int c = 0;
@@ -1438 +1437 @@
   number cn;
 
-  if (nCoeff_is_Ring(r)
-  && n_DivBy(an,bn,r))
-  {
-    cn=n_Copy(bn,r);
+  if (nCoeff_is_Ring(r))
+  {
+    if (n_Equal(an,bn,r))
+    {
+      *a=n_Init(1,r);
+      *b=n_Init(1,r);
+      return 3;
+    }
+    else if(redtail)
+    {
+      an = n_Init(1,r);
+      bn = n_ExactDiv(bn, an, r);
+    }
+    else
+    {
+      cn = n_SubringGcd(an, bn, r);
+      if(n_IsOne(cn, r))
+      {
+        an = n_Copy(an, r);
+        bn = n_Copy(bn, r);
+      }
+      else
+      {
+        an = n_ExactDiv(an, cn, r);
+        bn = n_ExactDiv(bn, cn, r);
+      }
+      n_Delete(&cn, r);
+    }
   }
   else
   {
     cn = n_SubringGcd(an, bn, r);
-  }
-  if(n_IsOne(cn, r))
-  {
-    an = n_Copy(an, r);
-    bn = n_Copy(bn, r);
-  }
-  else
-  {
-    an = n_ExactDiv(an, cn, r);
-    bn = n_ExactDiv(bn, cn, r);
-  }
-  n_Delete(&cn, r);
+    if(n_IsOne(cn, r))
+    {
+      an = n_Copy(an, r);
+      bn = n_Copy(bn, r);
+    }
+    else
+    {
+      an = n_ExactDiv(an, cn, r);
+      bn = n_ExactDiv(bn, cn, r);
+    }
+    n_Delete(&cn, r);
+  }
   if (n_IsOne(an, r))
   {

libpolys/polys/kbuckets.h

@@ -244 +244 @@
 void kBucketSimpleContent(kBucket_pt bucket);
 BOOLEAN kBucketIsCleared(kBucket_pt bucket);
-int ksCheckCoeff(number *a, number *b, const coeffs r);
+int ksCheckCoeff(number *a, number *b, const coeffs r, BOOLEAN reduce=FALSE);
 #endif /* KBUCKETS_H */