Changeset 8a57d4 in git

Timestamp:

Mar 15, 2018, 3:51:09 PM (5 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

634a329f13a9b02b22a7736c597585dbbe8a2a48

Parents:

7e5164822dfad56a986d4d205e77a60f62611fc3

Message:

Fix lpSubstitute for '1'

File:

• Singular/LIB/fpaprops.lib (modified) (2 diffs)

Singular/LIB/fpaprops.lib

@@ -1051 +1051 @@
     for (int j = 1; j <= size(ivfi); j++) {
       int varindex = ivfi[j];
-      int subindex = lpIndexOf(s1, var(varindex));
-      if (subindex > 0) {
-        s2[subindex] = lpNF(s2[subindex],G);
-        fis = lpMult(fis, s2[subindex]);
-      } else {
-        fis = lpMult(fis, lpNF(iv2lp(varindex),G));
-      }
-      /*fis = lpNF(fis,G);*/
-      kill varindex; kill subindex;
+      if (varindex > 0) {
+        int subindex = lpIndexOf(s1, var(varindex));
+        if (subindex > 0) {
+          s2[subindex] = lpNF(s2[subindex],G);
+          fis = lpMult(fis, s2[subindex]);
+        } else {
+          fis = lpMult(fis, lpNF(iv2lp(varindex),G));
+        }
+        /*fis = lpNF(fis,G);*/
+        kill subindex;
+      }
+      kill varindex;
     } kill j;
     kill ivfi;
@@ -1150 +1153 @@
     for (int j = 1; j <= size(ivfi); j++) {
       int varindex = ivfi[j];
-      int subindex = lpIndexOf(s1, var(varindex));
-      if (subindex > 0) {
-        tmpDegBound = tmpDegBound + deg(s2[subindex]);
-      } else {
-        tmpDegBound = tmpDegBound + 1;
-      }
-      kill varindex; kill subindex;
+      if (varindex > 0) {
+        int subindex = lpIndexOf(s1, var(varindex));
+        if (subindex > 0) {
+          tmpDegBound = tmpDegBound + deg(s2[subindex]);
+        } else {
+          tmpDegBound = tmpDegBound + 1;
+        }
+        kill subindex;
+      }
+      kill varindex;
     } kill j;
     if (tmpDegBound > maxDegBound) {