Changeset 9d68fd in git for Singular/maps_ip.cc

Timestamp:

Feb 25, 2013, 3:35:27 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

1c94e44b6b2645f28d5bc81b7b3facc71b2b582d

Parents:

27c79fcbc083eb57ec1345d22a6892cf162f017b

Message:

fix: better tests and normalization for subst

File:

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

Singular/maps_ip.cc

@@ -82 +82 @@
         if (nCoeff_is_Extension(currRing->cf))
           res->data=(void *)p_MinPolyNormalize((poly)res->data, currRing);
-        pTest((poly) res->data);        
+        pTest((poly) res->data);
       }
       else
       {
-        assume( nMap != NULL );
-         
-        number a = nMap((number)data, preimage_r->cf, currRing->cf);
-        
- 
+        assume( nMap != NULL );
+
+        number a = nMap((number)data, preimage_r->cf, currRing->cf);
+
+
         if (nCoeff_is_Extension(currRing->cf))
         {
@@ -96 +96 @@
 /*
           number a = (number)res->data;
-          number one = nInit(1);
+          number one = nInit(1);
           number product = nMult(a, one );
-          nDelete(&one);
-          nDelete(&a);
+          nDelete(&one);
+          nDelete(&a);
           res->data=(void *)product;
  */
@@ -119 +119 @@
       else /*if (what==MAP_CMD)*/
       {
+        p_Test((poly)data,preimage_r);
         matrix s=mpNew(N,maMaxDeg_P((poly)data, preimage_r));
         res->data=(void *)maEval(theMap, (poly)data, preimage_r, nMap, (ideal)s, currRing);
@@ -157 +158 @@
         {
           m->m[i]=p_PermPoly(((ideal)data)->m[i],perm,preimage_r,currRing,
-                          nMap,par_perm,P);
+                          nMap,par_perm,P);
           pTest(m->m[i]);
         }
@@ -247 +248 @@
     else
       theMapI->m[i-1] = p_Copy(image, currRing);
-  }
-
+    p_Test(theMapI->m[i-1],currRing);
+  }
+  //iiWriteMatrix((matrix)theMapI,"map:",1,currRing,0);
 
   map theMap=(map)theMapI;
@@ -257 +259 @@
   poly res=NULL;
 
+  p_Normalize(p,currRing);
   while (p!=NULL)
   {
@@ -265 +268 @@
 
     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);
@@ -281 +284 @@
     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))
     {
@@ -364 +368 @@
     leftv v=(leftv)omAlloc0Bin(sleftv_bin);
     if (maApplyFetch(MAP_CMD,theMap,v,&tmpW,currRing,NULL,NULL,0,
-                            n_SetMap(currRing->cf, currRing->cf)))
+                            n_SetMap(currRing->cf, currRing->cf)))
     {
       WerrorS("map failed");
@@ -407 +411 @@
   tmpW.data=id;
   if (maApplyFetch(MAP_CMD,theMap,v,&tmpW,currRing,NULL,NULL,0,
-                          n_SetMap(currRing->cf, currRing->cf)))
+                          n_SetMap(currRing->cf, currRing->cf)))
   {
     WerrorS("map failed");