Changeset 673fd0 in git

Timestamp:

Mar 9, 2018, 4:54:02 PM (5 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

d716d197c47435132c94ea960586a0aa872edc20

Parents:

1ca84fd791c9b47186c4e1a2aec26ffb2206611a

Message:

mv shiftinvariant to freegb

Location:

Singular/LIB

Files:

• fpaprops.lib (modified) (1 diff)
• freegb.lib (modified) (1 diff)

Singular/LIB/fpaprops.lib

@@ -1278 +1278 @@
 }
 
-proc isOrderingShiftInvariant(int withHoles)
-  "USAGE:
-  RETURN: int
-  ASSUME: - basering is a Letterplace ring.
-  "
-{
-  int shiftInvariant = 1;
-
-  int n = attrib(basering, "lV");
-  int d = attrib(basering, "uptodeg");
-
-  ideal monomials;
-  if (withHoles) {
-    monomials = delete(lpMonomialsWithHoles(d-1), 1); // ignore the first element (1)
-  } else {
-    monomials = lpMaxIdeal(d-1, 0);
-  }
-
-  for (int i = 1; i <= size(monomials); i++) {
-    poly monom = monomials[i];
-    int lastblock = lastBlock(monom);
-    for (int s = 1; s <= d - lastblock; s++) {
-      for (int s2 = 0; s2 < s; s2++) { // paranoid, check every pair
-        poly first = shiftPoly(monom,s2);
-        poly second = shiftPoly(monom,s);
-        if (!(first > second)) {
-          dbprint(string(first) + " <= " + string(second));
-          shiftInvariant = 0;
-        }
-        kill first; kill second;
-      } kill s2;
-    } kill s;
-    kill monom; kill lastblock;
-  } kill i;
-
-  return(shiftInvariant);
-}
-example
-{
-  "EXAMPLE:"; echo = 2;
-  ring r = 0,(x,y,z),dp;
-  def R = makeLetterplaceRing(5);
-  setring R;
-  isOrderingShiftInvariant(0);// should be 1
-
-  ring r = 0,(x,y,z),dp;
-  def R = makeLetterplaceRing(5);
-  list RL = ringlist(R);
-  RL[3][1][1] = "wp";
-  intvec weights = 1,1,1,1,1,1,1,2,3,1,1,1,1,1,1;
-  RL[3][1][2] = weights;
-  def Rw = setLetterplaceAttributes(ring(RL),5,3);
-  setring Rw;
-  printlevel = voice + 1;
-  isOrderingShiftInvariant(0);
-  isOrderingShiftInvariant(1);
-}
-
-static proc lpMonomialsWithHoles(int d)
-{
-  if (d < 0) {
-    ERROR("d must not be negative")
-  }
-
-  ideal monomials = 1;
-  if (d == 0) {
-     return (monomials);
-  }
-
-  int lV = attrib(basering, "lV"); // variable count
-  ideal prevMonomials = lpMonomialsWithHoles(d - 1);
-
-  for (int i = 1; i <= size(prevMonomials); i++) {
-    /* if (deg(prevMonomials[i]) >= d - 1) { */
-      for (int j = 1; j <= lV; j++) {
-        poly m = prevMonomials[i];
-        m = m * var(j + (d-1)*lV);
-        monomials = monomials, m;
-        kill m;
-      } kill j;
-    /* } */
-  } kill i;
-
-  if (d > 1) {
-    // removes the 1
-    monomials[1] = 0;
-    monomials = simplify(monomials,2);
-
-    monomials = prevMonomials, monomials;
-  }
-  return (monomials);
-}

Singular/LIB/freegb.lib

@@ -3495 +3495 @@
 }
 
-
+proc isOrderingShiftInvariant(int withHoles)
+  "USAGE:
+  RETURN: int
+  ASSUME: - basering is a Letterplace ring.
+  "
+{
+  int shiftInvariant = 1;
+
+  int n = attrib(basering, "lV");
+  int d = attrib(basering, "uptodeg");
+
+  ideal monomials;
+  if (withHoles) {
+    monomials = delete(lpMonomialsWithHoles(d-1), 1); // ignore the first element (1)
+  } else {
+    monomials = lpMaxIdeal(d-1, 0);
+  }
+
+  for (int i = 1; i <= size(monomials); i++) {
+    poly monom = monomials[i];
+    int lastblock = lastBlock(monom);
+    for (int s = 1; s <= d - lastblock; s++) {
+      for (int s2 = 0; s2 < s; s2++) { // paranoid, check every pair
+        poly first = shiftPoly(monom,s2);
+        poly second = shiftPoly(monom,s);
+        if (!(first > second)) {
+          dbprint(string(first) + " <= " + string(second));
+          shiftInvariant = 0;
+        }
+        kill first; kill second;
+      } kill s2;
+    } kill s;
+    kill monom; kill lastblock;
+  } kill i;
+
+  return(shiftInvariant);
+}
+example
+{
+  "EXAMPLE:"; echo = 2;
+  ring r = 0,(x,y,z),dp;
+  def R = makeLetterplaceRing(5);
+  setring R;
+  isOrderingShiftInvariant(0);// should be 1
+
+  ring r = 0,(x,y,z),dp;
+  def R = makeLetterplaceRing(5);
+  list RL = ringlist(R);
+  RL[3][1][1] = "wp";
+  intvec weights = 1,1,1,1,1,1,1,2,3,1,1,1,1,1,1;
+  RL[3][1][2] = weights;
+  def Rw = setLetterplaceAttributes(ring(RL),5,3);
+  setring Rw;
+  printlevel = voice + 1;
+  isOrderingShiftInvariant(0);
+  isOrderingShiftInvariant(1);
+}
+
+static proc lpMonomialsWithHoles(int d)
+{
+  if (d < 0) {
+    ERROR("d must not be negative")
+  }
+
+  ideal monomials = 1;
+  if (d == 0) {
+     return (monomials);
+  }
+
+  int lV = attrib(basering, "lV"); // variable count
+  ideal prevMonomials = lpMonomialsWithHoles(d - 1);
+
+  for (int i = 1; i <= size(prevMonomials); i++) {
+    /* if (deg(prevMonomials[i]) >= d - 1) { */
+      for (int j = 1; j <= lV; j++) {
+        poly m = prevMonomials[i];
+        m = m * var(j + (d-1)*lV);
+        monomials = monomials, m;
+        kill m;
+      } kill j;
+    /* } */
+  } kill i;
+
+  if (d > 1) {
+    // removes the 1
+    monomials[1] = 0;
+    monomials = simplify(monomials,2);
+
+    monomials = prevMonomials, monomials;
+  }
+  return (monomials);
+}