Changeset 27ffeb in git

Timestamp:

May 20, 2010, 6:19:08 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7dc3e1ccdbb09e272b92ea5e626578cdfadb0864

Parents:

aff5ae9de50f937ee37e0cb1ec117c015c914e3e

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2010-05-20 18:19:08+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:54:57+01:00

Message:

nSetChar, nKillChar

Location:

coeffs

Files:

• numbers.cc (modified) (3 diffs)
• numbers.h (modified) (2 diffs)

coeffs/numbers.cc

@@ -102 +102 @@
 number  ndExtGcd (number a, number b, number *s, number *t) { return nInit(1); }
 #endif
-
-/*2
-* init operations for characteristic c (complete==TRUE)
-* init nDelete    for characteristic c (complete==FALSE)
-*/
-void nSetChar(coeffs r)
-{
-  /*----------------------generic ----------------*/
-    if ( r->cfSetChar!=NULL) r->cfSetChar(r);
-
-  // not yet ready:
-  #if 0 /* vertagt*/
-  /*--------------------- Q_a/ Zp_a -----------------*/
-  else if (nField_is_Extension(r))
-  {
-    if (r->minpoly != NULL)
-    {
-      naSetChar(c,r);
-      if (rField_is_Q_a(r)) r->nInit_bigint=naMap00;
-      if (rField_is_Zp_a(r)) r->nInit_bigint=naMap0P;
-    }
-    else
-    {
-      ntSetChar(c,r);
-      if (rField_is_Q_a(r)) r->nInit_bigint=ntMap00;
-      if (rField_is_Zp_a(r)) r->nInit_bigint=ntMap0P;
-    }
-  }
-  #endif
-#ifdef HAVE_RINGS
-  /*----------------------ring Z / 2^m----------------*/
-  else if (nField_is_Ring_2toM(r))
-  {
-  //  nr2mSetExp(c, r);
-  //  r->nInit_bigint=nr2mMapQ;
-  }
-  /*----------------------ring Z ----------------*/
-  else if (nField_is_Ring_Z(r))
-  {
-  //  nrzSetExp(c, r);
-  //  r->nInit_bigint=nrzMapQ;
-  }
-  /*----------------------ring Z / n----------------*/
-  else if (nField_is_Ring_ModN(r))
-  {
-  //  nrnSetExp(c, r);
-  //  r->nInit_bigint=nrnMapQ;
-  }
-  /*----------------------ring Z / n----------------*/
-  else if (nField_is_Ring_PtoM(r))
-  {
-  //  nrnSetExp(c, r);
-  //  r->nInit_bigint=nrnMapQ;
-  }
-#endif
-  /* -------------- GF(p^m) -----------------------*/
-  else if (nField_is_GF(r))
-  {
-  //  nfSetChar(c,r->parameter);
-  }
-  /* -------------- R -----------------------*/
-  //if (c==(-1))
-  else if (nField_is_R(r))
-  {
-  //  r->nInit_bigint=nrMapQ;
-  }
-  /* -------------- long R -----------------------*/
-  /* -------------- long C -----------------------*/
-  else if ((nField_is_long_R(r))
-  || (nField_is_long_C(r)))
-  {
-   // setGMPFloatDigits(r->float_len,r->float_len2);
-   // if (nField_is_long_R(r)) r->nInit_bigint=ngfMapQ;
-   // else                     r->nInit_bigint=ngcMapQ;
-  }
-#ifdef TEST
-  /* -------------- R -----------------------*/
-  //if (c==(-1))
-  else if (!nField_is_R(r) && !nField_is_Q(r))
-  {
-    WerrorS("unknown field");
-  }
-#endif
-}
 
 static n_coeffType nLastCoeffs=n_Z2n;
@@ -304 +220 @@
         r->cfDelete(&(r->nNULL),r);
         if (r->cfKillChar!=NULL) r->cfKillChar(r);
-        /* was:
-        switch(r->type)
-        {
-          case n_Zp_a:
-          case n_Q_a:
-               {
-                 number n=r->minpoly;
-                 if (n!=NULL)
-                 {
-                   r->minpoly=NULL;
-                   naDelete(&n,r);
-                 }
-               }
-               break;
-            default:
-                 break;
-        }
-        */
         omFreeSize((void *)r, sizeof(n_Procs_s));
         r=NULL;
@@ -331 +229 @@
       r->cf=NULL;
     }
-    //if (r->algring!=NULL)
-    //{
-    //  rKill(r->algring);
-    //  r->algring=NULL;
-    //}
   }
 }

coeffs/numbers.h

@@ -55 +55 @@
 /* prototypes */
 void           nNew(number * a);
-#define        nInit(i) n_Init(i,currRing)
-#define nWrite(A) n_Write(A,currRing)
 
 #define nTest(a) (1)
@@ -91 +89 @@
 #define nGetChar() n_GetChar(currRing)
 
-void nInitChar(coeffs r); // do one-time initialisations
-void nKillChar(coeffs r); // undo all initialisations
-void nSetChar(coeffs r); // initialisations after each ring chage
+/// one-time initialisations for new coeffs
+coeffs nInitChar(n_coeffType t, void * parameter);
+/// undo all initialisations
+void nKillChar(coeffs r);
+/// initialisations after each ring change
+inline void nSetChar(coeffs r)
+{
+  if ((r!=NULL) && (r->cfSetChar!=NULL)) r->cfSetChar(r);
+}
 
 #define nDivBy0 "div by 0"