Changeset 488056 in git

Timestamp:

Dec 17, 2012, 1:10:48 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

a453bfa3c5e9178b6ada6c3e4b3500f7b3e65b6f

Parents:

8c6bd4d4de4c46d6d974085a44f6e1530d956d5a

Message:

fix: more fixes to init of Z/*

Location:

libpolys/coeffs

Files:

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

libpolys/coeffs/rmodulo2m.cc

@@ -51 +51 @@
   r->nCoeffIsEqual = nr2mCoeffIsEqual;
 
-  r->modBase = (int_number) omAlloc(sizeof(mpz_t));
+  r->modBase = (int_number) omAllocBin (gmp_nrz_bin);
   mpz_init_set_si (r->modBase, 2L);
   r->ringtype = 1;
+  r->modNumber= (int_number) omAllocBin (gmp_nrz_bin);
+  mpz_init (r->modNumber);
+  mpz_pow_ui (r->modNumber, r->modBase, r->modExponent);
 
   /* next cast may yield an overflow as mod2mMask is an unsigned long */

libpolys/coeffs/rmodulon.cc

@@ -51 +51 @@
   assume( (getCoeffType(r) == ID) || (getCoeffType (r) == ID2) );
   ZnmInfo * info= (ZnmInfo *) p;
-  r->modBase = (int_number) omAlloc(sizeof(mpz_t));
+  r->modBase = (int_number) omAllocBin (gmp_nrz_bin);
   mpz_init_set (r->modBase, info->base);
 
@@ -578 +578 @@
 {
   /* clean up former stuff */
-  //if (r->modBase   != NULL) mpz_clear(r->modBase);
   if (r->modNumber != NULL) mpz_clear(r->modNumber);
 
   r->modExponent= m;
-  /* this is Z/m = Z/(m^1), hence set modBase = m, modExponent = 1: */
-  //r->modBase = (int_number)omAllocBin(gmp_nrz_bin);
-  //mpz_init(r->modBase);
-  //mpz_set_ui(r->modBase, (unsigned long)m);
   r->modNumber = (int_number)omAllocBin(gmp_nrz_bin);
   mpz_init_set (r->modNumber, r->modBase);