Changeset 59b9fdb in git

Timestamp:

Mar 8, 2018, 5:08:15 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

239d735990d1f7ad5e27ad2ce28f8305525c418d9a03c2dc812de8eeadb5ea846b85d1b21c1d247f

Parents:

0d5959cf283bcd6d174bfef558dd97713320de46

Message:

opt: tgb.cc, kFindIn..

Location:

kernel/GBEngine

Files:

• kstd2.cc (modified) (3 diffs)
• tgb.cc (modified) (3 diffs)

kernel/GBEngine/kstd2.cc

@@ -91 +91 @@
   const TSet T=strat->T;
   const unsigned long* sevT=strat->sevT;
+  const ring r=currRing;
+  const BOOLEAN is_Ring=rField_is_Ring(r);
   if (L->p!=NULL)
   {
-    const ring r=currRing;
     const poly p=L->p;
 
     pAssume(~not_sev == p_GetShortExpVector(p, r));
 
-    if(rField_is_Ring(r))
+    if(is_Ring)
     {
       loop
@@ -145 +146 @@
     const poly p=L->t_p;
     const ring r=strat->tailRing;
-    if(rField_is_Ring(r))
+    if(is_Ring)
     {
       loop
@@ -200 +201 @@
 
   pAssume(~not_sev == p_GetShortExpVector(p, currRing));
+
+  BOOLEAN is_Ring=rField_is_Ring(currRing);
 #if 1
   int ende;
-  if ((strat->ak>0) || currRing->pLexOrder || rField_is_Ring(currRing)) ende=strat->sl;
-  else ende=posInS(strat,*max_ind,p,0)+1;
-  if (ende>(*max_ind)) ende=(*max_ind);
+  if (is_Ring
+  || (strat->ak>0)
+  || currRing->pLexOrder)
+    ende=strat->sl;
+  else
+  {
+    ende=posInS(strat,*max_ind,p,0)+1;
+    if (ende>(*max_ind)) ende=(*max_ind);
+  }
 #else
   int ende=strat->sl;
 #endif
-  (*max_ind)=ende;
-  if(rField_is_Ring(currRing))
+  if(is_Ring)
   {
     loop

kernel/GBEngine/tgb.cc

@@ -2997 +2997 @@
         nDelete (&coef);
         h = kBucketGetLm (P.bucket);
-        pTest (h);
         if(h == NULL)
         {
@@ -3006 +3005 @@
           return res;
         }
-        pTest (h);
         P.p = h;
         P.t_p = NULL;
@@ -4493 +4491 @@
       return;
     }
-    if(j < 0)
+    else /*if(j < 0)*/
     {
       //not reduceable, try to use this for reducing higher terms