Changeset e6c3d1 in git for libpolys/coeffs/coeffs.h

Timestamp:

Jan 18, 2013, 3:20:53 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '4bd32dfef92ec9f5ed8dceee82d14318ae147107')

Children:

271d25946dbb409d16650bb1ecdffccf0c03594e65eb96fdc6f956671461df48dd8f6bde869c96f8

Parents:

2aee667644f2d68561171e8c9ca4258221af3702ebdbfddc10fbb7eff4bf79217b5742f5f24d9a78

Message:

Merge pull request #252 from alexanderdreyer/spielwiese-pyobject

Ensuring ./configure picks python2 

File:

• libpolys/coeffs/coeffs.h (modified) (4 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)