Changeset e4611fa in git for Singular/maps_ip.cc

Timestamp:

Apr 6, 2004, 5:14:26 PM (20 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

6a33fd790520524415959fe0fa50e769516c1130

Parents:

e1f17c418b7f988342fa9f2397050bd5f3fa2e35

Message:

*hannes: optimization


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

File:

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

Singular/maps_ip.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: maps_ip.cc,v 1.3 2004-04-06 09:13:35 Singular Exp $ */
+/* $Id: maps_ip.cc,v 1.4 2004-04-06 15:14:26 Singular Exp $ */
 /*
 * ABSTRACT - the mapping of polynomials to other rings
@@ -300 +300 @@
 ideal  idSubstPoly(ideal id, int n, poly e)
 {
-  int k=MATROWS((matrix)id)*MATCOLS((matrix)id);
-  ideal res=(ideal)mpNew(MATROWS((matrix)id),MATCOLS((matrix)id));
-
-  res->rank = id->rank;
-  for(k--;k>=0;k--)
-  {
-    res->m[k]=pSubstPoly(id->m[k],n,e);
-  }
+
+#ifdef HAVE_PLURAL
+  if (rIsPluralRing(currRing))
+  {
+    int k=MATROWS((matrix)id)*MATCOLS((matrix)id);
+    ideal res=(ideal)mpNew(MATROWS((matrix)id),MATCOLS((matrix)id));
+    res->rank = id->rank;
+    WarnS("not implemented: only substitution only by a monomial");
+    for(k--;k>=0;k--)
+    {
+      res->m[k]=pSubst(pCopy(id->m[k]),n,e);
+    }
+    return res;
+  }
+#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,nCopy))
+  {
+    WerrorS("map failed");
+    v->data=NULL;
+  }
+  ideal res=(ideal)(v->data);
+  idDelete((ideal *)(&theMap));
+  omFreeBin((ADDRESS)v, sleftv_bin);
   return res;
 }