Changeset 9142bc in git

Timestamp:

Mar 23, 2017, 5:18:23 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

aa86cce8a3226ab2a6ab4bc74cd9cf29118de208

Parents:

666a69394fd83d334aea7f4293420128f69540f3

Message:

fix: ringorder_s

File:

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

libpolys/polys/monomials/ring.cc

@@ -323 +323 @@
 
 
-    if (r->order[l] == ringorder_s)
-    {
-      assume( l == 0 );
-#ifndef SING_NDEBUG
-      Print("  syzcomp at %d",r->typ[l].data.syz.limit);
-#endif
-      continue;
-    }
-    else if (r->order[l] == ringorder_IS)
+    if (r->order[l] == ringorder_IS)
     {
       assume( r->block0[l] == r->block1[l] );
@@ -337 +329 @@
       assume( (-2 < s) && (s < 2) );
       Print("(%d)", s); // 0 => prefix! +/-1 => suffix!
+      continue;
+    }
+    else if (r->order[l]==ringorder_s)
+    {
+      assume( l == 0 );
+      Print(" syz_comp: %d",r->block0[l]);
       continue;
     }
@@ -534 +532 @@
   {
     StringAppendS((char *)rSimpleOrdStr(r->order[l]));
-    if (
+    if (r->order[l] == ringorder_s)
+    {
+      StringAppend("(%d)",r->block0[l]);
+    }
+    else if (
            (r->order[l] != ringorder_c)
         && (r->order[l] != ringorder_C)
@@ -2335 +2337 @@
 
 static void rO_Syz(int &place, int &bitplace, int &prev_ord,
-    long *o, sro_ord &ord_struct)
+    int syz_comp, long *o, sro_ord &ord_struct)
 {
   // ordering is derived from component number
@@ -2343 +2345 @@
   ord_struct.ord_typ=ro_syz;
   ord_struct.data.syz.place=place;
-  ord_struct.data.syz.limit=0;
+  ord_struct.data.syz.limit=syz_comp;
   ord_struct.data.syz.syz_index = NULL;
   ord_struct.data.syz.curr_index = 1;
@@ -3605 +3607 @@
       case ringorder_s:
         assume(typ_i == 0 && j == 0);
-        rO_Syz(j, j_bits, prev_ordsgn, tmp_ordsgn, tmp_typ[typ_i]); // set syz-limit?
+        rO_Syz(j, j_bits, prev_ordsgn, r->block0[i], tmp_ordsgn, tmp_typ[typ_i]); // set syz-limit?
         need_to_add_comp=TRUE;
         r->ComponentOrder=-1;