Changeset 1eef69 in git

Timestamp:

Jan 19, 2009, 1:43:53 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

0883ed62762dee5f6c5fa37f064d3883b99dc21f

Parents:

9655929209cd775b5b7cd5bc61d5b70c75f911b3

Message:

*hannes: optim


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

File:

• kernel/rmodulon.cc (modified) (23 diffs)

kernel/rmodulon.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: rmodulon.cc,v 1.31 2008-12-08 15:00:43 Singular Exp $ */
+/* $Id: rmodulon.cc,v 1.32 2009-01-19 12:43:53 Singular Exp $ */
 /*
 * ABSTRACT: numbers modulo n
@@ -21 +21 @@
 
 #ifdef HAVE_RINGMODN
-
-omBin gmp_nrn_bin = omGetSpecBin(sizeof(MP_INT));
+  #ifdef HAVE_RINGZ
+    #define gmp_nrn_bin gmp_nrz_bin
+    extern omBin gmp_nrz_bin;
+  #else
+    omBin gmp_nrn_bin = omGetSpecBin(sizeof(MP_INT));
+  #endif
 
 int_number nrnModul = NULL;
@@ -33 +37 @@
 number nrnInit (int i)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrn_bin);
   mpz_init_set_si(erg, i);
   mpz_mod(erg, erg, nrnModul);
@@ -49 +53 @@
 number nrnCopy(number a)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrn_bin);
   mpz_init_set(erg, (int_number) a);
   return (number) erg;
@@ -78 +82 @@
 number nrnMult (number a, number b)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrn_bin);
   mpz_init(erg);
   mpz_mul(erg, (int_number) a, (int_number) b);
@@ -87 +91 @@
 void nrnPower (number a, int i, number * result)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrn_bin);
   mpz_init(erg);
   mpz_powm_ui(erg, (int_number) a, i, nrnModul);
@@ -95 +99 @@
 number nrnAdd (number a, number b)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrn_bin);
   mpz_init(erg);
   mpz_add(erg, (int_number) a, (int_number) b);
@@ -104 +108 @@
 number nrnSub (number a, number b)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrn_bin);
   mpz_init(erg);
   mpz_sub(erg, (int_number) a, (int_number) b);
@@ -113 +117 @@
 number nrnNeg (number c)
 {
-// nNeg inplace !!! TODO
-//  int_number erg = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
-//  mpz_init(erg);
+// nNeg inplace !!!
   mpz_sub((int_number) c, nrnModul, (int_number) c);
   return c;
@@ -122 +124 @@
 number  nrnInvers (number c)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrn_bin);
   mpz_init(erg);
   mpz_invert(erg, (int_number) c, nrnModul);
@@ -148 +150 @@
 {
   if ((a == NULL) && (b == NULL)) return nrnInit(0);
-  int_number erg = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrn_bin);
   mpz_init_set(erg, nrnModul);
   if (a != NULL) mpz_gcd(erg, erg, (int_number) a);
@@ -158 +160 @@
 number nrnGcd3 (number a,number b, number c,ring r)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrn_bin);
   mpz_init(erg);
   if (a == NULL) a = (number) nrnModul;
@@ -176 +178 @@
 number  nrnExtGcd (number a, number b, number *s, number *t)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
-  int_number bs = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
-  int_number bt = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrn_bin);
+  int_number bs = (int_number) omAllocBin(gmp_nrn_bin);
+  int_number bt = (int_number) omAllocBin(gmp_nrn_bin);
   mpz_init(erg);
   mpz_init(bs);
@@ -291 +293 @@
 {
   if (a == NULL) a = (number) nrnModul;
-  int_number erg = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrn_bin);
   mpz_init(erg);
   if (mpz_divisible_p((int_number) a, (int_number) b))
@@ -323 +325 @@
 number nrnIntDiv (number a,number b)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrn_bin);
   mpz_init(erg);
   if (a == NULL) a = (number) nrnModul;
@@ -343 +345 @@
 number nrnMap2toM(number from)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrn_bin);
   mpz_init(erg);
   mpz_mul_ui(erg, nrnMapCoef, (NATNUMBER) from);
@@ -352 +354 @@
 number nrnMapZp(number from)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrn_bin);
   mpz_init(erg);
   mpz_mul_si(erg, nrnMapCoef, (NATNUMBER) from);
@@ -361 +363 @@
 number nrnMapGMP(number from)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrn_bin);
   mpz_init(erg);
   mpz_mod(erg, (int_number) from, nrnModul);
@@ -369 +371 @@
 number nrnMapQ(number from)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrn_bin);
   mpz_init(erg);
   nlGMP(from, (number) erg);
@@ -395 +397 @@
     else
     {
-      int_number nrnMapModul = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+      int_number nrnMapModul = (int_number) omAllocBin(gmp_nrn_bin);
       // Computing the n of Z/n
       if (rField_is_Zp(src))
@@ -411 +413 @@
       if (nrnMapCoef == NULL)
       {
-        nrnMapCoef = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+        nrnMapCoef = (int_number) omAllocBin(gmp_nrn_bin);
         mpz_init(nrnMapCoef);
       }
@@ -464 +466 @@
   if (nrnModul == NULL)
   {
-    nrnModul = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+    nrnModul = (int_number) omAllocBin(gmp_nrn_bin);
     mpz_init(nrnModul);
-    nrnMinusOne = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+    nrnMinusOne = (int_number) omAllocBin(gmp_nrn_bin);
     mpz_init(nrnMinusOne);
   }
@@ -543 +545 @@
 const char * nrnRead (const char *s, number *a)
 {
-  int_number z = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
+  int_number z = (int_number) omAllocBin(gmp_nrn_bin);
   {
     s = nlCPEatLongC((char *)s, z);