Changeset e92b07 in git for Singular/maps_ip.cc

Timestamp:

Aug 12, 2011, 4:40:54 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

bf38a4674cd9d9a84ebebbcfdcfa32ffccae4059

Parents:

6637ee55dc87d61e2d841f88a872b6f3e2d2e402

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-12 16:40:54+02:00

git-committer:

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

Message:

FIX: fixed the use of parameters (and lnumber's) in pSubstPar

File:

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

Singular/maps_ip.cc

@@ -65 +65 @@
       if (P!=0)
       {
+        WerrorS("Sorry 'napPermNumber' was lost in the refactoring process (due to Frank): needs to be fixed");
+        return TRUE;
+#if 0        
         res->data=(void *)napPermNumber((number)data,par_perm,P, preimage_r);
+#endif
         res->rtyp=POLY_CMD;
         if (nCoeff_is_Extension(currRing->cf))
           res->data=(void *)p_MinPolyNormalize((poly)res->data, currRing);
-        pTest((poly) res->data);
+        pTest((poly) res->data);        
       }
       else
@@ -217 +221 @@
 
   int i;
-  poly pp;
   for(i = rPar(currRing);i>0;i--)
   {
-    if (i!=par)
-    {
-      pp=theMapI->m[i-1]=pOne();
-      lnumber n=(lnumber)pGetCoeff(pp);
-      p_SetExp(n->z,i,1,currRing->cf->extRing);
-      p_Setm(n->z,currRing->cf->extRing);
-    }
+    if (i != par)
+      theMapI->m[i-1]= p_NSet(n_Param(i, currRing), currRing);
     else
-      theMapI->m[i-1]=pCopy(image);
-  }
+      theMapI->m[i-1] = p_Copy(image, currRing);
+  }
+  
 
   map theMap=(map)theMapI;
@@ -237 +236 @@
   sleftv tmpW;
   poly res=NULL;
+
   while (p!=NULL)
   {
@@ -242 +242 @@
     memset(v,0,sizeof(sleftv));
     tmpW.rtyp=POLY_CMD;
-    lnumber n=(lnumber)pGetCoeff(p);
-    tmpW.data=n->z;
-    if (n->n!=NULL) WarnS("ignoring denominators of coefficients...");
+    
+    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);
+    }
+      
     if (maApplyFetch(MAP_CMD,theMap,v,&tmpW,currRing->cf->extRing,NULL,NULL,0,nMap))
     {
@@ -250 +258 @@
       v->data=NULL;
     }
-    pp=pHead(p);
+    poly pp = pHead(p);
     //PrintS("map:");pWrite(pp);
-    pSetCoeff(pp,nInit(1));
+    pSetCoeff(pp, nInit(1));
     //PrintS("->");pWrite((poly)(v->data));
-    poly ppp=pMult((poly)(v->data),pp);
+    poly ppp = pMult((poly)(v->data),pp);
     //PrintS("->");pWrite(ppp);
     res=pAdd(res,ppp);