Changeset 5d18675 in git

Timestamp:

Sep 29, 2011, 2:04:24 AM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

0ff2030fd072d70a06a89af842c039505b704f90

Parents:

b38d70eb347f3022d2862a75897727cb85659cfe

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-29 02:04:24+02:00

git-committer:

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

Message:

FIX: rDecompose should know about trans. exts.

Files:

• Singular/ipshell.cc (modified) (3 diffs)
• libpolys/polys/monomials/ring.h (modified) (3 diffs)

Singular/ipshell.cc

@@ -1769 +1769 @@
   else if (rIsExtension(r))
   {
-    if (nCoeff_is_algExt(r->cf))
-      rDecomposeCF(&(L->m[0]),r->cf->extRing,r);
-    else
-    {
+    if ( rField_is_Extension(r) )// nCoeff_is_algExt(r->cf))
+    {
+      assume( r->cf != NULL );    
+      assume( r->cf->extRing != NULL );
+      
+      rDecomposeCF(&(L->m[0]), r->cf->extRing, r);
+    }else
+    {
+      assume( nCoeff_is_GF(r->cf) );
+       
       lists Lc=(lists)omAlloc0Bin(slists_bin);
       Lc->Init(4);
@@ -1778 +1784 @@
       Lc->m[0].rtyp=INT_CMD;
       Lc->m[0].data=(void*)r->cf->ch;
-      // var:
+      // var:      
       lists Lv=(lists)omAlloc0Bin(slists_bin);
       Lv->Init(1);
       Lv->m[0].rtyp=STRING_CMD;
-      Lv->m[0].data=(void *)omStrDup(rParameter(r)[0]);
+      Lv->m[0].data=(void *)omStrDup(rParameter(r)[0]);     
       Lc->m[1].rtyp=LIST_CMD;
       Lc->m[1].data=(void*)Lv;
@@ -1792 +1798 @@
       Loo->m[0].rtyp=STRING_CMD;
       Loo->m[0].data=(void *)omStrDup(rSimpleOrdStr(ringorder_lp));
+       
       intvec *iv=new intvec(1); (*iv)[0]=1;
       Loo->m[1].rtyp=INTVEC_CMD;
       Loo->m[1].data=(void *)iv;
+       
       Lo->m[0].rtyp=LIST_CMD;
       Lo->m[0].data=(void*)Loo;

libpolys/polys/monomials/ring.h

@@ -482 +482 @@
 { assume(r != NULL); assume(r->cf != NULL); return nCoeff_has_simple_inverse(r->cf); }
 
+/// Z/p, GF(p,n), R: nCopy, nNew, nDelete are dummies
 static inline BOOLEAN rField_has_simple_Alloc(const ring r)
 { assume(r != NULL); assume(r->cf != NULL); return nCoeff_has_simple_Alloc(r->cf); }
 
-/* Z/p, GF(p,n), R: nCopy, nNew, nDelete are dummies*/
+/// Alg. or trans. ext. 
 static inline BOOLEAN rField_is_Extension(const ring r)
 { assume(r != NULL); assume(r->cf != NULL); return nCoeff_is_Extension(r->cf); } /* Z/p(a) and Q(a)*/
@@ -547 +548 @@
   assume(C != NULL);
 
-  if( rField_is_Extension(r) )
+  if( rField_is_Extension(r) ) // only alg / trans. exts...
   {
     const ring R = C->extRing;
@@ -577 +578 @@
 static inline BOOLEAN rIsExtension(const ring r)
 {
-  assume( (rParameter(r)!=NULL) == rField_is_Extension(r) ); // ?
-  return rField_is_Extension(r);
+//  assume( (rParameter(r)!=NULL) == rField_is_Extension(r) ); // ?
+  return rField_is_Extension(r) || nCoeff_is_GF(r->cf) ;
 }