Changeset 5956ac9 in git for libpolys/polys/polys0.cc

Timestamp:

Dec 3, 2018, 3:06:25 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

a2e710f5fec606bbc77b74c30907c0b6defd141d

Parents:

65e8f13fcb176d13e624ff95cb8efa00cf8fea763055a67024ccc2284bfe7f6f6484aa74f17a0b73

Message:

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

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)) // this implies bNotShortOut
+  {
+    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=TRUE; //(bNotShortOut);
+          writeGen=TRUE;
+          if (writeEmptyBlock)
+            StringAppendS("_");
+          else
+          {
+            StringAppendS(rRingVar(i, r));
+            if (ee != 1L)
+            {
+              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 (wroteCoef)
+            StringAppendS("*");
+          //else
           wroteCoef=(bNotShortOut);
-        writeGen=TRUE;
-        StringAppendS(rRingVar(i, r));
-        if (ee != 1L)
-        {
-          if (bNotShortOut) StringAppendS("^");
-          StringAppend("%ld", ee);
+          writeGen=TRUE;
+          StringAppendS(rRingVar(i, r));
+          if (ee != 1L)
+          {
+            if (bNotShortOut) StringAppendS("^");
+            StringAppend("%ld", ee);
+          }
         }
       }