Changeset bdc1cf in git

Timestamp:

Oct 29, 2017, 12:28:52 PM (6 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

f5e3fb2de3c8c481bf0f0323aa618d52b7e39a66

Parents:

b028fdafc3c7db1ac2c259ea22d70ac64bfb497e

Message:

Fix standard word computation

File:

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

Singular/LIB/fpadim.lib

@@ -882 +882 @@
 {
   int n = size(P);
-  if (n <= 0) {return(1);}
+  if (n <= 0 || P == 0) {return(1);}
   if (size(I) < n) {return(0);}
   intvec IP = I[1..n];
@@ -892 +892 @@
 "
 PURPOSE:
-checks, if a word P is a suffix of another word I
+checks, if a word S is a suffix of another word I
 "
 {
   int n = size(S);
-  if (n <= 0) {return(1);}
+  if (n <= 0 || S == 0) {return(1);}
   int m = size(I);
   if (m < n) {return(0);}
@@ -913 +913 @@
   int m = size(I);
 
-  if (n <= 0) {
-    return(1);
-  }
-  if (m < n) {
-    return(0);
-  }
+  if (n <= 0 || IF == 0) {return(1);}
+  if (m < n) {return(0);}
 
   for (int i = 0; (n + i) <= m; i++){
@@ -1491 +1487 @@
 }
 
-static proc ivStandardWords(list G, int length) {
+static proc ivStandardWords(list G, int length)
+"ASSUME: G is simplified
+"
+{
   if (length == 0) {
-    return (0); // iv = 0 means monom = 1
+    list words;
+    if (!ivdivides(G,0)) {
+      words[1] = 0; // iv = 0 means monom = 1
+    }
+    return (words); // no standard words
   }
   int lV = attrib(basering, "lV"); // variable count
@@ -1507 +1510 @@
       }
     }
+  }
+  return (words);
+}
+
+static proc ivStandardWordsUpToLength(list G, int length)
+"ASSUME: G is simplified
+"
+{
+  list words = ivStandardWords(G,0);
+  if (size(words) == 0) {return (words)}
+  for (int i = 1; i <= length; i++) {
+    words = words + ivStandardWords(G, i);
   }
   return (words);