Changeset 638c230 in git

Timestamp:

Jul 21, 2014, 5:08:47 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2a2ba4fcd246395ea2e5d241d8945e66d030c103a6220140edf75f76ad53c0c68c15bc93888c1868

Parents:

bb965979c7d2760b9dc6eb5c19522c4d28c7d5bb

Message:

fix: subst of parameter for alg/trans. extensions

Files:

• Singular/maps_ip.cc (modified) (6 diffs)
• Tst/Short/bug_tr627.res.gz.uu (added)
• Tst/Short/bug_tr627.stat (added)
• Tst/Short/bug_tr627.tst (added)
• Tst/Short/ok_s.lst (modified) (1 diff)

Singular/maps_ip.cc

@@ -116 +116 @@
         res->data=(void *)prCopyR( (poly)data, preimage_r, currRing);
       else
-        if ( (what==IMAP_CMD) || /*(*/ (what==FETCH_CMD) /*)*/) /* && (nMap!=nCopy)*/
+        if ( (what==IMAP_CMD) || /*(*/ (what==FETCH_CMD) /*)*/) /* && (nMap!=nCopy)*/
         res->data=(void *)p_PermPoly((poly)data,perm,preimage_r,currRing, nMap,par_perm,P);
       else /*if (what==MAP_CMD)*/
@@ -154 +154 @@
       }
       else
-        if ( (what==IMAP_CMD) || /*(*/ (what==FETCH_CMD) /*)*/) /* && (nMap!=nCopy)*/
+      if ( (what==IMAP_CMD) || /*(*/ (what==FETCH_CMD) /*)*/) /* && (nMap!=nCopy)*/
       {
         for (i=R*C-1;i>=0;i--)
@@ -236 +236 @@
 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(R->cf, currRing->cf);
-
   int i;
   for(i = rPar(currRing);i>0;i--)
@@ -261 +258 @@
 
   p_Normalize(p,currRing);
-  while (p!=NULL)
-  {
-    memset(v,0,sizeof(sleftv));
-
-    number d = n_GetDenom(p_GetCoeff(p, currRing), currRing);
-    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); d = NULL;
-    }
-
-    number num = n_GetNumerator(p_GetCoeff(p, currRing), currRing);
-    memset(&tmpW,0,sizeof(sleftv));
-    tmpW.rtyp = POLY_CMD;
-    if (num==NULL) // minpoly
-    {
-      num=(number)(currRing->cf->extRing->qideal->m[0]);
-      tmpW.data = num;
+  if (currRing->cf->rep==n_rep_rat_fct )
+  {
+    while (p!=NULL)
+    {
+      memset(v,0,sizeof(sleftv));
+
+      number d = n_GetDenom(p_GetCoeff(p, currRing), currRing);
+      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); d = NULL;
+      }
+
+      number num = n_GetNumerator(p_GetCoeff(p, currRing), currRing);
+      memset(&tmpW,0,sizeof(sleftv));
+      tmpW.rtyp = POLY_CMD;
+      assume( p_Test((poly)NUM(num), R) );
+
+      tmpW.data = NUM (num); // a copy of this poly will be used
+
+      p_Normalize(NUM(num),R);
       if (maApplyFetch(MAP_CMD,theMap,v,&tmpW,R,NULL,NULL,0,nMap))
       {
@@ -290 +290 @@
         v->data=NULL;
       }
-    }
-    else
-    {
-      assume( p_Test((poly)NUM(num), R) );
-
-      tmpW.data = NUM (num); // a copy of this poly will be used
-
-      p_Normalize(NUM(num),R);
+      n_Delete(&num, currRing);
+      //TODO check for memory leaks
+      poly pp = pHead(p);
+      //PrintS("map:");pWrite(pp);
+      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);
+      //PrintS("->");pWrite(ppp);
+      res=pAdd(res,ppp);
+      pIter(p);
+    }
+  }
+  else if (currRing->cf->rep==n_rep_poly )
+  {
+    while (p!=NULL)
+    {
+      memset(v,0,sizeof(sleftv));
+
+      number num = n_GetNumerator(p_GetCoeff(p, currRing), currRing);
+      memset(&tmpW,0,sizeof(sleftv));
+      tmpW.rtyp = POLY_CMD;
+      assume( p_Test((poly)num, R) );
+
+
+      p_Normalize((poly)num,R);
+      if (num==NULL) num=(number)R->qideal->m[0];
+      tmpW.data = num; // a copy of this poly will be used
       if (maApplyFetch(MAP_CMD,theMap,v,&tmpW,R,NULL,NULL,0,nMap))
       {
@@ -303 +329 @@
         v->data=NULL;
       }
-      n_Delete(&num, currRing);
-    }
-    //TODO check for memory leaks
-    poly pp = pHead(p);
-    //PrintS("map:");pWrite(pp);
-    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);
-    //PrintS("->");pWrite(ppp);
-    res=pAdd(res,ppp);
-    pIter(p);
+      if (num!=(number)R->qideal->m[0]) n_Delete(&num, currRing);
+      //TODO check for memory leaks
+      poly pp = pHead(p);
+      //PrintS("map:");pWrite(pp);
+      pSetCoeff(pp,n_Init(1,currRing));
+      //PrintS("cf->");pWrite((poly)(v->data));
+      poly ppp = pMult((poly)(v->data),pp);
+      //PrintS("->");pWrite(ppp);
+      res=pAdd(res,ppp);
+      pIter(p);
+    }
+  }
+  else
+  {
+    WerrorS("cannot apply subst for these coeffcients");
   }
   idDelete((ideal *)(&theMap));

Tst/Short/ok_s.lst

@@ -140 +140 @@
 bug_tr599
 bug_tr604
+bug_tr627
 bug_genus_etc
 bug_x_i_j