Changeset 7af488e in git

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

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

Files:

• coeffs/numbers.cc (modified) (6 diffs)
• coeffs/test.cc (modified) (6 diffs)
• misc/auxiliary.h.in (modified) (1 diff)
• tests/coeffs_test.h (modified) (11 diffs)
• tests/polys_test.h (modified) (52 diffs)
• tests/rings_test.h (modified) (1 diff)

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) )

libpolys/misc/auxiliary.h.in

@@ -39 +39 @@
 #endif
 
+#ifndef HAVE_POLYEXTENSIONS
+#undef HAVE_POLYEXTENSIONS
+#endif
 // ----------------  end of parts/extensions
 // -----------------  configure stuff

libpolys/tests/coeffs_test.h

@@ -370 +370 @@
    {
 #ifdef HAVE_RINGS
-     n_coeffType type = nRegister( n_Z2m, nr2mInitChar); TS_ASSERT( type == n_Z2m ); 
+     n_coeffType type = n_Z2m;
      TS_ASSERT( Test(type, (void*) 4) );
 #endif
@@ -377 +377 @@
    void test_Zp101()
    {
-     n_coeffType type = nRegister( n_Zp, npInitChar); TS_ASSERT( type == n_Zp );
+     n_coeffType type = n_Zp;
      TS_ASSERT( Test(type, (void*) 101) );
    }
@@ -384 +384 @@
    {
 #ifdef HAVE_RINGS
-     n_coeffType type = nRegister( n_Z2m, nr2mInitChar); TS_ASSERT( type == n_Z2m ); 
+     n_coeffType type =  n_Z2m;
      TS_ASSERT( Test(type, (void*) 8) );
 #endif
    }
    
-   void simple(const n_coeffType _type, cfInitCharProc p)
-   {
-     n_coeffType type = nRegister( _type, p);
+   void simple(const n_coeffType _type)
+   {
+     n_coeffType type = _type;
      TS_ASSERT( type == _type ); // ?
      TS_ASSERT( Test(type) );
@@ -398 +398 @@
    void test_Q()
    {
-     simple(n_Q, nlInitChar);
+     simple(n_Q);
    }
    
    void test_R()
    {
-     simple(n_R, nrInitChar);
+     simple(n_R);
    }
 
@@ -410 +410 @@
    {
 #ifdef HAVE_RINGS
-     simple(n_Z, nrzInitChar);  // No need in GMP?
+     simple(n_Z);  // No need in GMP?
 #endif
    }
@@ -417 +417 @@
    void test_GF_toobig()
    {
-     n_coeffType type = nRegister( n_GF, nfInitChar);
-     TS_ASSERT( type == n_GF );
+     n_coeffType type = n_GF;
 
      GFInfo param;
@@ -436 +435 @@
      // TODO: what if it was already registered?
      // Q: no way to deRegister a type?
-     n_coeffType type = nRegister( n_GF, nfInitChar);
-     TS_ASSERT( type == n_GF );
+     n_coeffType type = n_GF;
 
      GFInfo param;
@@ -456 +454 @@
 #ifdef HAVE_RINGS
      //  TODO(Somebody, This will result in memory corruption at Z_2^m later on (due to the succs. setGMPFloatDigits?)...!?); // ????
-     n_coeffType type = nRegister( n_Zn, nrnInitChar); TS_ASSERT( type == n_Zn );
+     n_coeffType type = n_Zn;
 
      TS_ASSERT( Test(type, (void*) 3) );
@@ -465 +463 @@
    {
 #ifdef HAVE_RINGS
-     n_coeffType type = nRegister( n_Z2m, nr2mInitChar); TS_ASSERT( type == n_Z2m );
+     n_coeffType type = n_Z2m;
 
      TS_ASSERT( Test(type, (void*) 2) );
@@ -476 +474 @@
    {
      setGMPFloatDigits( 10, 5 ); // Init global variables in mpr_complex.cc for gmp_float's... // Note that this seems also to be required for Z_2^m (and Zn?)!????
-     simple(n_long_R, ngfInitChar);
+     simple(n_long_R);
    }
    
@@ -482 +480 @@
    {
      setGMPFloatDigits( 10, 5 ); // Init global variables in mpr_complex.cc for gmp_float's... // Note that this seems also to be required for Z_2^m (and Zn?)!????
-     simple(n_long_C, ngcInitChar);
+     simple(n_long_C);
    }  
 

libpolys/tests/polys_test.h

@@ -31 +31 @@
     virtual bool setUpWorld()
     {
-    
+
       GlobalPrintingFixture::setUpWorld();
-      
-
-      TS_ASSERT_EQUALS( nRegister( n_Zp, npInitChar), n_Zp );
-      TS_ASSERT_EQUALS( nRegister( n_GF, nfInitChar), n_GF );
-      TS_ASSERT_EQUALS( nRegister( n_R, nrInitChar), n_R );
-      TS_ASSERT_EQUALS( nRegister( n_Q, nlInitChar), n_Q );
-      TS_ASSERT_EQUALS( nRegister( n_R, nrInitChar), n_R );
-      
+
+
+      //TS_ASSERT_EQUALS( nRegister( n_Zp, npInitChar), n_Zp );
+      //TS_ASSERT_EQUALS( nRegister( n_GF, nfInitChar), n_GF );
+      //TS_ASSERT_EQUALS( nRegister( n_R, nrInitChar), n_R );
+      //TS_ASSERT_EQUALS( nRegister( n_Q, nlInitChar), n_Q );
+      //TS_ASSERT_EQUALS( nRegister( n_R, nrInitChar), n_R );
+
 #ifdef HAVE_RINGS
-      TS_ASSERT_EQUALS( nRegister( n_Z, nrzInitChar), n_Z ); // these are UNusable at the moment!
+      //TS_ASSERT_EQUALS( nRegister( n_Z, nrzInitChar), n_Z ); // these are UNusable at the moment!
 #endif
-      
+
       return true;
     }
@@ -59 +59 @@
 namespace
 {
-  
+
   void PrintRing(const ring r)
   {
@@ -71 +71 @@
   {
     p_Test(a,r);
-    
+
     StringSetS("");
     p_Write(a, r);
@@ -79 +79 @@
     std::stringstream ss;  ss << s;
 
-    StringSetS("");  
+    StringSetS("");
     return ss.str();
   }
@@ -87 +87 @@
     std::clog << _2S(a, r) << ", of size: " << p_Size(a, r);
 
-    if( eoln ) 
-      std::clog << std::endl;  
+    if( eoln )
+      std::clog << std::endl;
   }
 
@@ -103 +103 @@
   TS_ASSERT_DIFFERS( r    , NULLp);
   TS_ASSERT_DIFFERS( r->cf, NULLp);
-  
-  
+
+
   clog << ( _2S("TEST: sum[0..") + _2S(N) + "]: ");
   clog << endl;
@@ -111 +111 @@
 
   const int ssss = (N * (N+1)) / 2;
-  
+
   poly sum1 = p_ISet(ssss, r);
   clog<< "poly(N*(N+1)/2) (int: " << ssss << "): "; PrintSized(sum1, r);
@@ -122 +122 @@
   i = p_Mult_q(s, i, r); s = NULL;
 
-  clog<< "poly(N)*poly(N+1): (int: "<< N*(N+1) << "): "; PrintSized(i, r);  
+  clog<< "poly(N)*poly(N+1): (int: "<< N*(N+1) << "): "; PrintSized(i, r);
 
   number t = n_Init(2, r->cf);
-  clog<< "number(2): "; PrintSized(t, r->cf);  
+  clog<< "number(2): "; PrintSized(t, r->cf);
 
   if( !n_IsZero( t, r->cf) )
@@ -132 +132 @@
     {
       number ii = p_GetCoeff(i, r);
-      clog<< "number(poly(N)*poly(N+1)): "; PrintSized(ii, r->cf);  
+      clog<< "number(poly(N)*poly(N+1)): "; PrintSized(ii, r->cf);
 
 #ifdef HAVE_RINGS
@@ -139 +139 @@
        res = p_Div_nn(i, t, r); i = NULL;
     }
-    
-      
+
+
 
     clog<< "(poly(N)*poly(N+1))/number(2): "; PrintSized(res, r);
@@ -157 +157 @@
   } else
     TS_ASSERT_EQUALS( n_GetChar(r->cf), 2);
-  
+
   n_Delete(&t, r->cf);
 
@@ -171 +171 @@
     ss = p_Add_q(ss, i, r); // ss -= i
   }
-  
-  clog<< "ss(-sum): "; PrintSized(ss, r);  
+
+  clog<< "ss(-sum): "; PrintSized(ss, r);
 
   ss = p_Neg(ss, r); // ss = -ss
- 
+
   clog<< "real sum    : "; PrintSized(s, r);
-  clog<< "real sum(--): "; PrintSized(ss, r);  
+  clog<< "real sum(--): "; PrintSized(ss, r);
 
   TS_ASSERT( p_EqualPolys(s, ss, r) );
@@ -184 +184 @@
   TODO(somebody, fix the delete method!);
 
-  Delete(sum1, r); 
+  Delete(sum1, r);
   Delete(res, r);
 
-  Delete(s, r);    
-  Delete(ss, r);    
+  Delete(s, r);
+  Delete(ss, r);
 
   clog << ( " >>> TEST DONE!" );
@@ -194 +194 @@
 
 }
-   
+
 void Test(const ring r)
 {
@@ -211 +211 @@
 }
 
-class PolysTestSuite : public CxxTest::TestSuite 
+class PolysTestSuite : public CxxTest::TestSuite
 {
 private:
@@ -238 +238 @@
     number two = n_Init(2, r);
 
-    number t = n_Init(1, r);  
-    ndInpAdd(t, t, r);  
+    number t = n_Init(1, r);
+    ndInpAdd(t, t, r);
     TS_ASSERT( n_Equal(two, t, r) );
     n_Delete(&t, r);
-  
+
     if( getCoeffType(r) == n_Q )
     {
-      number t = n_Init(1, r);  
+      number t = n_Init(1, r);
       nlInpAdd(t, t, r);
       TS_ASSERT( n_Equal(two, t, r) );
       n_Delete(&t, r);
     }
-  
+
     const int N = 66666;
 
     number a = n_Init(N, r);
-   
+
     clog<< "a: "; PrintSized(a, r);
 
@@ -264 +264 @@
 
     clog<< "aa = a + a: "; PrintSized(aa, r);
-  
+
     number aa2 = n_Mult(a, two, r);
 
@@ -270 +270 @@
 
     number aa1 = n_Mult(two, a, r);
- 
+
     clog<< "aa1 = 2 * a: "; PrintSized(aa1, r);
 
@@ -277 +277 @@
 
     a = n_Sub( aa, aa1, r );
-  
+
     clog<< "a = aa - aa1: "; PrintSized(a, r);
 
@@ -303 +303 @@
     TS_ASSERT( n_Equal(aa, aa2, r) );
     TS_ASSERT( n_Equal(aa1, aa2, r) );
-  
+
     TS_ASSERT( n_Equal(aa0, aa, r) );
     TS_ASSERT( n_Equal(aa0, aa1, r) );
@@ -325 +325 @@
 
     const unsigned long ssss = (N * (N+1)) / 2;
-    
+
     number sum1 = n_Init(ssss, r);
     clog<< "N*(N+1)/2 (int: " << ssss << "): "; PrintSized(sum1, r);
@@ -335 +335 @@
     ndInpMult(s, i, r);
     n_Delete(&i, r);
-    
-    clog<< "N*(N+1): ("<< N*(N+1) << ")"; PrintSized(s, r);  
-    
+
+    clog<< "N*(N+1): ("<< N*(N+1) << ")"; PrintSized(s, r);
+
     i = n_Init(2, r);
-    clog<< "2: "; PrintSized(i, r);  
+    clog<< "2: "; PrintSized(i, r);
 
     if( !n_IsZero( i, r) )
@@ -346 +346 @@
       TS_ASSERT( n_DivBy(s, i, r) );
   #endif
-       
+
       res = n_Div(s, i, r);
-    
+
       clog<< "N*(N+1)/2: "; PrintSized(res, r);
 
@@ -355 +355 @@
       TS_ASSERT( n_IsZeroDivisor(d, r) );
       n_Delete(&d, r);
-      
+
       if( n_GetChar(r) == 0 )
       {
@@ -363 +363 @@
     } else
       TS_ASSERT_EQUALS( n_GetChar(r), 2);
-    
+
 
     n_Delete(&s, r);  n_Delete(&i, r);
-    
-    n_Delete(&sum1, r); n_Delete(&res, r);    
-    
+
+    n_Delete(&sum1, r); n_Delete(&res, r);
+
 
     s = n_Init(0  , r);
@@ -379 +379 @@
       i = n_Neg(i, r);
       ndInpAdd(ss, i, r); // ss -= i
-      
-      n_Delete(&i, r);    
+
+      n_Delete(&i, r);
     }
-    clog<< "ss: "; PrintSized(ss, r);  
+    clog<< "ss: "; PrintSized(ss, r);
 
     ss = n_Neg(ss, r); // ss = -ss
-   
+
     clog<< "real sum    : "; PrintSized(s, r);
-    clog<< "real sum(--): "; PrintSized(ss, r);  
+    clog<< "real sum(--): "; PrintSized(ss, r);
 
     TS_ASSERT( n_Equal(s, ss, r) );
     TS_ASSERT( n_Equal(ss, s, r) );
 
-    n_Delete(&s, r);    
-    n_Delete(&ss, r);    
+    n_Delete(&s, r);
+    n_Delete(&ss, r);
 
     clog << ( " >>> TEST DONE!" );
@@ -405 +405 @@
 
     char* n[] = {"t"};
-    ring r = rDefault( 13, 1, n);     
+    ring r = rDefault( 13, 1, n);
     TS_ASSERT_DIFFERS( r, NULLp );
 
@@ -420 +420 @@
 
     Test(r);
-     
+
     rDelete(r);
   }
@@ -429 +429 @@
 
     char* n[] = {"s"};
-    ring r = rDefault( 0, 1, n);     
+    ring r = rDefault( 0, 1, n);
     TS_ASSERT_DIFFERS( r, NULLp );
 
@@ -436 +436 @@
     TS_ASSERT( rField_is_Domain(r) );
     TS_ASSERT( rField_is_Q(r) );
-    
+
     TS_ASSERT( !rField_is_Zp(r) );
     TS_ASSERT( !rField_is_Zp(r, 11) );
@@ -446 +446 @@
     rDelete(r);
   }
-  
+
   void test_Z11_x_y_z()
   {
      clog << "Creating  Z/11[x, y, z]: " << endl;
-     
+
      char* n[] = {"x", "y", "z"};
-     ring r = rDefault( 11, 3, n);     
+     ring r = rDefault( 11, 3, n);
      TS_ASSERT_DIFFERS( r, NULLp );
 
      PrintRing(r);
-     
+
      TS_ASSERT( rField_is_Domain(r) );
      TS_ASSERT( !rField_is_Q(r) );
@@ -467 +467 @@
 
      Test(r);
-     
+
      rDelete(r);
   }
@@ -475 +475 @@
 
      char* n[] = {"x", "y", "z", "u"};
-     ring r = rDefault( 0, 4, n);     
+     ring r = rDefault( 0, 4, n);
      TS_ASSERT_DIFFERS( r, NULLp );
 
@@ -489 +489 @@
 
      Test(r);
-      
+
      rDelete(r);
    }
@@ -535 +535 @@
      rDelete(r); // kills 'cf' as well!
    }
-   
+
   void test_Q_Ext_a()
   {
@@ -548 +548 @@
     TS_ASSERT( rField_is_Domain(r) );
     TS_ASSERT( rField_is_Q(r) );
-    
+
     TS_ASSERT( !rField_is_Zp(r) );
     TS_ASSERT( !rField_is_Zp(r, 11) );
@@ -560 +560 @@
     minIdeal->m[0] = minPoly;                       // minIdeal = < a^2 + 1 >
 
-    n_coeffType type = nRegister(n_algExt, naInitChar); 
+    n_coeffType type = nRegister(n_algExt, naInitChar);
     TS_ASSERT(type == n_algExt);
 
@@ -566 +566 @@
     extParam.r = r;
     extParam.i = minIdeal;
-    
+
     clog << "Next create the extension field Q[a]/<a2+1>..." << endl;
 
     const coeffs cf = nInitChar(type, &extParam);   // Q[a]/<a2+1>
-    
+
     if( cf == NULL )
       TS_FAIL("Could not get needed coeff. domain");
 
     TS_ASSERT_DIFFERS( cf->cfCoeffWrite, NULLp );
-  
+
     if( cf->cfCoeffWrite != NULL )
     {
-      clog << "Coeff-domain: "  << endl; 
+      clog << "Coeff-domain: "  << endl;
       n_CoeffWrite(cf); PrintLn();
     }
-    
+
     TS_ASSERT( nCoeff_is_algExt(cf) );
     TS_ASSERT( !nCoeff_is_transExt(cf) );
-    
+
     // some tests for the coefficient field represented by cf:
     TestArithCf(cf);
@@ -595 +595 @@
     clog << "Finally create the polynomial ring (Q[a]/<a2+1>)[x, y]..."
          << endl;
-    
+
     char* m[] = {"x", "y"};
     ring s = rDefault(cf, 2, m);   // (Q[a]/<a2+1>)[x, y]
@@ -613 +613 @@
 
     Test(s);
-    
+
     clog << endl
          << "Now let's compute some inverses in Q[a]/<a^2+1>..."
          << endl;
-    
+
     poly u;
     u = NULL; plusTerm(u, 1, 1, 1, cf->extRing);
@@ -649 +649 @@
     TS_ASSERT( rField_is_Domain(r) );
     TS_ASSERT( rField_is_Q(r) );
-    
+
     TS_ASSERT( !rField_is_Zp(r) );
     TS_ASSERT( !rField_is_Zp(r, 11) );
@@ -661 +661 @@
     minIdeal->m[0] = minPoly;                       // minIdeal = < b^7 + 17 >
 
-    n_coeffType type = nRegister(n_algExt, naInitChar); 
+    n_coeffType type = nRegister(n_algExt, naInitChar);
     TS_ASSERT(type == n_algExt);
 
@@ -667 +667 @@
     extParam.r = r;
     extParam.i = minIdeal;
-    
+
     clog << "Next create the extension field Q[b]/<b^7+17>..." << endl;
 
     const coeffs cf = nInitChar(type, &extParam);   // Q[b]/<b^7+17>
-    
+
     if( cf == NULL )
       TS_FAIL("Could not get needed coeff. domain");
 
     TS_ASSERT_DIFFERS( cf->cfCoeffWrite, NULLp );
-  
+
     if( cf->cfCoeffWrite != NULL )
     {
-      clog << "Coeff-domain: "  << endl; 
+      clog << "Coeff-domain: "  << endl;
       n_CoeffWrite(cf); PrintLn();
     }
-    
+
     TS_ASSERT( nCoeff_is_algExt(cf) );
     TS_ASSERT( !nCoeff_is_transExt(cf) );
-    
+
     // some tests for the coefficient field represented by cf:
     TestArithCf(cf);
@@ -696 +696 @@
     clog << "Finally create the polynomial ring (Q[b]/<b^7+17>)[u, v, w]..."
          << endl;
-    
+
     char* m[] = {"u", "v", "w"};
     ring s = rDefault(cf, 3, m);   // (Q[b]/<b^7+17>)[u, v, w]
@@ -714 +714 @@
 
     Test(s);
-    
+
     clog << endl
          << "Now let's compute some inverses in Q[b]/<b^7+17>..."
          << endl;
-         
+
     poly u;
     u = NULL; plusTerm(u, 1, 1, 2, cf->extRing);
@@ -730 +730 @@
          << "Now let's check a gcd computation in Q[b]..."
          << endl;
-    
+
     poly v;
     v = NULL; plusTerm(v, 1, 1, 2, cf->extRing);
@@ -743 +743 @@
                       (number)v, cf);   // (b^2 + 7b + 1)^2 * (2b^2 - 61b)
     p_Delete(&v, cf->extRing);
-    
+
     clog << "z = "; p_Write((poly)z, cf->extRing);
     clog << "y = "; p_Write((poly)y, cf->extRing);
     number theGcd = n_Gcd(z, y, cf);   // should yield w = (b^2 + 7b + 1)^2
     clog << "gcd(z, y) = "; p_Write((poly)theGcd, cf->extRing);
-    
+
     v = (poly)n_Sub(theGcd, w, cf);
     TS_ASSERT( v == NULL );
     p_Delete(&v, cf->extRing);
-    
+
     clog << endl
          << "Now let's check an ext_gcd computation in Q[b]..."
          << endl;
-         
+
     poly zFactor; poly yFactor;
     poly ppp = p_ExtGcd((poly)z, zFactor, (poly)y, yFactor, cf->extRing);
@@ -772 +772 @@
     number v4 = n_Sub(v3, w, cf);
     TS_ASSERT( v4 == NULL );
-    
+
     p_Delete(&ppp, cf->extRing); p_Delete(&zFactor, cf->extRing);
     p_Delete(&yFactor, cf->extRing);
@@ -793 +793 @@
     TS_ASSERT( rField_is_Domain(r) );
     TS_ASSERT( !rField_is_Q(r) );
-    
+
     TS_ASSERT( rField_is_Zp(r) );
     TS_ASSERT( rField_is_Zp(r, 17) );
@@ -805 +805 @@
     minIdeal->m[0] = minPoly;                       // minIdeal = < a^2 + 3 >
 
-    n_coeffType type = nRegister(n_algExt, naInitChar); 
+    n_coeffType type = nRegister(n_algExt, naInitChar);
     TS_ASSERT(type == n_algExt);
 
@@ -811 +811 @@
     extParam.r = r;
     extParam.i = minIdeal;
-    
+
     clog << "Next create the extension field Z_17[a]/<a^2+3>..." << endl;
 
     const coeffs cf = nInitChar(type, &extParam);   // Z_17[a]/<a^2+3>
-    
+
     if( cf == NULL )
       TS_FAIL("Could not get needed coeff. domain");
 
     TS_ASSERT_DIFFERS( cf->cfCoeffWrite, NULLp );
-    
+
     if( cf->cfCoeffWrite != NULL )
     {
-      clog << "Coeff-domain: "  << endl; 
+      clog << "Coeff-domain: "  << endl;
       n_CoeffWrite(cf); PrintLn();
     }
-    
+
     TS_ASSERT( nCoeff_is_algExt(cf) );
     TS_ASSERT( !nCoeff_is_transExt(cf) );
-    
+
     // some tests for the coefficient field represented by cf:
     TestArithCf(cf);
@@ -840 +840 @@
     clog << "Finally create the polynomial ring (Z_17[a]/<a^2+3>)[u, v, w]..."
          << endl;
-    
+
     char* m[] = {"u", "v", "w"};
     ring s = rDefault(cf, 3, m);   // (Z_17[a]/<a^2+3>)[u, v, w]

libpolys/tests/rings_test.h

@@ -31 +31 @@
       
 
-      TS_ASSERT_EQUALS( nRegister( n_Zp, npInitChar), n_Zp );
-      TS_ASSERT_EQUALS( nRegister( n_GF, nfInitChar), n_GF );
-      TS_ASSERT_EQUALS( nRegister( n_R, nrInitChar), n_R );
-      TS_ASSERT_EQUALS( nRegister( n_Q, nlInitChar), n_Q );
-      TS_ASSERT_EQUALS( nRegister( n_R, nrInitChar), n_R );
+      //TS_ASSERT_EQUALS( nRegister( n_Zp, npInitChar), n_Zp );
+      //TS_ASSERT_EQUALS( nRegister( n_GF, nfInitChar), n_GF );
+      //TS_ASSERT_EQUALS( nRegister( n_R, nrInitChar), n_R );
+      //TS_ASSERT_EQUALS( nRegister( n_Q, nlInitChar), n_Q );
+      //TS_ASSERT_EQUALS( nRegister( n_R, nrInitChar), n_R );
       
 #ifdef HAVE_RINGS
-      TS_ASSERT_EQUALS( nRegister( n_Z, nrzInitChar), n_Z ); // these are UNusable at the moment!
+      //TS_ASSERT_EQUALS( nRegister( n_Z, nrzInitChar), n_Z ); // these are UNusable at the moment!
 #endif