Changeset 832330 in git for Singular/maps_ip.cc

Timestamp:

Jan 21, 2016, 3:43:54 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

5f46166c7775b4b01ad9b5572aebcd849a244ef5

Parents:

276224e615df5b49675413a43dc12da95dc2221d

Message:

opt maps: usr p_SubstPoly/id_SubstPoly for subst

File:

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

Singular/maps_ip.cc

@@ -26 +26 @@
 
 #include <kernel/GBEngine/kstd1.h>
+#include <kernel/maps/gen_maps.h>
 
 #include "maps_ip.h"
@@ -365 +366 @@
   }
 #endif
-  map theMap=(map)idMaxIdeal(1);
-  theMap->preimage=NULL;
-  pDelete(&(theMap->m[var-1]));
-  theMap->m[var-1]=pCopy(image);
-
-  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;
+  return p_SubstPoly(p,var,image,currRing,currRing,ndCopyMap);
 }
 
@@ -407 +389 @@
   }
 #endif
-  map theMap=(map)idMaxIdeal(1);
-  theMap->preimage=NULL;
-  pDelete(&(theMap->m[n-1]));
-  theMap->m[n-1]=pCopy(e);
-
-  leftv v=(leftv)omAlloc0Bin(sleftv_bin);
-  sleftv tmpW;
-  memset(&tmpW,0,sizeof(sleftv));
-  tmpW.rtyp=IDEAL_CMD;
-  tmpW.data=id;
-  if (maApplyFetch(MAP_CMD,theMap,v,&tmpW,currRing,NULL,NULL,0,
-                          n_SetMap(currRing->cf, currRing->cf)))
-  {
-    WerrorS("map failed");
-    v->data=NULL;
-  }
-  ideal res=(ideal)(v->data);
-  idDelete((ideal *)(&theMap));
-  omFreeBin((ADDRESS)v, sleftv_bin);
-  return res;
-}
+  return id_SubstPoly(id,n,e,currRing,currRing,ndCopyMap);
+}