Changeset 8c6bd4d in git

Timestamp:

Dec 14, 2012, 9:47:04 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'd1b01e9d51ade4b46b745d3bada5c5f3696be3a8')

Children:

4880569a037a922b03f2231fda984a5263af7b86

Parents:

6bb9d98190052a76f6d3e74e821b63ea531d8124

Message:

fix: init Z/* from bigint's

Location:

libpolys/coeffs

Files:

• rintegers.cc (modified) (1 diff)
• rintegers.h (modified) (1 diff)
• rmodulo2m.cc (modified) (3 diffs)
• rmodulo2m.h (modified) (2 diffs)
• rmodulon.cc (modified) (2 diffs)
• rmodulon.h (modified) (1 diff)

libpolys/coeffs/rintegers.cc

@@ -403 +403 @@
   r->cfExtGcd = nrzExtGcd; // only for ring stuff
   r->cfDivBy = nrzDivBy; // only for ring stuff
+  r->cfInit_bigint = nrzMapQ;
   //#endif
   r->cfNeg   = nrzNeg;

libpolys/coeffs/rintegers.h

@@ -53 +53 @@
 void    nrzDelete(number *a, const coeffs r);
 
-number nrzMapQ(number from);
+number nrzMapQ(number from, const coeffs src, const coeffs dst);
 #endif
 #endif

libpolys/coeffs/rmodulo2m.cc

@@ -90 +90 @@
   r->cfName        = ndName;
   r->cfCoeffWrite  = nr2mCoeffWrite;
+  r->cfInit_bigint = nr2mMapQ;
 #ifdef LDEBUG
   r->cfDBTest      = nr2mDBTest;
@@ -559 +560 @@
 }
 
-number nr2mMapQ(number from, const coeffs /*src*/, const coeffs dst)
+number nr2mMapQ(number from, const coeffs src, const coeffs dst)
 {
   int_number erg = (int_number)omAllocBin(gmp_nrz_bin);
@@ -566 +567 @@
   mpz_init_set_ui(k, dst->mod2mMask);
 
-  nlGMP(from, (number)erg, dst);
+  nlGMP(from, (number)erg, src);
   mpz_and(erg, erg, k);
   number res = (number)mpz_get_ui(erg);

libpolys/coeffs/rmodulo2m.h

@@ -54 +54 @@
 void    nr2mInitExp(int c, const coeffs r);
 
+number nr2mMapQ(number from, const coeffs src, const coeffs dst);
 
 static inline number nr2mMultM(number a, number b, const coeffs r)
@@ -77 +78 @@
 #define nr2mEqualM(A,B)  ((A)==(B))
 
+
 #endif
 #endif

libpolys/coeffs/rmodulon.cc

@@ -99 +99 @@
   r->cfCoeffWrite  = nrnCoeffWrite;
   r->nCoeffIsEqual = nrnCoeffsEqual;
+  r->cfInit_bigint = nrnMapQ;
+
 #ifdef LDEBUG
   r->cfDBTest      = nrnDBTest;
@@ -483 +485 @@
 }
 
-number nrnMapQ(number from, const coeffs src, const coeffs /*dst*/)
+number nrnMapQ(number from, const coeffs src, const coeffs dst)
 {
   int_number erg = (int_number)omAllocBin(gmp_nrz_bin);
   mpz_init(erg);
   nlGMP(from, (number)erg, src);
-  mpz_mod(erg, erg, src->modNumber);
+  mpz_mod(erg, erg, dst->modNumber);
   return (number)erg;
 }

libpolys/coeffs/rmodulon.h

@@ -55 +55 @@
 void    nrnInitExp(unsigned long c, const coeffs r);
 
+number nrnMapQ(number from, const coeffs src, const coeffs dst);
 #endif
 #endif