Changeset be66125 in git

Timestamp:

Sep 22, 2017, 5:10:17 PM (7 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

ea18a95964ffad2d2586d104f8f35140f7cff2e6

Parents:

5359196937f2937c7fab45eb6a94928bf6396e28

Message:

Prepare for release, add doc and make procs static

File:

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

Singular/LIB/fpadim.lib

@@ -1136 +1136 @@
 // -----------------main procedures----------------------
 
-proc lpUfGkDim(ideal G)
+static proc lpUfGkDim(ideal G)
 {
   G = lead(G);
@@ -1195 +1195 @@
 }
 
-proc UfGraphURTNZDGrowth(intmat UG) {
+static proc UfGraphURTNZDGrowth(intmat UG) {
   // URTNZD = upper right triangle non zero diagonal
   for (int i = 1; i <= ncols(UG); i++) {
@@ -1209 +1209 @@
 }
 
-proc imIsZero(intmat M) {
+static proc imIsZero(intmat M) {
   intmat Zero[nrows(M)][ncols(M)];
   return (M == Zero);
 }
 
-proc imIsUpRightTriangle(intmat M) {
+static proc imIsUpRightTriangle(intmat M) {
   for (int i = 1; i <= nrows(M); i++) {
     for (int j = 1; j < i; j++) {
@@ -1223 +1223 @@
 }
 
-proc eliminateZerosUpTriangle(intmat G) {
+static proc eliminateZerosUpTriangle(intmat G) {
   // G is expected to be an upper triangle matrix
   for (int i = 1; i <= ncols(G); i++) {
@@ -1242 +1242 @@
 }
 
-proc imDelRowCol(intmat M, int row, int col) {
+static proc imDelRowCol(intmat M, int row, int col) {
   // row and col are expected to be > 0
   int nr = nrows(M);
@@ -1261 +1261 @@
 }
 
-proc topologicalSort(intmat G) {
+static proc topologicalSort(intmat G) {
   // NOTE: ignores loops
   // NOTE: this takes O(|V^3|), can be optimized
@@ -1295 +1295 @@
 }
 
-proc imPermcol (intmat A, int c1, int c2)
+static proc imPermcol (intmat A, int c1, int c2)
 {
    intmat B = A;
@@ -1304 +1304 @@
 }
 
-proc imPermrow (intmat A, int r1, int r2)
+static proc imPermrow (intmat A, int r1, int r2)
 {
    intmat B = A;
@@ -1313 +1313 @@
 }
 
-proc UfGraphGrowth(intmat UG)
+static proc UfGraphGrowth(intmat UG)
 {
   int n = ncols(UG); // number of vertices
@@ -1337 +1337 @@
 }
 
-proc countCycles(intmat G, int v, intvec visited, intvec cyclic, intvec path)
+static proc countCycles(intmat G, int v, intvec visited, intvec cyclic, intvec path)
 "USAGE: countCycles(G, v, visited, cyclic, path); G a Graph, v the vertex to
 start. visited, cyclic and path should be 0.
@@ -1418 +1418 @@
 }
 
-proc lpUfGraph(ideal G)
+static proc lpUfGraph(ideal G)
 "USAGE: lpUfGraph(G); G a set of monomials in a letterplace ring
 RETURN: intmat
@@ -1460 +1460 @@
 }
 
-proc ivStandardWords(list G, int length) {
+static proc ivStandardWords(list G, int length) {
   if (length == 0) {
     return (0); // iv = 0 means monom = 1
@@ -1492 +1492 @@
 }
 
-proc lpGraphOfNormalWords(ideal G)
+static proc lpGraphOfNormalWords(ideal G)
 "USAGE: lpGraphOfNormalWords(G); G a set of monomials in a letterplace ring
 RETURN: intmat
@@ -1562 +1562 @@
 }
 
-proc lpNorGkDim(ideal G)
+static proc lpNorGkDim(ideal G)
 "USAGE: lpNorGkDim(G); G an ideal in a letterplace ring
 RETURN: int
@@ -2828 +2828 @@
 /*}*/
 
-proc lpSubstitute(poly f, list s1, list s2, ideal G) {
+proc lpSubstitute(poly f, list s1, list s2, list #) {
+"USAGE: lpSubstitute(f,s1,s2[,G]); f letterplace polynomial, s1 list of variables
+@*      to replace, s2 list of polynomials to replace with, G optional ideal to
+@*      reduce with.
+RETURN: poly, the substituted polynomial
+ASSUME: - basering is a Letterplace ring
+@*      - G is a groebner basis,
+@*      - the current ring has a sufficient degbound (can be calculated with 
+@*        calcSubstDegBound())
+EXAMPLE: example lpSubstitute; shows examples
+"
+  ideal G;
+  if (size(#) > 0) {
+    if (typeof(#[1])=="ideal") {
+      G = #[1];
+    }
+  }
+
   poly fs;
   for (int i = 1; i <= size(f); i++) {
@@ -2855 +2872 @@
   setring R;
 
-  ideal G = x(1)*y(2); // optional, can be 0
+  ideal G = x(1)*y(2); // optional
 
   poly f = 3*x(1)*x(2)+y(1)*x(2);
@@ -2861 +2878 @@
   list s2 = y(1)*z(2)*z(3), x(1);
 
+  // the substitution probably needs a higher degbound
   int minDegBound = calcSubstDegBounds(f,s1,s2);
   setring r;
@@ -2866 +2884 @@
   setring R1;
 
+  // the last parameter is optional
   lpSubstitute(imap(R,f), imap(R,s1), imap(R,s2), imap(R,G));
 }
@@ -2890 +2909 @@
   list s2 = imap(R,s2);
   for (int i = 1; i <= size(L); i++) {
-    lpSubstitute(L[i], s1, s2, 0);
-  }
-}
-
-proc indexof(list L, int varindex) {
+    lpSubstitute(L[i], s1, s2);
+  }
+}
+
+static proc indexof(list L, int varindex) {
   for (int i = 1; i <= size(L); i++) {
     if (lp2iv(L[i])[1] == varindex) {
@@ -2904 +2923 @@
 
 proc calcSubstDegBound(poly f, list s1, list s2) {
+"USAGE: calcSubstDegBound(f,s1,s2); f letterplace polynomial, s1 list of variables
+@*      to replace, s2 list of polynomials to replace with
+RETURN: int, the min degbound required to perform the substitution
+ASSUME: - basering is a Letterplace ring
+EXAMPLE: example lpSubstitute; shows examples
+"
   int maxDegBound = 0;
   for (int i = 1; i <= size(f); i++) {
@@ -2921 +2946 @@
     }
   }
+
+  // increase degbound by 50% when ideal is provided
+  // needed for lpNF
+  maxDegBound = maxDegBound + maxDegBound/2;
+
   return (maxDegBound);
 }
@@ -2926 +2956 @@
 // convenience method
 proc calcSubstDegBounds(list L, list s1, list s2) {
+"USAGE: calcSubstDegBounds(L,s1,s2); L list of letterplace polynomials, s1 list
+@*      of variables to replace, s2 list of polynomials to replace with
+RETURN: int, the min degbound required to perform all of the substitutions
+ASSUME: - basering is a Letterplace ring
+EXAMPLE: example lpSubstitute; shows examples
+"
   int maxDegBound = 0;
   for (int i = 1; i <= size(L); i++) {
-    int tmpDegBound = calcSubstDegBound(L[i], s1, s2);
+    int tmpDegBound = calcSubstDegBound(L[i], s1, s2, #);
     if (tmpDegBound > maxDegBound) {
       maxDegBound = tmpDegBound;