Changeset 12ea9d in git

Timestamp:

Jan 30, 2008, 5:14:25 PM (15 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

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

Children:

af378f726d1e5204f8934b4281bd84a2d50ab8ed

Parents:

122981d0e106581ee4b7623ee3c76393fef4568a

Message:

numbers.cc:
n^m ringtyp

ring.cc:
ringausgabe für long long okay

ring.h, structs.h:
ull für base

rmodulon.cc:
init, set für llu


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

Location:

kernel

Files:

• numbers.cc (modified) (3 diffs)
• ring.cc (modified) (2 diffs)
• ring.h (modified) (2 diffs)
• rmodulon.cc (modified) (6 diffs)
• structs.h (modified) (2 diffs)

kernel/numbers.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: numbers.cc,v 1.11 2007-07-03 14:45:57 Singular Exp $ */
+/* $Id: numbers.cc,v 1.12 2008-01-30 16:14:24 wienand Exp $ */
 
 /*
@@ -147 +147 @@
   /*----------------------ring Z / n----------------*/
   else if (rField_is_Ring_ModN(r))
+  {
+    nrnSetExp(c, r);
+  }
+#endif
+#ifdef HAVE_RINGMODN
+  /*----------------------ring Z / n----------------*/
+  else if (rField_is_Ring_PtoM(r))
   {
     nrnSetExp(c, r);
@@ -370 +377 @@
 #ifdef HAVE_RINGMODN
   /* -------------- Z/n ----------------------- */
-  else if (rField_is_Ring_ModN(r))
+  else if (rField_is_Ring_ModN(r) || rField_is_Ring_PtoM(r)
+  )
   {
      nrnInitExp(c,r);

kernel/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.71 2008-01-30 09:01:38 wienand Exp $ */
+/* $Id: ring.cc,v 1.72 2008-01-30 16:14:24 wienand Exp $ */
 
 /*
@@ -277 +277 @@
 #endif
 #ifdef HAVE_RINGMODN
-    if (rField_is_Ring_ModN(r)) Print("Z/%d\n", r->ringflaga);
+    if (rField_is_Ring_ModN(r)) Print("Z/%llu\n", r->ringflaga);
 #endif
 #ifdef HAVE_RING2TOM
-    if (rField_is_Ring_2toM(r)) Print("Z/2^%d\n", r->ringflagb);
+    if (rField_is_Ring_2toM(r)) Print("Z/2^%llu\n", r->ringflagb);
 #endif
-#ifdef HAVE_RINGPTOM
-    if (rField_is_Ring_PtoM(r)) Print("Z/%d^%d\n", r->ringflaga, r->ringflagb);
+#ifdef HAVE_RINGMODN
+    if (rField_is_Ring_PtoM(r)) Print("Z/%llu^%u\n", r->ringflaga, r->ringflagb);
 #endif
   }

kernel/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.23 2007-07-19 11:54:50 Singular Exp $ */
+/* $Id: ring.h,v 1.24 2008-01-30 16:14:25 wienand Exp $ */
 
 /* includes */
@@ -98 +98 @@
 inline BOOLEAN rField_is_Ring_ModN(ring r=currRing)
 { return (r->ringtype == 2); }
-#endif
-
-#ifdef HAVE_RINGPTOM
+
 inline BOOLEAN rField_is_Ring_PtoM(ring r=currRing)
 { return (r->ringtype == 3); }

kernel/rmodulon.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: rmodulon.cc,v 1.9 2008-01-30 13:03:41 wienand Exp $ */
+/* $Id: rmodulon.cc,v 1.10 2008-01-30 16:14:25 wienand Exp $ */
 /*
 * ABSTRACT: numbers modulo n
@@ -24 +24 @@
 typedef MP_INT *int_number;
 
-int_number nrnModul;
-int_number nrnMinusOne;
-
-// int_number nrnModul;
-// int_number nrnMinusOne;
+int_number nrnModul = NULL;
+int_number nrnMinusOne = NULL;
+unsigned long nrnExponent = 0;
+unsigned long long nrnBase = 0;
 
 /*
@@ -90 +89 @@
   mpz_pow_ui(erg, (int_number) a, 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;
 }
@@ -205 +209 @@
     if (!nrnIsUnit((number) erg))
     {
-      WarnS("Division by non divisible element.");
+      WarnS("Division not possible, even by cancelling zero divisors.");
       WarnS("Result is zero.");
+      mpz_set_ui(erg, 0);
+      mpz_clear(gcd);
+      omFree(gcd);
+      return (number) erg;
     }
-    gcd = (int_number) nrnInvers((number) erg);
+    int_number tmp = (int_number) omAlloc(sizeof(MP_INT)); // evtl. spaeter mit bin
+    mpz_init(tmp);
+    tmp = (int_number) nrnInvers((number) erg);
     mpz_divexact(erg, (int_number) a, gcd);
-    mpz_mul(erg, erg, gcd);
+    mpz_mul(erg, erg, tmp);
     mpz_clear(gcd);
     omFree(gcd);
+    mpz_clear(tmp);
+    omFree(tmp);
     mpz_mod(erg, erg, nrnModul);
     return (number) erg;
@@ -228 +240 @@
 number  nrnInvers (number c)
 {
-  number s;
-  number t;
-  number k;
-/*
- * Give the largest non unit k, such that a = x * k, b = y * k has
- * a solution and r, s, s.t. k = s*a + t*b
- */
-  k = nrnExtGcd((number) nrnModul, c, &s, &t);
-  if (!nrnIsOne((number) k))
-  {
-    WarnS("Non invertible element.");
-    return nrnInit(0);                                   //TODO
-  }
-  mpz_clear((int_number) k);
-  omFree((ADDRESS) k);
-  mpz_clear((int_number) s);
-  omFree((ADDRESS) s);
-  return (number) t;
+  int_number erg = (int_number) omAlloc(sizeof(MP_INT)); // evtl. spaeter mit bin
+  mpz_init(erg);
+  mpz_invert(erg, (int_number) c, nrnModul);
+  return (number) erg;
 }
 
@@ -266 +264 @@
  */
 
+void mpz_set_ull(int_number res, unsigned long long xx)
+{
+  unsigned long h = xx >> 32;
+  mpz_set_ui (res, h);
+  mpz_mul_2exp (res, res, 32);
+  mpz_add_ui (res, res, (unsigned long) xx);
+}
+
 void nrnSetExp(int m, ring r)
 {
-  nrnModul = (int_number) nrnInit(m);
+  if ((nrnBase == r->ringflaga) && (nrnExponent == r->ringflagb)) return;
+  nrnBase = r->ringflaga;
+  nrnExponent = r->ringflagb;
+  if (nrnModul != NULL)
+  {
+    mpz_clear(nrnModul);
+    omFree(nrnModul);
+    mpz_clear(nrnMinusOne);
+    omFree(nrnMinusOne);
+  }
+  nrnModul = (int_number) omAlloc(sizeof(MP_INT)); // evtl. spaeter mit bin
+  mpz_init(nrnModul);
+  mpz_set_ull(nrnModul, nrnBase);
+  mpz_pow_ui(nrnModul, nrnModul, nrnExponent);
+
   nrnMinusOne = (int_number) omAlloc(sizeof(MP_INT)); // evtl. spaeter mit bin
   mpz_init(nrnMinusOne);
   mpz_sub_ui(nrnMinusOne, nrnModul, 1);
-
-//  PrintS("Modul: ");
-//  Print("%d\n", nrnModul);
 }
 
 void nrnInitExp(int m, ring r)
 {
-  nrnModul = (int_number) nrnInit(m);
-  nrnMinusOne = (int_number) omAlloc(sizeof(MP_INT)); // evtl. spaeter mit bin
-  mpz_init(nrnMinusOne);
-  mpz_sub_ui(nrnMinusOne, nrnModul, 1);
-  if (m < 2)
+  nrnSetExp(m, r);
+  if (mpz_cmp_ui(nrnModul,2) <= 0)
   {
     WarnS("nInitChar failed");

kernel/structs.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: structs.h,v 1.41 2007-11-09 11:29:44 Singular Exp $ */
+/* $Id: structs.h,v 1.42 2008-01-30 16:14:25 wienand Exp $ */
 /*
 * ABSTRACT
@@ -550 +550 @@
 #ifdef HAVE_RINGS
   unsigned int ringtype;  /* cring = 0 => coefficient field, cring = 1 => coeffs from Z/2^m */
-  unsigned long ringflaga;
-  unsigned int ringflagb;
+  unsigned long long ringflaga;
+  unsigned long ringflagb;
 #endif
   int        ref; /* reference counter to the ring */