Changeset df290e in git

Timestamp:

Nov 15, 2018, 5:10:08 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')

Children:

1bbd47fd39d8d0bee713b13b974dba118d689cd3

Parents:

bc15c51191c62dfcdbced9dd8a75b9ea898fff6248401d8de4609213813d6032d00fcf9519b8eeed

Message:

Merge branch 'spielwiese' of github.com:Singular/Sources into spielwiese

Files:

• Singular/LIB/fpaprops.lib (modified) (1 diff)
• Singular/LIB/freegb.lib (modified) (5 diffs)
• doc/letterplace.doc (modified) (previous)
• doc/plulibs.doc (modified) (previous)
• doc/plural.doc (modified) (previous)
• doc/sca.doc (modified) (previous)
• doc/singular.doc (modified) (previous)

Singular/LIB/fpaprops.lib

@@ -777 +777 @@
       if (#[1] != 0) {
         list ret = UG;
-        ret[2] = ivL2lpI(SW); // the vertices
+        ret[2] = SW; // the vertices
         return (ret);
       }

Singular/LIB/freegb.lib

@@ -3262 +3262 @@
 }
 
+static proc entryViolation(intmat M, int n)
+"PURPOSE:checks, if all entries in M are variable-related
+"
+{int i,j;
+  for (i = 1; i <= nrows(M); i++)
+  {for (j = 1; j <= ncols(M); j++)
+    {if(!((1<=M[i,j])&&(M[i,j]<=n))) {return(1);}}
+  }
+  return(0);
+}
+
+static proc checkAssumptionsLPIV(int d, list L)
+"PURPOSE: Checks, if all the Assumptions are holding
+"
+{if (attrib(basering,"isLetterplaceRing")==0) {ERROR("Basering is not a Letterplace ring!");}
+  if (d > attrib(basering,"uptodeg")) {ERROR("Specified degree bound exceeds ring parameter!");}
+  int i;
+  for (i = 1; i <= size(L); i++)
+  {if (entryViolation(L[i], attrib(basering,"isLetterplaceRing")))
+    {ERROR("Not allowed monomial/intvec found!");}
+  }
+  return();
+}
+
 static proc checkAssumptions(poly p, ideal G)
 "
@@ -3607 +3631 @@
 EXAMPLE: example iv2lpList; shows examples
 "
-{checkAssumptions(0,L);
+{checkAssumptionsLPIV(0,L);
   ideal G;
   int i;
@@ -3637 +3661 @@
 "
 {list L = M;
-  checkAssumptions(0,L);
+  checkAssumptionsLPIV(0,L);
   kill L;
   ideal G; poly p;
@@ -3672 +3696 @@
   int i,j,k;
   list M;
-  checkAssumptions(0,M);
+  checkAssumptionsLPIV(0,M);
   for (i = 1; i <= size(G); i++) {M[i] = lp2iv(G[i]);}
   return(M);
@@ -3735 +3759 @@
 {G = normalize(lead(G));
   intvec I; list L;
-  checkAssumptions(0,G);
+  checkAssumptionsLPIV(0,L);
   int i,md;
   for (i = 1; i <= size(G); i++) { if (md <= deg(G[i])) {md = deg(G[i]);}}