Changeset d08de4 in git for libpolys

Timestamp:

Nov 24, 2018, 4:47:57 PM (5 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

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

Children:

2b556a233dfaeb437351a31315ce8aa41a63ef72

Parents:

352a92c88d03b3b9cf5dcabdeb7619670ccc7228

git-author:

Karim Abou Zeid <karim23697@gmail.com>2018-11-24 16:47:57+01:00

git-committer:

Karim Abou Zeid <karim23697@gmail.com>2018-11-28 06:55:27+01:00

Message:

Better priniting of invalid letterplace monomials

examples:
x(2)*y(4) = _*x*_*y
x(2)*x(3)*y(3)*x(5) = _*x*x&y*_*x

nothing changes if the monomial is valid:
x(1)*y(2)*x(3) = x*y*x

File:

• libpolys/polys/polys0.cc (modified) (2 diffs)

libpolys/polys/polys0.cc

@@ -28 +28 @@
   assume(C != NULL);
 
-#ifdef HAVE_SHIFTBBA
-  if (r->isLPring)
-  {
-    if (!p_mIsInV(p, r))
-    {
-      /*
-      * the monomial is not a valid letterplace monomial
-      * without this warning one cannot distinguish between
-      * x(1)*x(3) and x(1)*x(2) because they would both be displayed
-      * as x*x
-      */
-      int *expV = (int *) omAlloc((r->N+1)*sizeof(int));
-      p_GetExpV(p, expV, r);
-      char* s = LPExpVString(expV, r);
-      Warn("invalid letterplace monomial: (%s)", s);
-      omFreeSize((ADDRESS) expV, (r->N+1)*sizeof(int));
-      omFree(s);
-    }
-  }
-#endif
-
   BOOLEAN wroteCoef=FALSE,writeGen=FALSE;
   const BOOLEAN bNotShortOut = (rShortOut(r) == FALSE);
@@ -88 +67 @@
 
   int i;
-  for (i=0; i<rVar(r); i++)
-  {
-    {
-      long ee = p_GetExp(p,i+1,r);
-      if (ee!=0L)
+#ifdef HAVE_SHIFTBBA
+  if (rIsLPRing(r))
+  {
+    int lV = r->isLPring;
+    int lastVar = p_mLastVblock(p, r) * lV;
+    BOOLEAN wroteBlock = FALSE;
+    for (i=0; i<rVar(r); i++)
+    {
       {
-        if (wroteCoef)
-          StringAppendS("*");
-        //else
+        long ee = p_GetExp(p,i+1,r);
+        BOOLEAN endOfBlock = ((i+1) % lV) == 0;
+        BOOLEAN writeEmptyBlock = ee==0L && endOfBlock && !wroteBlock && i < lastVar;
+        if (ee!=0L || writeEmptyBlock)
+        {
+          if (wroteBlock)
+            StringAppendS("&");
+          else if (wroteCoef)
+            StringAppendS("*");
+          //else
           wroteCoef=(bNotShortOut);
-        writeGen=TRUE;
-        StringAppendS(rRingVar(i, r));
-        if (ee != 1L)
+          writeGen=TRUE;
+          if (writeEmptyBlock)
+            StringAppendS("_");
+          else
+          {
+            StringAppendS(rRingVar(i, r));
+            if (ee != 1L)
+            {
+              if (bNotShortOut) StringAppendS("^");
+              StringAppend("%ld", ee);
+            }
+            wroteBlock = TRUE;
+          }
+        }
+        if (endOfBlock)
+          wroteBlock = FALSE;
+      }
+    }
+  }
+  else
+#endif
+  {
+    for (i=0; i<rVar(r); i++)
+    {
+      {
+        long ee = p_GetExp(p,i+1,r);
+        if (ee!=0L)
         {
-          if (bNotShortOut) StringAppendS("^");
-          StringAppend("%ld", ee);
+          if (wroteCoef)
+            StringAppendS("*");
+          //else
+          wroteCoef=(bNotShortOut);
+          writeGen=TRUE;
+          StringAppendS(rRingVar(i, r));
+          if (ee != 1L)
+          {
+            if (bNotShortOut) StringAppendS("^");
+            StringAppend("%ld", ee);
+          }
         }
       }