Changeset cb72d2 in git

Timestamp:

Oct 10, 2018, 5:04:09 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

f190196e27fa6d66bc5230d2587b99527ba5fa1e

Parents:

744abff418696fe730a23e8b601f9625084b50ca

Message:

fix: missing HAVE_SHIFTBBA and rIsLPRing test

Files:

• Singular/iparith.cc (modified) (5 diffs)
• Singular/ipshell.cc (modified) (1 diff)
• kernel/GBEngine/kutil.cc (modified) (2 diffs)
• libpolys/polys/monomials/ring.cc (modified) (1 diff)
• libpolys/polys/monomials/ring.h (modified) (2 diffs)

Singular/iparith.cc

@@ -2213 +2213 @@
           c_par_names=currRing->cf->extRing->names;
         }
-        #ifdef HAVE_SHIFTBBA
-        if (r->isLPring==0)
-        #endif
+        if (!rIsLPRing(r))
         {
           maFindPerm(r->names,       r->N,       r_par_names, r_par,
@@ -4440 +4438 @@
   int isLetterplace=(int)(long)atGet(v,"isLetterplaceRing",INT_CMD);
   ring r=rCompose(l,TRUE,mm,isLetterplace);
+  #ifdef HAVE_SHIFTBBA
   if (isLetterplace)
   {
@@ -4446 +4445 @@
     r->isLPring=TRUE;
   }
+  #endif
   res->data=(char *)r;
   return (r==NULL);
@@ -9290 +9290 @@
     /* else, ALLOW_PLURAL */
   }
-  else if (currRing->isLPring)
+  #ifdef HAVE_SHIFTBBA
+  else if (rIsLPRing(currRing))
   {
     if ((p & ALLOW_LP)==0)
@@ -9298 +9299 @@
     }
   }
+  #endif
   #endif
 #ifdef HAVE_RINGS

Singular/ipshell.cc

@@ -2895 +2895 @@
 
   if (!isLetterplace) rRenameVars(R);
+  #ifdef HAVE_SHIFTBBA
   else R->isLPring=isLetterplace;
+  #endif
   if (bitmask!=0x7fff) R->bitmask=bitmask*2;
   rComplete(R);

kernel/GBEngine/kutil.cc

@@ -7839 +7839 @@
   Print("product criterion:%d chain criterion:%d\n",strat->cp,strat->c3);
   if (hilbcount!=0) Print("hilbert series criterion:%d\n",hilbcount);
+  #ifdef HAVE_SHIFTBBA
   /* in usual case strat->cv is 0, it gets changed only in shift routines */
   if (strat->cv!=0) Print("shift V criterion:%d\n",strat->cv);
-  /*mflush();*/
+  #endif
 }
 
@@ -7852 +7853 @@
   //Print("product criterion:%d chain criterion:%d\n",strat->cp,strat->c3);
   if (hilbcount!=0) Print("hilbert series criterion:%d\n",hilbcount);
+  #ifdef HAVE_SHIFTBBA
   /* in usual case strat->cv is 0, it gets changed only in shift routines */
   if (strat->cv!=0) Print("shift V criterion:%d\n",strat->cv);
-  /*mflush();*/
+  #endif
 }
 

libpolys/polys/monomials/ring.cc

@@ -417 +417 @@
 #endif
   }
-  if (r->isLPring)
+  if (rIsLPRing(r))
   {
     PrintS("\n// letterplace ring");

libpolys/polys/monomials/ring.h

@@ -397 +397 @@
 static inline BOOLEAN rIsPluralRing(const ring r)
 {
-  assume(r != NULL); assume(r->cf != NULL);
+  assume(r != NULL);
 #ifdef HAVE_PLURAL
   nc_struct *n;
@@ -406 +406 @@
 }
 
-static inline BOOLEAN rIsNCRing(const ring r)
-{
-  assume(r != NULL); assume(r->cf != NULL);
-#ifdef HAVE_PLURAL
-  return (r->isLPring!=0) || rIsPluralRing(r);
+static inline BOOLEAN rIsLPRing(const ring r)
+{
+  assume(r != NULL);
+#ifdef HAVE_SHIFTBBA
+  return (r->isLPring!=0);
 #else
   return FALSE;
 #endif
+}
+
+static inline BOOLEAN rIsNCRing(const ring r)
+{
+  return rIsLPRing(r) || rIsPluralRing(r);
 }