Changeset b45eec in git for libpolys/polys/monomials/ring.cc

Timestamp:

Apr 19, 2020, 9:57:14 PM (4 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ffcf715a570941627bf020648e93955f1596f2ef

Parents:

d49a473d44aa25c5ecc3126360ab3179ddb8af7e636fa5455e699fa8c0a820dd60e00a059f96f8ef

Message:

Merge branch 'stable' into lp_Z

File:

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

libpolys/polys/monomials/ring.cc

@@ -122 +122 @@
   r->block0 = block0;
   r->block1 = block1;
-  r->bitmask = bitmask;
+  if (bitmask!=0) r->wanted_maxExp=bitmask;
 
   /* complete ring intializations */
@@ -609 +609 @@
     if (l==nblocks)
     {
-      if (r->bitmask!=0xffff)
-      {
-        long mm=r->bitmask;
+      if (r->wanted_maxExp!=0)
+      {
+        long mm=r->wanted_maxExp;
         if (mm>MAX_INT_VAL) mm=MAX_INT_VAL;
         StringAppend(",L(%ld)",mm);
@@ -2649 +2649 @@
   assume (r != NULL );
   assume (exp_limit > 1);
-  BOOLEAN need_other_ring;
   BOOLEAN omitted_degree = FALSE;
 
+  int bits;
+  exp_limit=rGetExpSize(exp_limit, bits, r->N);
+  BOOLEAN need_other_ring = (exp_limit != r->bitmask);
+
   int iNeedInducedOrderingSetup = 0; ///< How many induced ordering block do we have?
-  int bits;
-
-  exp_limit=rGetExpSize(exp_limit, bits, r->N);
-  need_other_ring = (exp_limit != r->bitmask);
 
   int nblocks=rBlocks(r);
@@ -2803 +2802 @@
   res->block1=block1;
   res->bitmask=exp_limit;
+  res->wanted_maxExp=r->wanted_maxExp;
   //int tmpref=r->cf->ref0;
   rComplete(res, 1);
@@ -2974 +2974 @@
     res->block1=block1;
     res->bitmask=exp_limit;
+    res->wanted_maxExp=r->wanted_maxExp;
     //int tmpref=r->cf->ref;
     rComplete(res, 1);
@@ -3406 +3407 @@
   int i;
   int bits;
-  r->bitmask=rGetExpSize(r->bitmask,bits,r->N);
+  r->bitmask=rGetExpSize(r->wanted_maxExp,bits,r->N);
   r->BitsPerExp = bits;
   r->ExpPerLong = BIT_SIZEOF_LONG / bits;