Changeset fb0a699 in git

Timestamp:

Mar 2, 2011, 6:49:02 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

16f8f1227d3e09337313bb55007fdaaf58f2d048

Parents:

32bd40b31e0076ebec70b5bdec0b6cbb3b63df1e

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-03-02 18:49:02+01:00

git-committer:

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

Message:

FIX: fixed a bug, which occured during the last rebase (2.03.2011)

Location:

libpolys/coeffs

Files:

• numbers.cc (modified) (2 diffs)
• test.cc (modified) (4 diffs)

libpolys/coeffs/numbers.cc

@@ -187 +187 @@
   }
   #endif
-    cf_root=n;
     
     BOOLEAN nOK=TRUE;
@@ -196 +195 @@
        Werror("coeff init missing for %d",(int)t);
     if (nOK)
-      {
-        omFreeSize(n,sizeof(*n));
-        return NULL;
-      }
+    {
+      omFreeSize(n,sizeof(*n));
+      return NULL;
+    }
     cf_root=n;
     // post init settings:

libpolys/coeffs/test.cc

@@ -163 +163 @@
 bool Test(const n_coeffType type, void* p = NULL)
 {
-  cout  << endl << "----------------------- Testing coeffs: [" << type <<
+  cout  << endl << "----------------------- Testing coeffs: [" << type << ", " << p << 
                 "]: -----------------------" << endl;
 
   const coeffs r = nInitChar( type, p );
 
-  if( r == NULL ) { cout << "error"; return false; };
-
+  if( r == NULL ) { cout << "Test: could not get the specified coeff. domain for type: " << type << " and the parameter: " << p << endl; return false; };
+
+  assume( r != NULL );
   nSetChar( r );
   assume( getCoeffType(r) == type );
@@ -287 +288 @@
     c ++;
 #endif
-
+   GFInfo param;
    type = nRegister( n_GF, nfInitChar); assume( type == n_GF );
 
-   GFInfo param;
 
    param.GFChar= 5;
@@ -298 +298 @@
    if( Test(type, (void*) &param) )
      c ++;
-  
+
+
    param.GFChar= 5;
    param.GFDegree= 2;
@@ -306 +307 @@
      c ++;
 
+
   TODO(Somebody, floating arithmetics via GMP rely on two global variables (see setGMPFloatDigits). Please fix it!);