Changeset f0797c in git for libpolys

Timestamp:

May 25, 2011, 2:42:41 PM (12 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

cdf22a94dc67efa0ec23a42eb27722000f1e3645

Parents:

141342d81455232f75bdb4b9179a8cd396939ba4

git-author:

Frank Seelisch <seelisch@mathematik.uni-kl.de>2011-05-25 14:42:41+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:36:52+01:00

Message:

char and ringtype related stuff

Location:

libpolys/coeffs

Files:

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

libpolys/coeffs/coeffs.h

@@ -70 +70 @@
    coeffs next;
    unsigned int ringtype;  /* =0 => coefficient field,
-                             !=0 => coeffs from one of the rings */
+                             !=0 => coeffs from one of the rings:
+                              =1 => Z/2^mZ
+                              =2 => Z/nZ, n not a prime
+                              =3 => Z/p^mZ
+                              =4 => Z */
 
    // general properties:
@@ -213 +217 @@
   unsigned long mod2mMask;
 #endif
-  int        ch;  /* characteristic, rInit */
+  int        ch;  /* characteristic, rInit
+                     PLEASE DOCUMENT HERE when this will be negative! */
 
   short      float_len; /* additional char-flags, rInit */
@@ -452 +457 @@
 {
   assume(r != NULL);
-printf("###### %d, %d\n", r->ringtype, r->ch);
-printf("###### %d, %d, %d\n", getCoeffType(r), n_algExt, n_transExt);
   return (r->ringtype == 0) &&
          ((getCoeffType(r)==n_algExt) || (getCoeffType(r)==n_transExt)) &&

libpolys/coeffs/modulop.cc

@@ -408 +408 @@
   // the variables:
   r->nNULL = (number)0;
-  //r->type = n_Zp;
+  r->type = n_Zp;
   r->ch = c;
   r->has_simple_Alloc=TRUE;

libpolys/coeffs/rintegers.cc

@@ -426 +426 @@
   r->nNULL = 0;
   r->type = n_Z;
-  r->ch = 0;
+  r->ringtype = 4;
   r->has_simple_Alloc=FALSE;
   r->has_simple_Inverse=FALSE; 

libpolys/coeffs/rmodulo2m.cc

@@ -47 +47 @@
   r->cfKillChar    = ndKillChar; /* dummy*/
   r->nCoeffIsEqual = nr2mCoeffIsEqual;
+
+  r->ringtype = 1;
+  r->type = n_Z2m;
 
   r->cfInit        = nr2mInit;

libpolys/coeffs/rmodulon.cc

@@ -47 +47 @@
   
   nrnInitExp((int)(long)(p), r);
+  r->ringtype = 2;
+  r->type = n_Zn;
 
   r->cfInit        = nrnInit;
@@ -488 +490 @@
   }
   // Some type of Z/n ring / field
-  if (nCoeff_is_Ring_ModN(src) || nCoeff_is_Ring_PtoM(src) || nCoeff_is_Ring_2toM(src) || nCoeff_is_Zp(src))
+  if (nCoeff_is_Ring_ModN(src) || nCoeff_is_Ring_PtoM(src) ||
+      nCoeff_is_Ring_2toM(src) || nCoeff_is_Zp(src))
   {
     if (   (src->ringtype > 0)