Changeset 66ce6d in git for libpolys/coeffs

Timestamp:

Jan 8, 2013, 1:07:50 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2aee667644f2d68561171e8c9ca4258221af3702

Parents:

f3057e70e4aa29729c2cb61a6794e057fb4351b7

git-author:

Martin Lee <martinlee84@web.de>2013-01-08 13:07:50+01:00

git-committer:

Martin Lee <martinlee84@web.de>2013-01-17 18:24:09+01:00

Message:

chg: got rid of ringtype

Location:

libpolys/coeffs

Files:

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

libpolys/coeffs/coeffs.h

@@ -94 +94 @@
 {
    coeffs next;
-   unsigned int ringtype;  /* =0 => coefficient field,
+   /*unsigned int ringtype;   =0 => coefficient field,
                              !=0 => coeffs from one of the rings:
                               =1 => Z/2^mZ
@@ -609 +609 @@
 // Tests:
 static inline BOOLEAN nCoeff_is_Ring_2toM(const coeffs r)
-{ assume(r != NULL); return (r->ringtype == 1); }
+{ assume(r != NULL); return (getCoeffType(r)==n_Z2m); }
 
 static inline BOOLEAN nCoeff_is_Ring_ModN(const coeffs r)
-{ assume(r != NULL); return (r->ringtype == 2); }
+{ assume(r != NULL); return (getCoeffType(r)==n_Zn); }
 
 static inline BOOLEAN nCoeff_is_Ring_PtoM(const coeffs r)
-{ assume(r != NULL); return (r->ringtype == 3); }
+{ assume(r != NULL); return (getCoeffType(r)==n_Znm); }
 
 static inline BOOLEAN nCoeff_is_Ring_Z(const coeffs r)
-{ assume(r != NULL); return (r->ringtype == 4); }
+{ assume(r != NULL); return (getCoeffType(r)==n_Z); }
 
 static inline BOOLEAN nCoeff_is_Ring(const coeffs r)
-{ assume(r != NULL); return (r->ringtype != 0); }
+{ assume(r != NULL); return ((getCoeffType(r)==n_Z) || (getCoeffType(r)==n_Z2m) || (getCoeffType(r)==n_Zn) || (getCoeffType(r)==n_Znm)); }
 
 /// returns TRUE, if r is not a field and r has no zero divisors (i.e is a domain)
@@ -628 +628 @@
   assume(r != NULL); 
 #ifdef HAVE_RINGS
-  return (r->ringtype == 4 || r->ringtype == 0);
+  return (getCoeffType(r)==n_Z || ((getCoeffType(r)!=n_Z2m) && (getCoeffType(r)!=n_Zn) && (getCoeffType(r)!=n_Znm)));
 #else
   return TRUE;
@@ -707 +707 @@
 /// returns TRUE, if r is not a field and r has non-trivial units
 static inline BOOLEAN nCoeff_has_Units(const coeffs r)
-{ assume(r != NULL); return ((r->ringtype == 1) || (r->ringtype == 2) || (r->ringtype == 3)); }
+{ assume(r != NULL); return ((getCoeffType(r)==n_Zn) || (getCoeffType(r)==n_Z2m) || (getCoeffType(r)==n_Znm)); }
 
 static inline BOOLEAN nCoeff_is_Zp(const coeffs r)

libpolys/coeffs/rintegers.cc

@@ -430 +430 @@
   r->nNULL = 0;
   r->ch = 0;
-  r->ringtype = 4;
   r->has_simple_Alloc=FALSE;
   r->has_simple_Inverse=FALSE;

libpolys/coeffs/rmodulo2m.cc

@@ -54 +54 @@
   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);

libpolys/coeffs/rmodulon.cc

@@ -55 +55 @@
   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 */
@@ -508 +504 @@
       nCoeff_is_Ring_2toM(src) || nCoeff_is_Zp(src))
   {
-    if (   (src->ringtype > 0)
+    if (   (!nCoeff_is_Zp(src))
         && (mpz_cmp(src->modBase, dst->modBase) == 0)
         && (src->modExponent == dst->modExponent)) return nrnMapGMP;