Changeset 7af488e in git for libpolys/coeffs/numbers.cc

Timestamp:

May 27, 2011, 11:39:02 AM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

9bb545791780a99344a26d6177decb3870f6da87

Parents:

6ccdd3ad26bd7de442ab57e7cc95352fcf0de398

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-05-27 11:39:02+02:00

git-committer:

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

Message:

nRegister not needed any more for standard coeffs

File:

• libpolys/coeffs/numbers.cc (modified) (6 diffs)

libpolys/coeffs/numbers.cc

@@ -30 +30 @@
 #endif
 
+#ifdef HAVE_POLYEXTENSIONS
+#include <polys/ext_fields/algext.h>
+#endif
+
 #ifdef HAVE_FACTORY
 #include <factory/factory.h>
@@ -153 +157 @@
 }
 
-static n_coeffType nLastCoeffs=n_Z2m;
-static cfInitCharProc *nInitCharTable=NULL;
+static n_coeffType nLastCoeffs=n_CF;
+cfInitCharProc nInitCharTableDefault[]=
+{ NULL,        /*n_unknown */
+ npInitChar,   /* n_Zp */
+ nlInitChar,   /* n_Q */
+ nrInitChar,   /* n_R */
+ nfInitChar,   /* n_GF */
+ ngfInitChar,  /* n_long_R */
+ #ifdef HAVE_POLYEXTENSIONS
+ naInitChar,  /* n_algExt */
+ #else
+ NULL,        /* n_algExt */
+ #endif
+ NULL, /* n_transExt */
+ ngcInitChar,  /* n_long_C */
+ #ifdef HAVE_RINGS
+ nrzInitChar,  /* n_Z */
+ nrnInitChar,  /* n_Zn */
+ NULL,         /* n_Zpn */
+ nr2mInitChar, /* n_Z2m */
+ #else
+ NULL,         /* n_Z */
+ NULL,         /* n_Zn */
+ NULL,         /* n_Zpn */
+ NULL,         /* n_Z2m */
+ #endif
+ NULL   /* n_CF */
+};
+
+static cfInitCharProc *nInitCharTable=nInitCharTableDefault;
 /*2
 * init operations for coeffs r
@@ -206 +238 @@
     BOOLEAN nOK=TRUE;
     // init
-    if ((nInitCharTable!=NULL) && (t<=nLastCoeffs))
+    if ((t<=nLastCoeffs) && (nInitCharTable[t]!=NULL))
       nOK = (nInitCharTable[t])(n,parameter);
     else
-       Werror("coeff init missing for %d",(int)t);
+       Werror("nInitCharTable[%d] missing",(int)t);
     if (nOK)
     {
@@ -311 +343 @@
 }
 
+
 n_coeffType nRegister(n_coeffType n, cfInitCharProc p)
 {
@@ -316 +349 @@
   {
     nLastCoeffs=(n_coeffType)(int(nLastCoeffs)+1);
-    if (nInitCharTable==NULL)
+    if (nInitCharTable==nInitCharTableDefault)
     {
       nInitCharTable=(cfInitCharProc*)omAlloc0(
                                           nLastCoeffs*sizeof(cfInitCharProc));
+      memcpy(nInitCharTable,nInitCharTableDefault,
+              (nLastCoeffs-1)*sizeof(cfInitCharProc));
     }
     else
@@ -333 +368 @@
   else
   {
-    if (nInitCharTable==NULL)
-    {
-      nInitCharTable=(cfInitCharProc*)omAlloc0(
-                                         ((int) nLastCoeffs)*sizeof(cfInitCharProc));
-    }
+    if (nInitCharTable[n]!=NULL) Print("coeff %d already initialized\n",n);
     nInitCharTable[n]=p;
     return n;