Changeset bc3e5a in git

Timestamp:

Sep 22, 2017, 12:46:54 PM (7 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

06f6f87f253cbeb1fece75e020f77e15e61f1330

Parents:

0df229bac1ef9979a85245a23e9616eec85c07af

Message:

Add optional ideal to lpSubstitute

File:

• Singular/LIB/fpadim.lib (modified) (4 diffs)

Singular/LIB/fpadim.lib

@@ -2828 +2828 @@
 /*}*/
 
-proc lpSubstitute(poly f, list s1, list s2) {
+proc lpSubstitute(poly f, list s1, list s2, ideal G) {
   poly fs;
   for (int i = 1; i <= size(f); i++) {
@@ -2837 +2837 @@
       int subindex = indexof(s1, varindex);
       if (subindex > 0) {
+        s2[subindex] = lpNF(s2[subindex],G);
         fis = lpMult(fis, s2[subindex]);
       } else {
-        fis = lpMult(fis, iv2lp(varindex));
-      }
+        fis = lpMult(fis, lpNF(iv2lp(varindex),G));
+      }
+      fis = lpNF(fis,G);
     }
     fs = fs + fis;
   }
+  fs = lpNF(fs, G);
   return (fs);
 }
@@ -2852 +2855 @@
   setring R;
 
+  ideal G = x(1)*y(2); // optional, can be 0
+
   poly f = 3*x(1)*x(2)+y(1)*x(2);
   list s1 = x(1), y(1);
   list s2 = y(1)*z(2)*z(3), x(1);
 
-  int minDegBound = calcSubstDegBound(f,s1,s2);
+  int minDegBound = calcSubstDegBounds(f,s1,s2);
   setring r;
   def R1 = makeLetterplaceRing(minDegBound);
   setring R1;
 
-  lpSubstitute(imap(R,f), imap(R,s1), imap(R,s2));
+  lpSubstitute(imap(R,f), imap(R,s1), imap(R,s2), imap(R,G));
 }
 example {
@@ -2885 +2890 @@
   list s2 = imap(R,s2);
   for (int i = 1; i <= size(L); i++) {
-    lpSubstitute(L[i], s1, s2);
+    lpSubstitute(L[i], s1, s2, 0);
   }
 }