Changeset 0ebd7e in git

Timestamp:

Apr 20, 2011, 6:09:43 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

1ddd044275ba5d4433a597ff9edee1abfce81a0e

Parents:

2945379dfb56330fb50187871415af6e9c6ec7d3

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-04-20 18:09:43+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:31:23+01:00

Message:

add ksCheckCoeffs

Files:

• kernel/kspoly.cc (modified) (1 diff)
• kernel/kutil.h (modified) (1 diff)
• libpolys/polys/kbuckets.cc (modified) (2 diffs)
• libpolys/polys/kbuckets.h (modified) (1 diff)

kernel/kspoly.cc

@@ -346 +346 @@
  *
  ***************************************************************/
-
-/*
-* input - output: a, b
-* returns:
-*   a := a/gcd(a,b), b := b/gcd(a,b)
-*   and return value
-*       0  ->  a != 1,  b != 1
-*       1  ->  a == 1,  b != 1
-*       2  ->  a != 1,  b == 1
-*       3  ->  a == 1,  b == 1
-*   this value is used to control the spolys
-*/
-int ksCheckCoeff(number *a, number *b)
-{
-  int c = 0;
-  number an = *a, bn = *b;
-  nTest(an);
-  nTest(bn);
-
-  number cn = nGcd(an, bn, currRing);
-
-  if(nIsOne(cn))
-  {
-    an = nCopy(an);
-    bn = nCopy(bn);
-  }
-  else
-  {
-    an = nIntDiv(an, cn);
-    bn = nIntDiv(bn, cn);
-  }
-  nDelete(&cn);
-  if (nIsOne(an))
-  {
-    c = 1;
-  }
-  if (nIsOne(bn))
-  {
-    c += 2;
-  }
-  *a = an;
-  *b = bn;
-  return c;
-}
 
 /*2

kernel/kutil.h

@@ -599 +599 @@
 
 
-/*
-* input - output: a, b
-* returns:
-*   a := a/gcd(a,b), b := b/gcd(a,b)
-*   and return value
-*       0  ->  a != 1,  b != 1
-*       1  ->  a == 1,  b != 1
-*       2  ->  a != 1,  b == 1
-*       3  ->  a == 1,  b == 1
-*   this value is used to control the spolys
-*/
-int ksCheckCoeff(number *a, number *b);
-
 // old stuff
 KINLINE poly ksOldSpolyRed(poly p1, poly p2, poly spNoether = NULL);

libpolys/polys/kbuckets.cc

@@ -1084 +1084 @@
 //StringSetS("##### bn = "); nWrite(bn); PrintS(StringAppend("\n"));
     /* ksCheckCoeff: divide out gcd from an and bn: */
-    int ct = ksCheckCoeff(&an, &bn);
+    int ct = ksCheckCoeff(&an, &bn,r->cf);
     /* the previous command returns ct=0 or ct=2 iff an!=1
        note: an is now 1 or -1 */
@@ -1281 +1281 @@
   }
 }
+
+/*
+* input - output: a, b
+* returns:
+*   a := a/gcd(a,b), b := b/gcd(a,b)
+*   and return value
+*       0  ->  a != 1,  b != 1
+*       1  ->  a == 1,  b != 1
+*       2  ->  a != 1,  b == 1
+*       3  ->  a == 1,  b == 1
+*   this value is used to control the spolys
+*/
+int ksCheckCoeff(number *a, number *b, const coeffs r)
+{
+  int c = 0;
+  number an = *a, bn = *b;
+  n_Test(an,r);
+  n_Test(bn,r);
+
+  number cn = n_Gcd(an, bn, r);
+
+  if(n_IsOne(cn, r))
+  {
+    an = n_Copy(an, r);
+    bn = n_Copy(bn, r);
+  }
+  else
+  {
+    an = n_IntDiv(an, cn, r);
+    bn = n_IntDiv(bn, cn, r);
+  }
+  n_Delete(&cn, r);
+  if (n_IsOne(an, r))
+  {
+    c = 1;
+  }
+  if (n_IsOne(bn, r))
+  {
+    c += 2;
+  }
+  *a = an;
+  *b = bn;
+  return c;
+}
+

libpolys/polys/kbuckets.h

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