Changeset 4d5437 in git for Singular/maps_ip.cc

Timestamp:

Jan 20, 2016, 6:46:28 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

c631c329ed487e0ec9b60bd41077ba19cbf17ad3

Parents:

64b03151c6cf3d29b4a4304bab7a66c2b37b5e2d

Message:

maps for ideal revisited: new: maMapIdeal as general routine

File:

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

Singular/maps_ip.cc

@@ -36 +36 @@
 /* debug output: Tok2Cmdname in maApplyFetch*/
 #include "ipshell.h"
-
-// define this if you want to use the fast_map routine for mapping ideals
-//#define FAST_MAP
-
-#ifdef FAST_MAP
-#include <polys/monomials/maps.h>
-#endif
 
 /*2
@@ -377 +370 @@
   theMap->m[var-1]=pCopy(image);
 
-  poly res=NULL;
-#ifdef FAST_MAP
-  if (pGetComp(p)==0)
-  {
-    ideal src_id=idInit(1,1);
-    src_id->m[0]=p;
-
-    char *tmp = theMap->preimage;
-    theMap->preimagei=(char*)1L; // map gets 1 as its rank (as an ideal)
-    ideal res_id=fast_map(src_id,currRing,(ideal)theMap,currRing);
-    theMap->preimage=tmp; // map gets its preimage back
-
-    res=res_id->m[0];
-    res_id->m[0]=NULL; idDelete(&res_id);
-    src_id->m[0]=NULL; idDelete(&src_id);
-  }
-  else
-#endif
-  {
-    sleftv tmpW;
-    memset(&tmpW,0,sizeof(sleftv));
-    tmpW.rtyp=POLY_CMD;
-    tmpW.data=p;
-    leftv v=(leftv)omAlloc0Bin(sleftv_bin);
-    if (maApplyFetch(MAP_CMD,theMap,v,&tmpW,currRing,NULL,NULL,0,
-                            n_SetMap(currRing->cf, currRing->cf)))
-    {
-      WerrorS("map failed");
-      v->data=NULL;
-    }
-    res=(poly)(v->data);
-    omFreeBin((ADDRESS)v, sleftv_bin);
-  }
+  sleftv tmpW;
+  memset(&tmpW,0,sizeof(sleftv));
+  tmpW.rtyp=POLY_CMD;
+  tmpW.data=p;
+  leftv v=(leftv)omAlloc0Bin(sleftv_bin);
+  if (maApplyFetch(MAP_CMD,theMap,v,&tmpW,currRing,NULL,NULL,0,
+                          n_SetMap(currRing->cf, currRing->cf)))
+  {
+    WerrorS("map failed");
+    v->data=NULL;
+  }
+  poly res=(poly)(v->data);
+  omFreeBin((ADDRESS)v, sleftv_bin);
   idDelete((ideal *)(&theMap));
   return res;