Changeset 5ad0a8 in git for Singular/iparith.cc

Timestamp:

Jul 3, 2018, 1:22:40 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'e7cc1ebecb61be8b9ca6c18016352af89940b21a')

Children:

417a91a95b5bf03f8ca333971553909c72f2568f

Parents:

2bbfc1c22b51f7fecdb2e042af6d3dddbdbeb3fa

Message:

generalizing imap/fetch wrt. coeffs.

File:

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

Singular/iparith.cc

@@ -2175 +2175 @@
     {
       // Allow imap/fetch to be make an exception only for:
-      if ( (rField_is_Q_a(r) &&  // Q(a..) -> Q(a..) || Q || Zp || Zp(a)
-            (rField_is_Q(currRing) || rField_is_Q_a(currRing) ||
-             (rField_is_Zp(currRing) || rField_is_Zp_a(currRing))))
-           ||
-           (rField_is_Zp_a(r) &&  // Zp(a..) -> Zp(a..) || Zp
-            (rField_is_Zp(currRing, r->cf->ch) ||
-             rField_is_Zp_a(currRing, r->cf->ch))) )
+      if (nCoeff_is_Extension(r->cf) &&  // Q(a..) -> Q(a..) || Q || Zp || Zp(a)
+         ((n_SetMap(r->cf->extRing->cf,currRing->cf)!=NULL) 
+         || (nCoeff_is_Extension(currRing->cf) && (n_SetMap(r->cf->extRing->cf,currRing->cf->extRing->cf)!=NULL))))
       {
         par_perm_size=rPar(r);
@@ -6918 +6914 @@
     {
       // Allow imap/fetch to be make an exception only for:
-      if ( (rField_is_Q_a(r) &&  // Q(a..) -> Q(a..) || Q || Zp || Zp(a)
-            (rField_is_Q(currRing) || rField_is_Q_a(currRing) ||
-             (rField_is_Zp(currRing) || rField_is_Zp_a(currRing))))
-           ||
-           (rField_is_Zp_a(r) &&  // Zp(a..) -> Zp(a..) || Zp
-            (rField_is_Zp(currRing, r->cf->ch) ||
-             rField_is_Zp_a(currRing, r->cf->ch))) )
+      if (nCoeff_is_Extension(r->cf) &&  // Q(a..) -> Q(a..) || Q || Zp || Zp(a)
+         ((n_SetMap(r->cf->extRing->cf,currRing->cf)!=NULL) 
+         || (nCoeff_is_Extension(currRing->cf) && (n_SetMap(r->cf->extRing->cf,currRing->cf->extRing->cf)!=NULL))))
       {
         par_perm_size=rPar(r);