Changeset ec5ec8 in git

Timestamp:

Sep 14, 2011, 8:16:37 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '98550b669234b32be762076c32b3be2c35188ac4')

Children:

0edcce0373257644bc23c5efa79fa53fc1b7cb96

Parents:

407497f6a46f6a77950bc9af3836af45064e4808

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-14 20:16:37+02:00

git-committer:

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

Message:

CHG: better tests for input data
ADD: ref++ for the ground ring

Location:

libpolys/polys/ext_fields

Files:

• algext.cc (modified) (1 diff)
• transext.cc (modified) (1 diff)

libpolys/polys/ext_fields/algext.cc

@@ -651 +651 @@
 BOOLEAN naInitChar(coeffs cf, void * infoStruct)
 {  
-  assume( cf != NULL );
   assume( infoStruct != NULL );
 
   AlgExtInfo *e = (AlgExtInfo *)infoStruct;
   /// first check whether cf->extRing != NULL and delete old ring???
+
+  assume(e->r                     != NULL);      // extRing;
+  assume(e->r->cf                 != NULL);      // extRing->cf;
+  assume((e->i          != NULL) &&    // minideal has one
+         (IDELEMS(e->i) != 0)    &&    // non-zero generator
+         (e->i->m[0]    != NULL)    ); // at m[0];
+
+  assume( e->r->minideal == NULL );
+
+  assume( cf != NULL );
+  assume(getCoeffType(cf) == ID);                     // coeff type;
+  
   cf->extRing           = e->r;
-  cf->extRing->minideal = e->i;
-
-  assume(cf->extRing                     != NULL);      // extRing;
-  assume((cf->extRing->minideal          != NULL) &&    // minideal has one
-         (IDELEMS(cf->extRing->minideal) != 0)    &&    // non-zero generator
-         (cf->extRing->minideal->m[0]    != NULL)    ); // at m[0];
-  assume(cf->extRing->cf                 != NULL);      // extRing->cf;
-  assume(getCoeffType(cf) == ID);                     // coeff type;
-  
+  cf->extRing->ref ++; // increase the ref.counter for the ground poly. ring!
+
+  cf->extRing->minideal = e->i; // make a copy? 
+
   /* propagate characteristic up so that it becomes
      directly accessible in cf: */

libpolys/polys/ext_fields/transext.cc

@@ -1099 +1099 @@
 {
 
+  assume( infoStruct != NULL );
+  
+  TransExtInfo *e = (TransExtInfo *)infoStruct;
+  
+  assume( e->r                != NULL);      // extRing;
+  assume( e->r->cf            != NULL);      // extRing->cf;
+  assume( e->r->minideal == NULL ); 
+
   assume( cf != NULL );
-  assume( infoStruct != NULL );
-  
-  TransExtInfo *e = (TransExtInfo *)infoStruct;
-  /// first check whether cf->extRing != NULL and delete old ring???
+  assume(getCoeffType(cf) == ID);                // coeff type;
+
   cf->extRing           = e->r;
-  cf->extRing->minideal = NULL;
-
-  assume(cf->extRing                != NULL);      // extRing;
-  assume(cf->extRing->cf            != NULL);      // extRing->cf;
-  assume(getCoeffType(cf) == ID);                // coeff type;
-  
+  cf->extRing->ref ++; // increase the ref.counter for the ground poly. ring!  
+
   /* propagate characteristic up so that it becomes
      directly accessible in cf: */