Changeset af378f7 in git

Timestamp:

Jan 30, 2008, 7:49:43 PM (15 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

2f959e83f22c8e788ce3941f4ac3eb2fb1df74c1

Parents:

12ea9df042d8c883f3d3c722b2388c0424347a88

Message:

anpassungen an gmp


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

Location:

kernel

Files:

• kutil.cc (modified) (2 diffs)
• p_Minus_mm_Mult_qq__T.cc (modified) (3 diffs)
• p_Mult_nn__T.cc (modified) (3 diffs)
• polys.cc (modified) (3 diffs)
• rintegers.cc (modified) (3 diffs)
• rmodulon.cc (modified) (8 diffs)

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.73 2008-01-30 09:14:04 wienand Exp $ */
+/* $Id: kutil.cc,v 1.74 2008-01-30 18:49:42 wienand Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -2635 +2635 @@
 {
   number gcd = nGcd((number) 0, pGetCoeff(h), strat->tailRing);
-  if ((NATNUMBER) gcd > 1)
+  if (!nIsOne(gcd))
   {
     poly p = p_Copy(h->next, strat->tailRing);
-/*    long a = ((long) ((h)->coef)) / 2;
-    long b = currRing->ch - 1;
-    while (a % 2 == 0)
-    {
-      a = a / 2;
-      b--;
-    }
-    p = p_Mult_nn(p, (number) twoPow(b), strat->tailRing); */
-    p = p_Mult_nn(p, nIntDiv(0, gcd), strat->tailRing);
+    gcd = nIntDiv(0, gcd);
+    p = p_Mult_nn(p, gcd, strat->tailRing);
+    nDelete(&gcd);
 
     if (p != NULL)

kernel/p_Minus_mm_Mult_qq__T.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Minus_mm_Mult_qq__T.cc,v 1.6 2007-05-10 08:12:42 wienand Exp $
+ *  Version: $Id: p_Minus_mm_Mult_qq__T.cc,v 1.7 2008-01-30 18:49:43 wienand Exp $
  *******************************************************************/
 
@@ -68 +68 @@
   tb = n_Mult(pGetCoeff(q), tm, r);
 #ifdef HAVE_ZERODIVISORS
-  if ((long) tb != 0) {
+  if (!nIsZero(tb)) {
 #endif
   tc = pGetCoeff(p);
@@ -99 +99 @@
 #ifdef HAVE_ZERODIVISORS
   tb = n_Mult(pGetCoeff(q), tneg, r);
-  if ((long) tb != 0)
+  if (!nIsZero(tb))
   {
 #endif

kernel/p_Mult_nn__T.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Mult_nn__T.cc,v 1.9 2007-05-10 08:12:42 wienand Exp $
+ *  Version: $Id: p_Mult_nn__T.cc,v 1.10 2008-01-30 18:49:43 wienand Exp $
  *******************************************************************/
 
@@ -35 +35 @@
 #else
     number tmp = n_Mult(n, pGetCoeff(p), r);
-    if (tmp != NULL)
+    if (!nIsZero(tmp))
     {
-       p_SetCoeff(p, tmp, r);
+       number nc = pGetCoeff(p);
+       p_SetCoeff0(p, tmp, r);
+       n_Delete(&nc, r);
        old = p;
        pIter(p);
@@ -44 +46 @@
     {
       n_Delete(&tmp, r);
-      if (old == NULL) { q = pNext(q); }
-      else { pNext(old) = pNext(p); }
-      pIter(p);    // TODO Free Monom OLIVER
+      if (old == NULL)
+      {
+        pIter(p);
+        p_DeleteLm(&q, r);
+      }
+      else
+      { 
+        p_DeleteLm(&p, r); 
+        pNext(old) = p;
+      }
     }
 #endif

kernel/polys.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys.cc,v 1.26 2007-07-24 12:29:31 Singular Exp $ */
+/* $Id: polys.cc,v 1.27 2008-01-30 18:49:43 wienand Exp $ */
 
 /*
@@ -730 +730 @@
       if (!nIsOne(k))
       {
-        c = nDiv(pGetCoeff(p1), k);
+        k = nInvers(k);
+        c = nMult(pGetCoeff(p1), k);  
         nDelete(&pGetCoeff(p1));
         pSetCoeff0(p1, c);
@@ -736 +737 @@
         while (h != NULL)
         {
-          c = nDiv(pGetCoeff(h), k);
+          c = nMult(pGetCoeff(h), k);
           nDelete(&pGetCoeff(h));
           pSetCoeff0(h, c);

kernel/rintegers.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: rintegers.cc,v 1.5 2008-01-30 13:03:41 wienand Exp $ */
+/* $Id: rintegers.cc,v 1.6 2008-01-30 18:49:43 wienand Exp $ */
 /*
 * ABSTRACT: numbers modulo n
@@ -274 +274 @@
 {
   char * start=s;
-
+  if (!(*s >= '0' && *s <= '9'))
+  {
+    mpz_init_set_si(i, 1);
+    return s;
+  }
+  mpz_init(i);
   while (*s >= '0' && *s <= '9') s++;
   if (*s=='\0')
@@ -290 +295 @@
 }
 
+
 char * nrzRead (char *s, number *a)
 {

kernel/rmodulon.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: rmodulon.cc,v 1.10 2008-01-30 16:14:25 wienand Exp $ */
+/* $Id: rmodulon.cc,v 1.11 2008-01-30 18:49:43 wienand Exp $ */
 /*
 * ABSTRACT: numbers modulo n
@@ -61 +61 @@
   int_number erg = (int_number) omAlloc(sizeof(MP_INT)); // evtl. spaeter mit bin
   mpz_init(erg);
+  if (a == NULL) a = (number) nrnModul;
+  if (b == NULL) b = (number) nrnModul;
   mpz_gcd(erg, (int_number) a, (int_number) b);
   return (number) erg;
 }
+
+number nrnGcd3 (number a,number b, number c,ring r)
+{
+  int_number erg = (int_number) omAlloc(sizeof(MP_INT)); // evtl. spaeter mit bin
+  mpz_init(erg);
+  if (a == NULL) a = (number) nrnModul;
+  if (b == NULL) b = (number) nrnModul;
+  if (c == NULL) c = (number) nrnModul;
+  mpz_gcd(erg, (int_number) a, (int_number) b);
+  mpz_gcd(erg, erg, (int_number) c);
+  return (number) erg;
+}
+
 
 /*
@@ -87 +102 @@
   int_number erg = (int_number) omAlloc(sizeof(MP_INT)); // evtl. spaeter mit bin
   mpz_init(erg);
-  mpz_pow_ui(erg, (int_number) a, i);
+  mpz_powm_ui(erg, (int_number) a, i, nrnModul);
+  *result = (number) erg;
+}
+
+/*
+ * create a number from int
+ */
+number nrnInit (int i)
+{
+  int_number erg = (int_number) omAlloc(sizeof(MP_INT)); // evtl. spaeter mit bin
+  mpz_init_set_si(erg, i);
   mpz_mod(erg, erg, nrnModul);
-//  int_number tmp = (int_number) omAlloc(sizeof(MP_INT)); // evtl. spaeter mit bin
-//  mpz_init(tmp);
-//  mpz_clear(erg);
-//  omFree(erg);
-//  erg = tmp;
-  *result = (number) erg;
-}
-
-/*
- * create a number from int
- */
-number nrnInit (int i)
-{
-  int_number erg = (int_number) omAlloc(sizeof(MP_INT)); // evtl. spaeter mit bin
-  mpz_init_set_si(erg, i);
   return (number) erg;
 }
@@ -139 +149 @@
 }
 
-number  nrnGetUnit (number a)
-{
-  return nrnDiv((number) nrnModul, nrnGcd(a, (number) nrnModul, NULL));
+number  nrnGetUnit (number k)
+{
+  return nrnInit(1);
+  number unit = nrnIntDiv(k, nrnGcd(k, 0, currRing));
+  number gcd = nrnGcd(unit, 0, currRing);
+  if (!nrnIsOne(gcd))
+  {
+    number tmp = nrnMult(unit, unit);
+    number gcd_new = nrnGcd(tmp, 0, currRing);
+    while (!nrnEqual(gcd_new, gcd))
+    {
+      nrnDelete(&gcd, NULL);
+      gcd = gcd_new;
+      tmp = nrnMult(tmp, unit);
+      gcd_new = nrnGcd(tmp, 0, currRing);
+    }
+    unit = nrnAdd(unit, nrnIntDiv(0, gcd_new));
+    nrnDelete(&gcd_new, NULL);
+  }
+  nrnDelete(&gcd, NULL);
+  return unit;
 }
 
 BOOLEAN nrnIsUnit (number a)
 {
-  return nrnIsOne(nrnGcd(a, (number) nrnModul, NULL));
+  number tmp = nrnGcd(a, (number) nrnModul, NULL);
+  bool res = nrnIsOne(tmp);
+  nrnDelete(&tmp, NULL);
+  return res;
 }
 
@@ -189 +220 @@
 BOOLEAN nrnDivBy (number a,number b)
 {
-  return mpz_divisible_p((int_number) a, (int_number) b) != 0;
+  number bs = nrnIntDiv(b, nrnGcd(a, b, NULL));
+  bool res = nrnIsUnit(bs);
+  nrnDelete(&bs, NULL);
+  return res;
 }
 
 number nrnDiv (number a,number b)
 {
-  int_number erg = (int_number) omAlloc(sizeof(MP_INT)); // evtl. spaeter mit bin
-  mpz_init(erg);
-  if (nrnDivBy(a, b))
+  if (a == NULL) a = (number) nrnModul;
+  int_number erg = (int_number) omAlloc(sizeof(MP_INT)); // evtl. spaeter mit bin
+  mpz_init(erg);
+  if (mpz_divisible_p((int_number) a, (int_number) b))
   {
     mpz_divexact(erg, (int_number) a, (int_number) b);
@@ -234 +269 @@
   int_number erg = (int_number) omAlloc(sizeof(MP_INT)); // evtl. spaeter mit bin
   mpz_init(erg);
+  if (a == NULL) a = (number) nrnModul;
   mpz_tdiv_q(erg, (int_number) a, (int_number) b);
   return (number) erg;
@@ -339 +375 @@
 {
   char * start=s;
-
+  if (!(*s >= '0' && *s <= '9'))
+  {
+    mpz_init_set_si(i, 1);
+    return s;
+  }
+  mpz_init(i);
   while (*s >= '0' && *s <= '9') s++;
   if (*s=='\0')
@@ -359 +400 @@
   int_number z = (int_number) omAlloc(sizeof(MP_INT)); // evtl. spaeter mit bin
   {
-    mpz_init(z);
     s = nlCPEatLongC(s, z);
   }