Changeset 0486a3 in git

Timestamp:

Dec 14, 2012, 4:47:41 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

2e85a17b690d4918b676bac33fbbe5a019e58dad

Parents:

f489beab9ee2066d042d018e9e5db927bdfe99a4

Message:

fix: init of Z/n^m
- now takes a ZnmInfo with modBase=n and modExponent=m

Location:

libpolys/coeffs

Files:

• rmodulon.cc (modified) (4 diffs)
• rmodulon.h (modified) (2 diffs)

libpolys/coeffs/rmodulon.cc

@@ -25 +25 @@
 /// Our Type!
 static const n_coeffType ID = n_Zn;
+static const n_coeffType ID2 = n_Znm;
 
 extern omBin gmp_nrz_bin;
@@ -32 +33 @@
   long l = (long)mpz_sizeinbase(r->modBase, 10) + 2;
   char* s = (char*) omAlloc(l);
-  if (nCoeff_is_Ring_ModN(r)) Print("//  Z/%s\n", s);
-  else if (nCoeff_is_Ring_PtoM(r)) Print("//  Z/%s^%lu\n", s, r->modExponent);
+  s= mpz_get_str (s, 10, r->modBase);
+  if (nCoeff_is_Ring_ModN(r)) Print("//   coeff. ring is : Z/%s\n", s);
+  else if (nCoeff_is_Ring_PtoM(r)) Print("//   coeff. ring is : Z/%s^%lu\n", s, r->modExponent);
   omFreeSize((ADDRESS)s, l);
 }
@@ -47 +49 @@
 BOOLEAN nrnInitChar (coeffs r, void* p)
 {
-  assume( getCoeffType(r) == ID );
-  nrnInitExp((int)(long)(p), r);
-  r->ringtype = 2;
-
+  assume( (getCoeffType(r) == ID) || (getCoeffType (r) == ID2) );
+  ZnmInfo * info= (ZnmInfo *) p;
+  r->modBase = (int_number) omAlloc(sizeof(mpz_t));
+  mpz_init_set (r->modBase, info->base);
+
+  nrnInitExp (info->exp, r);
+
+  if (info->exp > 1)
+    r->ringtype= 3;
+  else
+    r->ringtype= 2;
   /* next computation may yield wrong characteristic as r->modNumber
      is a GMP number */
@@ -564 +573 @@
  */
 
-void nrnSetExp(int m, coeffs r)
+void nrnSetExp(unsigned long m, coeffs r)
 {
   /* clean up former stuff */
-  if (r->modBase   != NULL) mpz_clear(r->modBase);
+  //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->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(r->modNumber);
-  mpz_set(r->modNumber, r->modBase);
-  /* mpz_pow_ui(r->modNumber, r->modNumber, r->modExponent); */
-}
-
-/* We expect this ring to be Z/m for some m > 2 which is not a prime. */
-void nrnInitExp(int m, coeffs r)
-{
-  if (m <= 2) WarnS("nrnInitExp failed (m in Z/m too small)");
+  mpz_init_set (r->modNumber, r->modBase);
+  mpz_pow_ui (r->modNumber, r->modNumber, m);
+}
+
+/* We expect this ring to be Z/n^m for some m > 0 and for some n > 2 which is not a prime. */
+void nrnInitExp(unsigned long m, coeffs r)
+{
   nrnSetExp(m, r);
+  assume (r->modNumber != NULL);
+  if (mpz_cmp_ui(r->modNumber,2) <= 0)
+    WarnS("nrnInitExp failed (m in Z/m too small)");
 }
 

libpolys/coeffs/rmodulon.h

@@ -14 +14 @@
 #define NATNUMBER unsigned long
 #endif
+
+typedef struct { int_number base; NATNUMBER exp; } ZnmInfo;
 
 BOOLEAN nrnInitChar    (coeffs r, void*);
@@ -50 +52 @@
 BOOLEAN nrnDBTest      (number a, const char *f, const int l, const coeffs r);
 #endif
-void    nrnSetExp(int c, const coeffs r);
-void    nrnInitExp(int c, const coeffs r);
+void    nrnSetExp(unsigned long c, const coeffs r);
+void    nrnInitExp(unsigned long c, const coeffs r);
 
 #endif