Changeset 65e8f1 in git

Timestamp:

Dec 3, 2018, 3:05:43 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5956ac90f8b4a29e0389355a95b459bbd44021c4

Parents:

e74bb40f6e063763d745d5d3a66019cd43866fc4

Message:

debug: test wvhdl[i] in rWrite/rOrdStr

File:

• libpolys/polys/monomials/ring.cc (modified) (2 diffs)

libpolys/polys/monomials/ring.cc

@@ -345 +345 @@
     if (r->wvhdl[l]!=NULL)
     {
+      #ifndef SING_NDEBUG
+      if((r->order[l] != ringorder_wp)
+      &&(r->order[l] != ringorder_Wp)
+      &&(r->order[l] != ringorder_ws)
+      &&(r->order[l] != ringorder_Ws)
+      &&(r->order[l] != ringorder_a)
+      &&(r->order[l] != ringorder_am)
+      &&(r->order[l] != ringorder_M))
+      {
+        Warn("should not have wvhdl entry at pos. %d",l);
+      }
+      #endif
       for (int j= 0;
            j<(r->block1[l]-r->block0[l]+1)*(r->block1[l]-r->block0[l]+1);
@@ -534 +546 @@
       if (r->wvhdl[l]!=NULL)
       {
-        StringAppendS("(");
-        for (int j= 0;
-             j<(r->block1[l]-r->block0[l]+1)*(r->block1[l]-r->block0[l]+1);
-             j+=i+1)
+        #ifndef SING_NDEBUG
+        if((r->order[l] != ringorder_wp)
+        &&(r->order[l] != ringorder_Wp)
+        &&(r->order[l] != ringorder_ws)
+        &&(r->order[l] != ringorder_Ws)
+        &&(r->order[l] != ringorder_a)
+        &&(r->order[l] != ringorder_am)
+        &&(r->order[l] != ringorder_M))
         {
-          char c=',';
-          if(r->order[l]==ringorder_a64)
+          Warn("should not have wvhdl entry at pos. %d",l);
+          StringAppend("(%d)",r->block1[l]-r->block0[l]+1);
+        }
+        else
+        #endif
+        {
+          StringAppendS("(");
+          for (int j= 0;
+               j<(r->block1[l]-r->block0[l]+1)*(r->block1[l]-r->block0[l]+1);
+               j+=i+1)
           {
-            int64 * w=(int64 *)r->wvhdl[l];
-            for (i = 0; i<r->block1[l]-r->block0[l]; i++)
+            char c=',';
+            if(r->order[l]==ringorder_a64)
             {
-              StringAppend("%lld," ,w[i]);
+              int64 * w=(int64 *)r->wvhdl[l];
+              for (i = 0; i<r->block1[l]-r->block0[l]; i++)
+              {
+                StringAppend("%lld," ,w[i]);
+              }
+              StringAppend("%lld)" ,w[i]);
+              break;
             }
-            StringAppend("%lld)" ,w[i]);
-            break;
+            else
+            {
+              for (i = 0; i<r->block1[l]-r->block0[l]; i++)
+              {
+                StringAppend("%d," ,r->wvhdl[l][i+j]);
+              }
+            }
+            if (r->order[l]!=ringorder_M)
+            {
+              StringAppend("%d)" ,r->wvhdl[l][i+j]);
+              break;
+            }
+            if (j+i+1==(r->block1[l]-r->block0[l]+1)*(r->block1[l]-r->block0[l]+1))
+              c=')';
+            StringAppend("%d%c" ,r->wvhdl[l][i+j],c);
           }
-          else
-          {
-            for (i = 0; i<r->block1[l]-r->block0[l]; i++)
-            {
-              StringAppend("%d," ,r->wvhdl[l][i+j]);
-            }
-          }
-          if (r->order[l]!=ringorder_M)
-          {
-            StringAppend("%d)" ,r->wvhdl[l][i+j]);
-            break;
-          }
-          if (j+i+1==(r->block1[l]-r->block0[l]+1)*(r->block1[l]-r->block0[l]+1))
-            c=')';
-          StringAppend("%d%c" ,r->wvhdl[l][i+j],c);
         }
       }