Changeset f769fd0 in git for Singular/maps_ip.cc

Timestamp:

Feb 20, 2013, 5:48:56 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ef7324f0fe134054c1000413c4d1fa21ccc163b1

Parents:

5602268070a5515f6c8a239a56a190a45699fcfd

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-02-20 17:48:56+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-02-20 19:04:08+01:00

Message:

Fixed the handling of constant (non-1) denoms

File:

• Singular/maps_ip.cc (modified) (4 diffs)

Singular/maps_ip.cc

@@ -234 +234 @@
 poly pSubstPar(poly p, int par, poly image)
 {
+  assume( nCoeff_is_transExt(currRing->cf) ); // nCoeff_is_Extension???
+  const ring R = currRing->cf->extRing;
+
   ideal theMapI = idInit(rPar(currRing),1);
-  nMapFunc nMap = n_SetMap(currRing->cf->extRing->cf, currRing->cf);
+  nMapFunc nMap = n_SetMap(R->cf, currRing->cf);
 
   int i;
@@ -245 +248 @@
       theMapI->m[i-1] = p_Copy(image, currRing);
   }
-  
+
 
   map theMap=(map)theMapI;
@@ -259 +262 @@
 
     number d = n_GetDenom(p_GetCoeff(p, currRing), currRing);
-    if (!n_IsOne (d, currRing->cf))
+    assume( p_Test((poly)NUM(d), R) );
+
+    if ( n_IsOne (d, currRing->cf) )
+    {     
+      n_Delete(&d, currRing); d = NULL;
+    }     
+    else if (!p_IsConstant((poly)NUM(d), R))
+    {   
       WarnS("ignoring denominators of coefficients...");
-    n_Delete(&d, currRing);
-
-    number num = n_GetNumerator(p_GetCoeff(p, currRing), currRing); 
+      n_Delete(&d, currRing); d = NULL;
+    }     
+
+    number num = n_GetNumerator(p_GetCoeff(p, currRing), currRing);
+    assume( p_Test((poly)NUM(num), R) );
 
     memset(&tmpW,0,sizeof(sleftv));
     tmpW.rtyp = POLY_CMD;
     tmpW.data = NUM (num); // a copy of this poly will be used
-      
-    if (maApplyFetch(MAP_CMD,theMap,v,&tmpW,currRing->cf->extRing,NULL,NULL,0,nMap))
+
+    if (maApplyFetch(MAP_CMD,theMap,v,&tmpW,R,NULL,NULL,0,nMap))
     {
       WerrorS("map failed");
@@ -279 +291 @@
     poly pp = pHead(p);
     //PrintS("map:");pWrite(pp);
-    pSetCoeff(pp, nInit(1));
+    if( d != NULL )
+    {
+      pSetCoeff(pp, n_Invers(d, currRing->cf));
+      n_Delete(&d, currRing); // d = NULL;
+    } else
+      pSetCoeff(pp, nInit(1));
+
     //PrintS("->");pWrite((poly)(v->data));
     poly ppp = pMult((poly)(v->data),pp);