Changeset 8b87135 in git

Timestamp:

Sep 14, 2011, 7:02:46 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

407497f6a46f6a77950bc9af3836af45064e4808

Parents:

e209100ba5f79c94ecb471edc913f70d78a3c0cb

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-14 19:02:46+02:00

git-committer:

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

Message:

FIX: handling of minpoly should be more precise + adding some assumes

File:

• Singular/subexpr.cc (modified) (2 diffs)

Singular/subexpr.cc

@@ -624 +624 @@
   {
     if (iiCheckRing(t)) return NULL;
-    void *x=data;
-    if (rtyp==VNOETHER) x=(void *)pCopy((currRing->ppNoether));
-    else if ((rtyp==VMINPOLY)&& \
-                    nCoeff_is_Extension(currRing->cf) && \
-                    (!nCoeff_is_GF(currRing->cf)))
-      x=(void *)p_Copy(currRing->cf->extRing->minideal->m[0],
-                      currRing->cf->extRing );
+    void *x = data;
+    if (rtyp==VNOETHER) x = (void *)pCopy((currRing->ppNoether));
+    else if ((rtyp==VMINPOLY) && nCoeff_is_algExt(currRing->cf) && (!nCoeff_is_GF(currRing->cf)))
+    {
+      const ring A = currRing->cf->extRing;
+      
+      assume( A != NULL );
+      assume( A->minideal != NULL );
+    
+      x=(void *)p_Copy(A->minideal->m[0], A);
+    }
     data=NULL;
     return x;
@@ -1035 +1039 @@
       case TRACE:      return (void *)traceit;
       case VSHORTOUT:  return (void *)(currRing != NULL ? currRing->ShortOut : 0);
-      case VMINPOLY:   if (currRing != NULL &&
-                           nCoeff_is_Extension(currRing->cf)&&
-                           !nCoeff_is_GF(currRing->cf))
-                       /* Q(a), Fp(a), but not GF(q) */
-                         return (void *)currRing->cf->extRing->minideal->m[0];
-                       else
-                         return (void *)currRing->cf->nNULL;
+      case VMINPOLY:
+        if ( (currRing != NULL)  && nCoeff_is_algExt(currRing->cf) && !nCoeff_is_GF(currRing->cf))
+        {
+          /* Q(a), Fp(a), but not GF(q) */
+          const ring A = currRing->cf->extRing;
+          
+          assume( A != NULL );
+          assume( A->minideal != NULL );
+          
+          return (void *)A->minideal->m[0];
+        }
+        else
+          return (void *)currRing->cf->nNULL;
+        
       case VNOETHER:   return (void *) (currRing->ppNoether);
       case IDHDL: