Changeset 921f32 in git

Timestamp:

Dec 18, 2018, 4:55:28 PM (5 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

76b17c9f4370c2a5339d376eb75d3d06e5da4a72

Parents:

b8498566aa4a3ab88d5be05cde0f7e4a5652c890

Message:

Rename lpBlockSize to lpVarBlockSize

Location:

Singular/LIB

Files:

• fpadim.lib (modified) (12 diffs)
• fpaprops.lib (modified) (7 diffs)
• freegb.lib (modified) (19 diffs)
• ncHilb.lib (modified) (2 diffs)

Singular/LIB/fpadim.lib

@@ -136 +136 @@
   int i;
   for (i = 1; i <= size(L); i++)
-  {if (entryViolation(L[i], lpBlockSize(basering)))
+  {if (entryViolation(L[i], lpVarBlockSize(basering)))
     {ERROR("Not allowed monomial/intvec found!");}
   }
@@ -907 +907 @@
   // construct the Graph of normal words [Studzinski page 78]
   // construct set of vertices
-  int v = lpBlockSize(basering); int d = lpDegBound(basering);
+  int v = lpVarBlockSize(basering); int d = lpDegBound(basering);
   ideal V; poly p,q,w;
   ideal LG = lead(G);
@@ -1691 +1691 @@
 EXAMPLE: example lpDHilbert; shows examples
 "
-{int degbound = lpDegBound(basering);int n = lpBlockSize(basering);
+{int degbound = lpDegBound(basering);int n = lpVarBlockSize(basering);
   if (size(#) > 0){if (typeof(#[1])=="int"){if (#[1] >= 0){degbound = #[1];}}}
   if (size(#) > 1){if (typeof(#[1])=="int"){if (#[2] > 0){n = #[2];}}}
@@ -1733 +1733 @@
 EXAMPLE: example lpDHilbertSickle; shows examples
 "
-{int degbound = lpDegBound(basering);int n = lpBlockSize(basering);
+{int degbound = lpDegBound(basering);int n = lpVarBlockSize(basering);
   if (size(#) > 0){if (typeof(#[1])=="int"){if (#[1] >= 0){degbound = #[1];}}}
   if (size(#) > 1){if (typeof(#[1])=="int"){if (#[2] > 0){n = #[2];}}}
@@ -1778 +1778 @@
 SEE ALSO: ncHilb_lib
 "
-{int degbound = lpDegBound(basering);int n = lpBlockSize(basering);
+{int degbound = lpDegBound(basering);int n = lpVarBlockSize(basering);
   if (size(#) > 0){if (typeof(#[1])=="int"){if (#[1] >= 0){degbound = #[1];}}}
   if (size(#) > 1){if (typeof(#[1])=="int"){if (#[2] > 0){n = #[2];}}}
@@ -1809 +1809 @@
 EXAMPLE: example lpKDimCheck; shows examples
 "
-{int n = lpBlockSize(basering);
+{int n = lpVarBlockSize(basering);
   list L;
   ideal R;
@@ -1844 +1844 @@
 EXAMPLE: example lpKDim; shows examples
 "
-{int degbound = lpDegBound(basering);int n = lpBlockSize(basering);
+{int degbound = lpDegBound(basering);int n = lpVarBlockSize(basering);
   if (size(#) > 0){if (typeof(#[1])=="int"){if (#[1] >= 0){degbound = #[1];}}}
   if (size(#) > 1){if (typeof(#[1])=="int"){if (#[2] > 0){n = #[2];}}}
@@ -1948 +1948 @@
 EXAMPLE: example lpSickle; shows examples
 "
-{int degbound = lpDegBound(basering); int n = lpBlockSize(basering);
+{int degbound = lpDegBound(basering); int n = lpVarBlockSize(basering);
   if (size(#) > 0){if (typeof(#[1])=="int"){if (#[1] >= 0){degbound = #[1];}}}
   if (size(#) > 1){if (typeof(#[1])=="int"){if (#[2] > 0){n = #[2];}}}
@@ -1988 +1988 @@
 EXAMPLE: example lpSickleDim; shows examples
 "
-{int degbound = lpDegBound(basering);int n = lpBlockSize(basering);
+{int degbound = lpDegBound(basering);int n = lpVarBlockSize(basering);
   if (size(#) > 0){if (typeof(#[1])=="int"){if (#[1] >= 0){degbound = #[1];}}}
   if (size(#) > 1){if (typeof(#[1])=="int"){if (#[2] > 0){n = #[2];}}}
@@ -2028 +2028 @@
 EXAMPLE: example lpSickleHil; shows examples
 "
-{int degbound = lpDegBound(basering);int n = lpBlockSize(basering);
+{int degbound = lpDegBound(basering);int n = lpVarBlockSize(basering);
   if (size(#) > 0){if (typeof(#[1])=="int"){if (#[1] >= 0){degbound = #[1];}}}
   if (size(#) > 1){if (typeof(#[1])=="int"){if (#[2] > 0){n = #[2];}}}
@@ -2082 +2082 @@
   if (m == 1)
   {if (d == 0)
-    {if (h == 0) {return(lpSickle(G,degbound,lpBlockSize(basering)));}
-      else        {return(lpSickleHil(G,degbound,lpBlockSize(basering)));}
+    {if (h == 0) {return(lpSickle(G,degbound,lpVarBlockSize(basering)));}
+      else        {return(lpSickleHil(G,degbound,lpVarBlockSize(basering)));}
     }
     else
-    {if (h == 0) {return(lpSickleDim(G,degbound,lpBlockSize(basering)));}
-      else {return(lpDHilbertSickle(G,degbound,lpBlockSize(basering)));}
+    {if (h == 0) {return(lpSickleDim(G,degbound,lpVarBlockSize(basering)));}
+      else {return(lpDHilbertSickle(G,degbound,lpVarBlockSize(basering)));}
     }
   }
@@ -2093 +2093 @@
   {if (d == 0)
     {if (h == 0) {ERROR("You request to do nothing, so relax and do so");}
-      else        {return(lpHilbert(G,degbound,lpBlockSize(basering)));}
+      else        {return(lpHilbert(G,degbound,lpVarBlockSize(basering)));}
     }
     else
-    {if (h == 0) {return(lpKDim(G,degbound,lpBlockSize(basering)));}
-      else {return(lpDHilbert(G,degbound,lpBlockSize(basering)));}
+    {if (h == 0) {return(lpKDim(G,degbound,lpVarBlockSize(basering)));}
+      else {return(lpDHilbert(G,degbound,lpVarBlockSize(basering)));}
     }
   }

Singular/LIB/fpaprops.lib

@@ -91 +91 @@
   // if longest word has length 1 we handle it as a special case
   if (l == 1) {
-    int n = lpBlockSize(basering); // variable count
+    int n = lpVarBlockSize(basering); // variable count
     int k = size(G);
     if (k == n) { // only the field left
@@ -746 +746 @@
     ERROR("Ufnarovskij graph not implemented for l = 1");
   }
-  int lV = lpBlockSize(basering);
+  int lV = lpVarBlockSize(basering);
   // TODO: what if l <= 0?
   dbprint("computing standard words");
@@ -836 +836 @@
     return (words); // no standard words
   }
-  int lV = lpBlockSize(basering); // variable count
+  int lV = lpVarBlockSize(basering); // variable count
   list prevWords = ivStandardWords(G, length - 1);
   list words;
@@ -907 +907 @@
   // if longest word has length 1, or G is the zero ideal, we handle it as a special case
   if (l == 1 || size(G) == 0) {
-    int n = lpBlockSize(basering); // variable count
+    int n = lpVarBlockSize(basering); // variable count
     int k = size(G);
     if (k == n) { // V = {1} no edges
@@ -1004 +1004 @@
   if (size(G1) > 0) {
     while (size(G1) > 0) {
-      if (lpBlockSize(R) > 1) {
+      if (lpVarBlockSize(R) > 1) {
         def @R = R - string(G1[1]);
         R = @R;
@@ -1082 +1082 @@
 {
   list LG = lpId2ivLi(lead(G));
-  int n = lpBlockSize(basering);
+  int n = lpVarBlockSize(basering);
   int degbound = lpDegBound(basering);
 
@@ -1384 +1384 @@
 /* // removes a variable from a letterplace ring (a bit of a hack) */
 /* static proc lpDelVar(int index) { */
-/*   int lV = lpBlockSize(basering); // number of variables in the main block */
+/*   int lV = lpVarBlockSize(basering); // number of variables in the main block */
 /*   int d = lpDegBound(basering); // degree bround */
 /*   list LR = ringlist(basering); */

Singular/LIB/freegb.lib

@@ -26 +26 @@
 isFreeAlgebra(r);                check whether r is a letterplace ring (free algebra)
 lpDegBound(R);                   returns the degree bound of a letterplace ring
-lpBlockSize(R);                  returns the size of the letterplace blocks
+lpVarBlockSize(R);               returns the size of the letterplace blocks
 
 letplaceGBasis(I);               (deprecated, use twostd) two-sided Groebner basis of a letterplace ideal I
@@ -126 +126 @@
   ring r = 0,(x(1),y(1),x(2),y(2),x(3),y(3),x(4),y(4)),dp;
   def R = setLetterplaceAttributes(r, 4, 2); setring R;
-  lpBlockSize(R);
+  lpVarBlockSize(R);
   lieBracket(x(1),y(1),2);
 }
@@ -1018 +1018 @@
 }
 
-proc lpBlockSize(def R)
-"USAGE:  lpBlockSize(R); R a letterplace ring
+proc lpVarBlockSize(def R)
+"USAGE:  lpVarBlockSize(R); R a letterplace ring
 RETURN:  int
-PURPOSE: returns the block size of the letterplace ring, that is the number of variables of the original ring.
-EXAMPLE: example lpBlockSize; shows examples
+PURPOSE: returns the variable block size of the letterplace ring, that is the number of variables of the original ring.
+EXAMPLE: example lpVarBlockSize; shows examples
 "
 {
@@ -1036 +1036 @@
   ring r = 0,(x,y,z),dp;
   def R = freeAlgebra(r, 7);
-  lpBlockSize(R);
+  lpVarBlockSize(R);
 }
 
@@ -1128 +1128 @@
   def A = makeLetterplaceRing(2); // same as  makeLetterplaceRing(2,0)
   setring A;  A;
-  lpBlockSize(A);
+  lpVarBlockSize(A);
   lpDegBound(A);  // degree bound
   setring r; def B = makeLetterplaceRing(2,1); // to compare:
   setring B;  B;
-  lpBlockSize(B);
+  lpVarBlockSize(B);
   lpDegBound(B);  // degree bound
   setring r; def C = makeLetterplaceRing(2,2); // to compare:
@@ -1219 +1219 @@
   setring A;
   A;
-  lpBlockSize(A);// number of variables in the main block
+  lpVarBlockSize(A);// number of variables in the main block
   lpDegBound(A);  // degree bound
 }
@@ -1324 +1324 @@
   setring A;
   A;
-  lpBlockSize(A); // number of variables in the main block
+  lpVarBlockSize(A); // number of variables in the main block
   lpDegBound(A);  // degree bound
 }
@@ -1388 +1388 @@
   setring A;
   A;
-  lpBlockSize(A); // number of variables in the main block
+  lpVarBlockSize(A); // number of variables in the main block
   lpDegBound(A);  // degree bound
 }
@@ -1494 +1494 @@
   setring A;
   A;
-  lpBlockSize(A); // number of variables in the main block
+  lpVarBlockSize(A); // number of variables in the main block
   lpDegBound(A);  // degree bound
 }
@@ -2941 +2941 @@
   // make new ring
   def save = basering;
-  int norigvars = lpBlockSize(save);
+  int norigvars = lpVarBlockSize(save);
   def Rtagged; def temp = save;
   for (int i = 1; i <= size(I); i++) {
@@ -2948 +2948 @@
   } kill i;
   // currently R + "var" doesn't preserve uptodeg
-  Rtagged = setLetterplaceAttributes(Rtagged, lpBlockSize(Rtagged), lpDegBound(save));
+  Rtagged = setLetterplaceAttributes(Rtagged, lpVarBlockSize(Rtagged), lpDegBound(save));
   setring Rtagged;
 
@@ -3060 +3060 @@
 {if (I==intvec(0)) {return(intvec(0));}
  int j,k,l;
- int n = lpBlockSize(basering); int d = lpDegBound(basering);
+ int n = lpVarBlockSize(basering); int d = lpDegBound(basering);
  intvec w; j = 1;
  while (j <= d)
@@ -3096 +3096 @@
 "
 {int i,j,k,r1,r2; intvec D;
- int n = lpBlockSize(basering);
+ int n = lpVarBlockSize(basering);
  k = size(V) div n; r1 = 0; r2 = 0;
  for (i=1; i<= k; i++)
@@ -3141 +3141 @@
 
  int i,j,r; intvec T; list R;
- int n = lpBlockSize(basering);
+ int n = lpVarBlockSize(basering);
  int k = size(V) - size(W) + 1;
  if (intvec(V[1..size(W)])-W == 0){R[1]=0;}
@@ -3309 +3309 @@
   }
 
-  int lV = lpBlockSize(basering); // variable count
+  int lV = lpVarBlockSize(basering); // variable count
   ideal prevMonomials = lpMonomialsWithHoles(d - 1);
 
@@ -3335 +3335 @@
 static proc getlpCoeffs(poly q, poly p)
 {list R; intvec cq,t,lv,rv,bla;
- int n = lpBlockSize(basering); int d = lpDegBound(basering);
+ int n = lpVarBlockSize(basering); int d = lpDegBound(basering);
  int i;
  cq = leadexp(p)-leadexp(q); /* p/q */
@@ -3383 +3383 @@
   int i;
   for (i = 1; i <= size(L); i++)
-  {if (entryViolation(L[i], lpBlockSize(basering)))
+  {if (entryViolation(L[i], lpVarBlockSize(basering)))
     {ERROR("Not allowed monomial/intvec found!");}
   }
@@ -3427 +3427 @@
 {int r = 0; intvec w;
  intvec l = leadexp(p);
- int n = lpBlockSize(basering); int d = lpDegBound(basering);
+ int n = lpVarBlockSize(basering); int d = lpDegBound(basering);
  int i,j,c,c1;
  while (1 <= d)
@@ -3822 +3822 @@
   if (p == 0) {ERROR("Monomial is not allowed to equal zero");}
   intvec lep = leadexp(p);
-  for ( i = 1; i <= lpBlockSize(basering); i++) {if (lep[i] == 1) {I = i; break;}}
-  for (i = (lpBlockSize(basering)+1); i <= size(lep); i++)
+  for ( i = 1; i <= lpVarBlockSize(basering); i++) {if (lep[i] == 1) {I = i; break;}}
+  for (i = (lpVarBlockSize(basering)+1); i <= size(lep); i++)
   {if (lep[i] == 1)
-    { j = (i mod lpBlockSize(basering));
-      if (j == 0) {I = I,lpBlockSize(basering);}
+    { j = (i mod lpVarBlockSize(basering));
+      if (j == 0) {I = I,lpVarBlockSize(basering);}
       else {I = I,j;}
     }

Singular/LIB/ncHilb.lib

@@ -75 +75 @@
     def save = basering;
     int sz=size(#);
-    int lV=lpBlockSize(save); // nvars(orig comm ring)
+    int lV=lpVarBlockSize(save); // nvars(orig comm ring)
     int ig=0;
     int mgrad=0;
@@ -403 +403 @@
 EXAMPLE: example rcolon; shows an example"
 {
-    int lV =  lpBlockSize(R); //nvars(save);
+    int lV =  lpVarBlockSize(R); //nvars(save);
     if (lV == 0)
     {