Changeset 6adc9e in git for Singular

Timestamp:

Mar 2, 2020, 1:59:11 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

cb06ace2199aca68931c89e6c242ddd8d0495182

Parents:

0762d1992787f92d68136edec0cb298d13afc382

Message:

use of attrib "maxExp" by ringlist: only, if needed

Location:

Singular

Files:

• iparith.cc (modified) (2 diffs)
• ipshell.cc (modified) (3 diffs)

Singular/iparith.cc

@@ -4498 +4498 @@
   lists l=(lists)v->Data();
   long mm=(long)atGet(v,"maxExp",INT_CMD);
-  if (mm==0) mm=0x7fff;
   int isLetterplace=(int)(long)atGet(v,"isLetterplaceRing",INT_CMD);
   ring r=rCompose(l,TRUE,mm,isLetterplace);
@@ -4843 +4842 @@
     if (res->data!=NULL)
     {
-      long mm=r->bitmask;
-      if (mm>MAX_INT_VAL) mm=MAX_INT_VAL;
-      atSet(res,omStrDup("maxExp"),(void*)mm,INT_CMD);
+      long mm=r->wanted_maxExp;
+      if (mm!=0) atSet(res,omStrDup("maxExp"),(void*)mm,INT_CMD);
       return FALSE;
     }

Singular/ipshell.cc

@@ -2783 +2783 @@
     return TRUE;
   }
-  if (bitmask!=0) R->bitmask=bitmask;
+  if (bitmask!=0) { R->bitmask=bitmask; R->wanted_maxExp=bitmask; }
   return FALSE;
 }
@@ -2934 +2934 @@
   }
   #endif
-  if (bitmask!=0x7fff) R->bitmask=bitmask;
+  if ((bitmask!=0)&&(R->wanted_maxExp==0)) R->wanted_maxExp=bitmask;
   rComplete(R);
 
@@ -5309 +5309 @@
     else if ((*iv)[1]==ringorder_L)
     {
-      R->bitmask=(*iv)[2]*2+1;
+      R->wanted_maxExp=(*iv)[2]*2+1;
       n--;
     }