Changeset 7af488e in git for libpolys/coeffs

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

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

Location:

libpolys/coeffs

Files:

• numbers.cc (modified) (6 diffs)
• test.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;

libpolys/coeffs/test.cc

@@ -274 +274 @@
 #ifdef HAVE_RINGS
 //  TODO(Frank, Segmentation fault! (if used wihout omalloc???). Please_ investigate!);
-  type = nRegister( n_Z2m, nr2mInitChar); assume( type == n_Z2m ); 
+  type =  n_Z2m;
   if( Test(type, (void*) 4) )
     c ++;
 #endif
 
-  type = nRegister( n_Zp, npInitChar); assume( type == n_Zp );
+  type =  n_Zp;
   if( Test(type, (void*) 101) )
     c ++;
@@ -286 +286 @@
 //  TODO(Frank, memmory corruption_ if used wihout omalloc??? Please_ investigate!);
 
-  type = nRegister( n_Z2m, nr2mInitChar); assume( type == n_Z2m ); 
+  type = n_Z2m;
   if( Test(type, (void*) 8) )
     c ++;
@@ -293 +293 @@
 
   
-  type = nRegister( n_Q, nlInitChar); assume( type == n_Q );
-  if( Test(type) )
-    c ++;
-
-  type = nRegister( n_R, nrInitChar); assume( type == n_R );
-  if( Test(type) )
-    c ++;
-
-#ifdef HAVE_RINGS
-  type = nRegister( n_Z, nrzInitChar); assume( type == n_Z ); // No need in GMP?
-  if( Test(type) )
-    c ++;
-#endif
-   type = nRegister( n_GF, nfInitChar); assume( type == n_GF );
+  type =  n_Q;
+  if( Test(type) )
+    c ++;
+
+  type = n_R;
+  if( Test(type) )
+    c ++;
+
+#ifdef HAVE_RINGS
+  type = n_Z;
+  if( Test(type) )
+    c ++;
+#endif
+   type = n_GF;
 
 
@@ -340 +340 @@
 //  TODO(Somebody, This will result in memory corruption at Z_2^m later on (due to the succs. setGMPFloatDigits?)...!?); // ????
 
-  type = nRegister( n_Zn, nrnInitChar); assume( type == n_Zn );
+  type = n_Zn;
 
   if( Test(type, (void*) 3) )
@@ -351 +351 @@
 
 
-  type = nRegister( n_long_C, ngcInitChar); assume( type == n_long_C );
-  if( Test(type) )
-    c ++;
-
-  type = nRegister( n_long_R, ngfInitChar); assume( type == n_long_R );
-  if( Test(type) )
-    c ++;
-
-#ifdef HAVE_RINGS
-  type = nRegister( n_Z2m, nr2mInitChar); assume( type == n_Z2m ); 
+  type = n_long_C;
+  if( Test(type) )
+    c ++;
+
+  type = n_long_R;
+  if( Test(type) )
+    c ++;
+
+#ifdef HAVE_RINGS
+  type = n_Z2m;
   if( Test(type, (void*) 2) )
     c ++;
@@ -367 +367 @@
 
 #ifdef HAVE_RINGS
-  type = nRegister( n_Zn, nrnInitChar); assume( type == n_Zn );
+  type = n_Zn;
 
   if( Test(type, (void*) 3) )