Changeset 7e9f12 in git

Timestamp:

Mar 22, 2012, 6:54:18 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

16c4008b20b489f27f77ca9a45f6dc033a689571

Parents:

bcfd11a55d73c58524f3c5043376c6d7147cb690

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-22 18:54:18+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-23 16:06:34+01:00

Message:

removed minimal ideal from AlgExtInfo infavour of qring

chg: algext. expects a qring (qideal != NULL) and uses it directly

Files:

• Singular/ipassign.cc (modified) (2 diffs)
• Singular/ipshell.cc (modified) (3 diffs)
• libpolys/polys/ext_fields/algext.cc (modified) (2 diffs)
• libpolys/polys/ext_fields/algext.h (modified) (1 diff)
• libpolys/tests/polys_test.h (modified) (3 diffs)

Singular/ipassign.cc

@@ -247 +247 @@
 
   n_Normalize(p, currRing->cf);
+   
+  assume( currRing->cf->extRing->qideal == NULL );
 
   AlgExtInfo A;
 
-  A.r = currRing->cf->extRing; // Use the same ground field!
-  A.i = idInit(1,1);
+  A.r = rCopy(currRing->cf->extRing); // Copy  ground field!
+  ideal q = idInit(1,1);
 
   assume( DEN((fractionObject *)(p)) == NULL ); // minpoly must be a poly...!?
 
-  A.i->m[0] = NUM((fractionObject *)p);
+  q->m[0] = NUM((fractionObject *)p);
+  A.r->qideal = q;
 
 #if 0
@@ -273 +276 @@
     Werror("Could not construct the alg. extension: llegal minpoly?");
     // cleanup A: TODO
+    rDelete( A.r );
     return TRUE;
   }

Singular/ipshell.cc

@@ -2177 +2177 @@
           AlgExtInfo extParam;
 
-          extParam.i = extRing->qideal;
           extParam.r = extRing;
-
-          extRing->qideal = NULL; // ???
 
           R->cf = nInitChar(n_algExt, (void*)&extParam);
@@ -2188 +2185 @@
           TransExtInfo extParam;
           extParam.r = extRing;
+          assume( extRing->qideal == NULL );
 
           R->cf = nInitChar(n_transExt, &extParam);
@@ -5187 +5185 @@
     AlgExtInfo extParam;
     extParam.r = (ring)pn->Data();
-    extParam.i = (extParam.r->qideal);
 
     cf = nInitChar(n_algExt, &extParam);   // Q[a]/<minideal>

libpolys/polys/ext_fields/algext.cc

@@ -553 +553 @@
 
   // NOTE: Q(a)[x] && Q(a)[y] should better share the _same_ Q(a)...
-  if( rEqual(naRing, e->r, TRUE) )
+  if( rEqual(naRing, e->r, TRUE) ) // also checks the equality of qideals
   {
     const ideal mi = naRing->qideal; 
     assume( IDELEMS(mi) == 1 );
-    ideal ii = e->i;
+    const ideal ii = e->r->qideal;
     assume( IDELEMS(ii) == 1 );
 
     // TODO: the following should be extended for 2 *equal* rings...
-    if( p_EqualPolys(mi->m[0], ii->m[0], naRing, e->r) )
-    {
-      id_Delete(&ii, e->r);
-      rDelete(e->r);
-      return TRUE;
-    }
+    assume( p_EqualPolys(mi->m[0], ii->m[0], naRing, e->r) );
+    
+    rDelete(e->r);
+    
+    return TRUE;
   }
 
@@ -831 +830 @@
   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->qideal == NULL );
+
+  assume((e->r->qideal            != NULL) &&    // minideal has one
+         (IDELEMS(e->r->qideal)   == 1)    &&    // non-zero generator
+         (e->r->qideal->m[0]      != NULL)    ); // at m[0];
 
   assume( cf != NULL );
   assume(getCoeffType(cf) == ID);                     // coeff type;
 
-  ring R = e->r;
-
-  R->ref ++; // increase the ref.counter for the ground poly. ring!
-
-  R->qideal = e->i; // make a copy? 
-
-  cf->extRing           = R;
+  e->r->ref ++; // increase the ref.counter for the ground poly. ring!
+  const ring R = e->r; // no copy!
+  assume( R->qideal == e->r->qideal );
+  cf->extRing  = R;
 
   /* propagate characteristic up so that it becomes

libpolys/polys/ext_fields/algext.h

@@ -38 +38 @@
 
 /// struct for passing initialization parameters to naInitChar
-typedef struct { ring r; ideal i; } AlgExtInfo;
+typedef struct { ring r; /*ideal i;*/ } AlgExtInfo; // `r.qideal` is supposed to be `i`
 
 /// Get a mapping function from src into the domain of this type (n_algExt)

libpolys/tests/polys_test.h

@@ -2002 +2002 @@
     TS_ASSERT(type == n_algExt);
 
+    r->qideal = minIdeal;
     AlgExtInfo extParam;
     extParam.r = r;
-    extParam.i = minIdeal;
 
     clog << "Next create the extension field Q[a]/<a2+1>..." << endl;
@@ -2103 +2103 @@
     TS_ASSERT(type == n_algExt);
 
+    r->qideal = minIdeal;
     AlgExtInfo extParam;
     extParam.r = r;
-    extParam.i = minIdeal;
 
     clog << "Next create the extension field Q[b]/<b^7+17>..." << endl;
@@ -2247 +2247 @@
     TS_ASSERT(type == n_algExt);
 
+    r->qideal = minIdeal;
     AlgExtInfo extParam;
     extParam.r = r;
-    extParam.i = minIdeal;
 
     clog << "Next create the extension field Z_17[a]/<a^2+3>..." << endl;