Changeset 1e579c6 in git for kernel/polys.cc

Timestamp:

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

Author:

Oliver Wienand <wienand@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

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/polys.cc (modified) (5 diffs)

kernel/polys.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys.cc,v 1.19 2007-05-23 07:47:30 wienand Exp $ */
+/* $Id: polys.cc,v 1.20 2007-06-20 09:39:24 wienand Exp $ */
 
 /*
@@ -689 +689 @@
 }
 
-#ifdef HAVE_RINGS  //HACK TODO Oliver
-number nGetUnit(number k) {
-  number unit = nIntDiv(k, nGcd(k, 0, currRing));
-  number gcd = nGcd(unit, 0, currRing);
-  if (!nIsOne(gcd))
-  {
-    number tmp = nMult(unit, unit);
-    number gcd_new = nGcd(tmp, 0, currRing);
-    while (gcd_new != gcd)
-    {
-      gcd = gcd_new;
-      tmp = nMult(tmp, unit);
-      gcd_new = nGcd(tmp, 0, currRing);
-    }
-    unit = nAdd(unit, nIntDiv(0, gcd_new));
-  }
-//  Print("k = %d ; unit = %d ; gcd = %d", k, unit, gcd);
-  return unit;
-}
-#endif
-
 /*2
 *divides p1 by its leading coefficient
@@ -720 +699 @@
   if (rField_is_Ring(currRing))
   {
-    if (p1!=NULL)
+    if ((p1!=NULL) && rField_has_Units(currRing))
     {
       k = nGetUnit(pGetCoeff(p1));
@@ -726 +705 @@
       {
         c = nDiv(pGetCoeff(p1), k);
+        nDelete(pGetCoeff(p1));
         pSetCoeff0(p1, c);
         h = pNext(p1);
@@ -731 +711 @@
         {
           c = nDiv(pGetCoeff(h), k);
-          pSetCoeff(h, c);
+          nDelete(pGetCoeff(h));
+          pSetCoeff0(h, c);
           pIter(h);
         }
-        nDelete(&k);
-      }
-     return;
-    }
+      }
+      nDelete(&k);
+    }
+    return;
   }
   else