Changeset 36a8e9 in git

Timestamp:

Jun 10, 2014, 11:57:17 AM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

52fa8a3284f79b8d72886464bd296025aa27a7e3

Parents:

6e062273c073575d1a635a3589c406ab6d4e0547

Message:

general nCoeff_is_field, nCoeff_is_domain

Location:

libpolys

Files:

• coeffs/OPAE.cc (modified) (1 diff)
• coeffs/OPAEQ.cc (modified) (1 diff)
• coeffs/OPAEp.cc (modified) (1 diff)
• coeffs/coeffs.h (modified) (4 diffs)
• coeffs/ffields.cc (modified) (1 diff)
• coeffs/gnumpc.cc (modified) (1 diff)
• coeffs/gnumpfl.cc (modified) (1 diff)
• coeffs/longrat.cc (modified) (1 diff)
• coeffs/modulop.cc (modified) (1 diff)
• coeffs/rintegers.cc (modified) (1 diff)
• coeffs/rmodulo2m.cc (modified) (1 diff)
• coeffs/rmodulon.cc (modified) (1 diff)
• coeffs/shortfl.cc (modified) (1 diff)
• polys/clapconv.cc (modified) (2 diffs)
• polys/ext_fields/algext.cc (modified) (1 diff)
• polys/ext_fields/transext.cc (modified) (1 diff)

libpolys/coeffs/OPAE.cc

@@ -309 +309 @@
 BOOLEAN n_AEInitChar(coeffs r, void *)
 {
+    // r->is_field, r->is_domain?
     r->ch = 0;
     r->cfKillChar=NULL;

libpolys/coeffs/OPAEQ.cc

@@ -302 +302 @@
 BOOLEAN n_QAEInitChar(coeffs r, void *)
 {
+    // r->is_field,is_domain?
     r->ch=0;
     r->cfKillChar=NULL;

libpolys/coeffs/OPAEp.cc

@@ -327 +327 @@
 BOOLEAN n_pAEInitChar(coeffs r, void *p)
 {
+    // r->is_field, is_domain
     //Charakteristik abgreifen!
     const int c = (int) (long) p;

libpolys/coeffs/coeffs.h

@@ -92 +92 @@
 struct n_Procs_s
 {
+   // administration of coeffs:
    coeffs next;
-   /*unsigned int ringtype;   =0 => coefficient field,
-                             !=0 => coeffs from one of the rings:
-                              =1 => Z/2^mZ
-                              =2 => Z/nZ, n not a prime
-                              =3 => Z/p^mZ
-                              =4 => Z */
+   int     ref;
+   n_coeffType type;
+   /// how many variables of factory are already used by this coeff
+   int     factoryVarOffset;
 
    // general properties:
@@ -106 +105 @@
    /// if false, then a gcd routine is used for a content computation
    BOOLEAN has_simple_Inverse;
+
+   /// TRUE, if cf is a field
+   BOOLEAN is_field;
+   /// TRUE, if cf is a domain
+   BOOLEAN is_domain;
 
    // tests for numbers.cc:
@@ -283 +287 @@
    /// the 0 as constant, NULL by default
    number nNULL;
-   int     ref;
-   /// how many variables of factort are already used by this coeff
-   int     factoryVarOffset;
-   n_coeffType type;
-
 
    /// Number of Parameters in the coeffs (default 0)
@@ -707 +706 @@
 
 static inline BOOLEAN nCoeff_is_Ring(const coeffs r)
-{ 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)
+{ assume(r != NULL); return (r->is_field==0); }
+
+/// returns TRUE, if r is a field or r has no zero divisors (i.e is a domain)
 static inline BOOLEAN nCoeff_is_Domain(const coeffs r)
 {
   assume(r != NULL);
-#ifdef HAVE_RINGS
-  return (getCoeffType(r)==n_Z || ((getCoeffType(r)!=n_Z2m) && (getCoeffType(r)!=n_Zn) && (getCoeffType(r)!=n_Znm)));
-#else
-  return TRUE;
-#endif
+  return (r->is_domain);
 }
 

libpolys/coeffs/ffields.cc

@@ -830 +830 @@
 BOOLEAN nfInitChar(coeffs r,  void * parameter)
 {
+  r->is_field=TRUE;
+  r->is_domain=TRUE;
   //r->cfInitChar=npInitChar;
   r->cfKillChar=nfKillChar;

libpolys/coeffs/gnumpc.cc

@@ -473 +473 @@
 {
   assume( getCoeffType(n) == ID );
+  n->is_field=TRUE;
+  n->is_domain=TRUE;
 
   n->cfKillChar = ngcKillChar;

libpolys/coeffs/gnumpfl.cc

@@ -411 +411 @@
   assume( getCoeffType(n) == ID );
 
+  n->is_field=TRUE;
+  n->is_domain=TRUE;
+
   n->cfKillChar = ndKillChar; /* dummy */
 

libpolys/coeffs/longrat.cc

@@ -2976 +2976 @@
 BOOLEAN nlInitChar(coeffs r, void*p)
 {
+  r->is_field=TRUE;
+  r->is_domain=TRUE;
+
   assume( getCoeffType(r) == ID );
   //const int ch = (int)(long)(p);

libpolys/coeffs/modulop.cc

@@ -454 +454 @@
 
   int i, w;
+
+  r->is_field=TRUE;
+  r->is_domain=TRUE;
 
   r->ch = c;

libpolys/coeffs/rintegers.cc

@@ -405 +405 @@
 {
   assume( getCoeffType(r) == ID );
+
+  r->is_field=FALSE;
+  r->is_domain=TRUE;
+
   r->nCoeffIsEqual = ndCoeffIsEqual;
   r->cfCoeffString = nrzCoeffString;

libpolys/coeffs/rmodulo2m.cc

@@ -102 +102 @@
   assume( getCoeffType(r) == ID );
   nr2mInitExp((int)(long)(p), r);
+
+  r->is_field=FALSE;
+  r->is_domain=FALSE;
+
   r->cfKillChar    = ndKillChar; /* dummy*/
   r->nCoeffIsEqual = nr2mCoeffIsEqual;

libpolys/coeffs/rmodulon.cc

@@ -117 +117 @@
      is a GMP number */
   r->ch = mpz_get_ui(r->modNumber);
+
+  r->is_field=FALSE;
+  r->is_domain=FALSE;
+
 
   r->cfCoeffString = nrnCoeffString;

libpolys/coeffs/shortfl.cc

@@ -665 +665 @@
   assume( p == NULL );
 
+  n->is_field=TRUE;
+  n->is_domain=TRUE;
+
   n->cfKillChar = ndKillChar; /* dummy */
   n->ch = 0;

libpolys/polys/clapconv.cc

@@ -91 +91 @@
   BOOLEAN setChar=TRUE;
 
+  p=pReverse(p);
   while ( p!=NULL )
   {
@@ -104 +105 @@
     result += term;
     pIter( p );
-  }
+ }
  return result;
 }

libpolys/polys/ext_fields/algext.cc

@@ -1420 +1420 @@
      directly accessible in cf: */
   cf->ch = R->cf->ch;
+  
+  cf->is_field=TRUE;
+  cf->is_domain=TRUE;
 
   #ifdef LDEBUG

libpolys/polys/ext_fields/transext.cc

@@ -2423 +2423 @@
      directly accessible in cf: */
   cf->ch = R->cf->ch;
+
+  cf->is_field=TRUE;
+  cf->is_domain=TRUE;
+
   cf->factoryVarOffset = R->cf->factoryVarOffset + rVar(R);
   extern char* naCoeffString(const coeffs r);