Changeset 696bde in git

Timestamp:

Mar 28, 2012, 4:55:33 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

33635d3a6cdc2409df74061d54e08a61ec61082273314427e2f6ac4d8a81ae22a99e7ab380104210

Parents:

e197f51703da5cda44324097bd41e1c9b43a7f80

git-author:

Martin Lee <martinlee84@web.de>2012-03-28 16:55:33+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-03-28 18:13:38+02:00

Message:

fix: pSubstPar

File:

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

Singular/maps_ip.cc

@@ -6 +6 @@
 * ABSTRACT - the mapping of polynomials to other rings
 */
+#define TRANSEXT_PRIVATES
 
 #include "config.h"
@@ -18 +19 @@
 #include <polys/matpol.h>
 #include <polys/prCopy.h>
+#include <polys/ext_fields/transext.h>
 
 //#include <libpolys/polys/ext_fields/longtrans.h>
@@ -234 +236 @@
 {
   ideal theMapI = idInit(rPar(currRing),1);
-  nMapFunc nMap = n_SetMap(currRing->cf->extRing->cf, currRing->cf->extRing->cf);
+  nMapFunc nMap = n_SetMap(currRing->cf->extRing->cf, currRing->cf);
 
   int i;
@@ -255 +257 @@
   while (p!=NULL)
   {
+    memset(v,0,sizeof(sleftv));
+
+    number d = n_GetDenom(p_GetCoeff(p, currRing), currRing);
+    if (!n_IsOne (d, currRing->cf)) WarnS("ignoring denominators of coefficients...");
+    n_Delete(&d, currRing);
+
+    number num = n_GetNumerator(p_GetCoeff(p, currRing), currRing); 
+
     memset(&tmpW,0,sizeof(sleftv));
-    memset(v,0,sizeof(sleftv));
-    tmpW.rtyp=POLY_CMD;
-    
-    number n = pGetCoeff(p);
-    tmpW.data = n_GetNumerator(n, currRing); 
-    
-    if(1)
-    {
-      number d = n_GetDenom(n, currRing);
-      if ( d != NULL ) WarnS("ignoring denominators of coefficients...");
-      n_Delete(&d, currRing);
-    }
+    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))
@@ -274 +274 @@
       v->data=NULL;
     }
+    n_Delete(&num, currRing);
+
+    //TODO check for memory leaks
     poly pp = pHead(p);
     //PrintS("map:");pWrite(pp);