Changeset 1becad6 in git

Timestamp:

Jul 25, 2018, 4:22:15 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

9db01c30e58b69cea80286060c314b842bf78bd0

Parents:

353a420eaae03625adff5f686e51a11aea7aab96

Message:

chg: nCoeff_is_Ring_ModN/rField_is_Ring_ModN -> nCoeff_is_Zn/rField_is_Zn

Location:

libpolys

Files:

• coeffs/coeffs.h (modified) (2 diffs)
• coeffs/longrat.cc (modified) (1 diff)
• coeffs/modulop.cc (modified) (1 diff)
• coeffs/rintegers.cc (modified) (2 diffs)
• coeffs/rmodulo2m.cc (modified) (1 diff)
• coeffs/rmodulon.cc (modified) (5 diffs)
• polys/monomials/ring.cc (modified) (1 diff)
• polys/monomials/ring.h (modified) (2 diffs)
• tests/coeffs_test.h (modified) (1 diff)

libpolys/coeffs/coeffs.h

@@ -747 +747 @@
 { assume(r != NULL); return (getCoeffType(r)==n_Z2m); }
 
-static FORCE_INLINE BOOLEAN nCoeff_is_Ring_ModN(const coeffs r)
-{ assume(r != NULL); return (getCoeffType(r)==n_Zn); }
-
 static FORCE_INLINE BOOLEAN nCoeff_is_Ring_PtoM(const coeffs r)
 { assume(r != NULL); return (getCoeffType(r)==n_Znm); }
@@ -757 +754 @@
 #else
 #define nCoeff_is_Ring_2toM(A) 0
-#define nCoeff_is_Ring_ModN(A) 0
 #define nCoeff_is_Ring_PtoM(A) 0
 #define nCoeff_is_Ring(A)      0

libpolys/coeffs/longrat.cc

@@ -2342 +2342 @@
   }
 #ifdef HAVE_RINGS
-  if (src->rep==n_rep_gmp) // nCoeff_is_Z(src) || nCoeff_is_Ring_PtoM(src) || nCoeff_is_Ring_ModN(src))
+  if (src->rep==n_rep_gmp) // nCoeff_is_Z(src) || nCoeff_is_Ring_PtoM(src) || nCoeff_is_Zn(src))
   {
     return nlMapGMP;

libpolys/coeffs/modulop.cc

@@ -660 +660 @@
     return npMapMachineInt;
   }
-  if (src->rep==n_rep_gmp) //nCoeff_is_Z(src) || nCoeff_is_Ring_PtoM(src) || nCoeff_is_Ring_ModN(src))
+  if (src->rep==n_rep_gmp) //nCoeff_is_Z(src) || nCoeff_is_Ring_PtoM(src) || nCoeff_is_Zn(src))
   {
     return npMapGMP;

libpolys/coeffs/rintegers.cc

@@ -347 +347 @@
   /* dst = nrn */
   if ((src->rep==n_rep_gmp)
-  && (nCoeff_is_Z(src) || nCoeff_is_Ring_ModN(src) || nCoeff_is_Ring_PtoM(src)))
+  && (nCoeff_is_Z(src) || nCoeff_is_Zn(src) || nCoeff_is_Ring_PtoM(src)))
   {
     return ndCopyMap; //nrzCopyMap;
@@ -1631 +1631 @@
 {
   /* dst = rintegers */
-  if (src->rep==n_rep_gmp) //nCoeff_is_Ring_ModN(src) || nCoeff_is_Ring_PtoM(src))
+  if (src->rep==n_rep_gmp) //nCoeff_is_Zn(src) || nCoeff_is_Ring_PtoM(src))
     return nrzModNMap;
 

libpolys/coeffs/rmodulo2m.cc

@@ -699 +699 @@
   }
   if ((src->rep==n_rep_gmp) &&
-  (nCoeff_is_Ring_PtoM(src) || nCoeff_is_Ring_ModN(src)))
+  (nCoeff_is_Ring_PtoM(src) || nCoeff_is_Zn(src)))
   {
     if (mpz_divisible_2exp_p(src->modNumber,dst->modExponent))

libpolys/coeffs/rmodulon.cc

@@ -43 +43 @@
   if (l<10)
   {
-    if (nCoeff_is_Ring_ModN(r)) Print("ZZ/%s", s);
+    if (nCoeff_is_Zn(r)) Print("ZZ/%s", s);
     else if (nCoeff_is_Ring_PtoM(r)) Print("ZZ/(%s^%lu)", s, r->modExponent);
   }
@@ -49 +49 @@
   #endif
   {
-    if (nCoeff_is_Ring_ModN(r)) Print("ZZ/bigint(%s)", s);
+    if (nCoeff_is_Zn(r)) Print("ZZ/bigint(%s)", s);
     else if (nCoeff_is_Ring_PtoM(r)) Print("ZZ/(bigint(%s)^%lu)", s, r->modExponent);
   }
@@ -94 +94 @@
   s= mpz_get_str (s, 10, r->modBase);
   int ll;
-  if (nCoeff_is_Ring_ModN(r))
+  if (nCoeff_is_Zn(r))
     ll=snprintf(nrnCoeffName_buff,l,"ZZ/bigint(%s)",s);
   else if (nCoeff_is_Ring_PtoM(r))
@@ -117 +117 @@
   b= mpz_get_str (b, 10, r->modBase);
   char* s = (char*) omAlloc(15+l);
-  if (nCoeff_is_Ring_ModN(r)) sprintf(s,"ZZ/%s",b);
+  if (nCoeff_is_Zn(r)) sprintf(s,"ZZ/%s",b);
   else /*if (nCoeff_is_Ring_PtoM(r))*/ sprintf(s,"ZZ/(bigint(%s)^%lu)",b,r->modExponent);
   omFreeSize(b,l);
@@ -829 +829 @@
   }
   // Some type of Z/n ring / field
-  if (nCoeff_is_Ring_ModN(src) || nCoeff_is_Ring_PtoM(src) ||
+  if (nCoeff_is_Zn(src) || nCoeff_is_Ring_PtoM(src) ||
       nCoeff_is_Ring_2toM(src) || nCoeff_is_Zp(src))
   {

libpolys/polys/monomials/ring.cc

@@ -5129 +5129 @@
   if (rField_is_long_C(r)) return n_long_C;
   if (rField_is_Z(r))         return n_Z;
-  if (rField_is_Ring_ModN(r)) return n_Zn;
+  if (rField_is_Zn(r))        return n_Zn;
   if (rField_is_Ring_PtoM(r)) return n_Znm;
   if (rField_is_Ring_2toM(r)) return  n_Z2m;

libpolys/polys/monomials/ring.h

@@ -470 +470 @@
 { assume(r != NULL); assume(r->cf != NULL); return ( nCoeff_is_Ring_2toM(r->cf) ); }
 
-static inline BOOLEAN rField_is_Ring_ModN(const ring r)
-{ assume(r != NULL); assume(r->cf != NULL); return ( nCoeff_is_Ring_ModN(r->cf) ); }
-
 static inline BOOLEAN rField_is_Ring_PtoM(const ring r)
 { assume(r != NULL); assume(r->cf != NULL); return ( nCoeff_is_Ring_PtoM(r->cf) ); }
@@ -487 +484 @@
 #define rField_is_Ring(A) (0)
 #define rField_is_Ring_2toM(A) (0)
-#define rField_is_Ring_ModN(A) (0)
 #define rField_is_Ring_PtoM(A) (0)
 #define rField_is_Domain(A) (1)

libpolys/tests/coeffs_test.h

@@ -269 +269 @@
 
       TS_ASSERT( !nCoeff_is_Ring_2toM( r ));
-      TS_ASSERT( !nCoeff_is_Ring_ModN( r ));
+      TS_ASSERT( !nCoeff_is_Zn( r ));
       TS_ASSERT( !nCoeff_is_Ring_PtoM( r ));
       TS_ASSERT( !nCoeff_is_Z( r ));