Changeset 1e579c6 in git for kernel/kutil.cc

Timestamp:

Jun 20, 2007, 11:39:25 AM (17 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

07e8ae3b1877436cb95506c90d799438d558c703

Parents:

f7aaec31bd73e9e5b3b2bd84ee5ff4fab2de4691

Message:

kutil.cc:
* use nExtGcd, nIsUnit
* extended spolys only for non-domains

numbers.cc, numbers.h, structs.h:
* new Functions: nIsUnit, nGetUnit, nExtGcd
* new Field: the Integers

polys.cc, polys.h:
* nGetUnit hack removed
* minor memory glitch

polys1.cc:
* no pContent for Integers

ring.h:
new rField methos for Integers and p^n

rintegers.*:
implementation of the whole numbers using gmp

rmodulo*:
added funcs: nIsUnit, nGetUnit, nExtGcd


git-svn-id: file:///usr/local/Singular/svn/trunk@10125 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/kutil.cc (modified) (6 diffs)

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.58 2007-05-24 10:02:43 wienand Exp $ */
+/* $Id: kutil.cc,v 1.59 2007-06-20 09:39:23 wienand Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -1055 +1055 @@
   pSetm(Lp.lcm);
   assume(!strat->sugarCrit);
-  if (pHasNotCF(p,strat->S[i]) && nIsOne(nGcd(0, pGetCoeff(p), currRing)) && nIsOne(nGcd(0, pGetCoeff(strat->S[i]), currRing)))
+  if (pHasNotCF(p,strat->S[i]) && nIsUnit(pGetCoeff(p)) && nIsUnit(pGetCoeff(strat->S[i])))
   {
 #ifdef KDEBUG
@@ -1245 +1245 @@
 #endif
 
-void enterOneStrongPoly (int i,poly p,int ecart, int isFromQ,kStrategy strat, int atR = -1)
-{
-  long d, s, t;
+BOOLEAN enterOneStrongPoly (int i,poly p,int ecart, int isFromQ,kStrategy strat, int atR = -1)
+{
+  number d, s, t;
   assume(i<=strat->sl);
   LObject  Lp;
   poly m1, m2, erg, gcd;
 
-  XGCD(d, s, t, (long) pGetCoeff(p), (long) pGetCoeff(strat->S[i]));
-
+  d = nExtGcd(pGetCoeff(p), pGetCoeff(strat->S[i]), &s, &t);
+
+  if (nIsOne(d) || nIsZero(s) || nIsZero(t))
+  {
+    nDelete(&d);
+    nDelete(&s);
+    nDelete(&t);
+    return FALSE;
+  }
 
   k_GetStrongLeadTerms(p, strat->S[i], currRing, m1, m2, gcd, strat->tailRing);
 
-  pSetCoeff0(m1, nInit(s));
-  pSetCoeff0(m2, nInit(t));
-  pSetCoeff0(gcd, nInit(d));
+  pSetCoeff0(m1, s);
+  pSetCoeff0(m2, t);
+  pSetCoeff0(gcd, d);
 
 
@@ -1323 +1330 @@
     enterL(&strat->L,&strat->Ll,&strat->Lmax,h,posx);
   }
+  return TRUE;
 }
 #endif
@@ -2600 +2608 @@
     {
       // Print("j:%d, Ll:%d\n",j,strat->Ll);
-      if (((unsigned long) pGetCoeff(h) % (unsigned long) pGetCoeff(strat->S[j]) != 0) &&
-         ((unsigned long) pGetCoeff(strat->S[j]) % (unsigned long) pGetCoeff(h) != 0))
-      {
-        new_pair=TRUE;
-        enterOneStrongPoly(j,h,ecart,isFromQ,strat, atR);
+//      if (((unsigned long) pGetCoeff(h) % (unsigned long) pGetCoeff(strat->S[j]) != 0) &&
+//         ((unsigned long) pGetCoeff(strat->S[j]) % (unsigned long) pGetCoeff(h) != 0))
+      {
+        if (enterOneStrongPoly(j,h,ecart,isFromQ,strat, atR))
+          new_pair=TRUE;
       }
     }
@@ -2728 +2736 @@
     assume (rField_is_Ring(currRing));
     // enter also zero divisor * poly, if this is non zero and of smaller degree
-    enterExtendedSpoly(h, strat);
+    if (!(rField_is_Domain(currRing))) enterExtendedSpoly(h, strat);
     initenterpairsRing(h, k, ecart, 0, strat, atR);
     initenterstrongPairs(h, k, ecart, 0, strat, atR);