Changeset 509ea41 in git for Singular/maps_ip.cc

Timestamp:

Apr 29, 2005, 6:04:36 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

6d7113d27870d87916efbd6084abc75fa74e64eb

Parents:

a09c2a0d411d9ac83fb45653be9dc871cfb79373

Message:

*hannes: FAST_MAPS for subst


git-svn-id: file:///usr/local/Singular/svn/trunk@7952 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

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

Singular/maps_ip.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: maps_ip.cc,v 1.7 2005-04-18 15:10:06 Singular Exp $ */
+/* $Id: maps_ip.cc,v 1.8 2005-04-29 16:04:36 Singular Exp $ */
 /*
 * ABSTRACT - the mapping of polynomials to other rings
@@ -23 +23 @@
 #include "prCopy.h"
 
+// define this if you want to use the fast_map routine for mapping ideals
+#define FAST_MAP
+
+#ifdef FAST_MAP
+#include "fast_maps.h"
+#endif
+
+
 /*2
 * maps the expression w to res,
@@ -266 +274 @@
 poly pSubstPoly(poly p, int var, poly image)
 {
+  if (p==NULL) return NULL;
 #ifdef HAVE_PLURAL
   if (rIsPluralRing(currRing))
@@ -277 +286 @@
   theMap->m[var-1]=pCopy(image);
 
-  leftv v=(leftv)omAlloc0Bin(sleftv_bin);
-  sleftv tmpW;
-  memset(&tmpW,0,sizeof(sleftv));
-  tmpW.rtyp=POLY_CMD;
-  tmpW.data=p;
   poly res=NULL;
-  if (maApplyFetch(MAP_CMD,theMap,v,&tmpW,currRing,NULL,NULL,0,nCopy))
-  {
-    WerrorS("map failed");
-    v->data=NULL;
-  }
-  res=(poly)(v->data);
+#ifdef FAST_MAP
+  if (pGetComp(p)==0)
+  {
+    ideal src_id=idInit(1,1);
+    src_id->m[0]=p;
+    ideal res_id=fast_map(src_id,currRing,(ideal)theMap,currRing);
+    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,nCopy))
+    {
+      WerrorS("map failed");
+      v->data=NULL;
+    }
+    res=(poly)(v->data);
+    omFreeBin((ADDRESS)v, sleftv_bin);
+  }
   idDelete((ideal *)(&theMap));
-  omFreeBin((ADDRESS)v, sleftv_bin);
   return res;
 }