Changeset dcddf66 in git for kernel/GBEngine/kutil.cc

Timestamp:

Jun 7, 2017, 3:37:38 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

5361740013273f5e2466bb8da3694c915d880fa8

Parents:

ce1b53088c76b35ea7757238cd2eb7a737b01645

Message:

minor opt: p_GetComp -> __p_GetComp if there is a component

File:

• kernel/GBEngine/kutil.cc (modified) (14 diffs)

kernel/GBEngine/kutil.cc

@@ -148 +148 @@
 static inline int pDivCompRing(poly p, poly q)
 {
-  if (pGetComp(p) == pGetComp(q))
+  if ((currRing->pCompIndex < 0)
+  || (__p_GetComp(p,currRing) == __p_GetComp(q,currRing)))
   {
     BOOLEAN a=FALSE, b=FALSE;
@@ -186 +187 @@
 static inline int pDivComp(poly p, poly q)
 {
-  if (pGetComp(p) == pGetComp(q))
+  if ((currRing->pCompIndex < 0)
+  || (__p_GetComp(p,currRing) == __p_GetComp(q,currRing)))
   {
 #ifdef HAVE_RATGRING
@@ -331 +333 @@
 void cancelunit (LObject* L,BOOLEAN inNF)
 {
-  int  i;
-  poly h;
   number lc;
 
@@ -340 +340 @@
   ring r = L->tailRing;
   poly p = L->GetLmTailRing();
+  if(p_GetComp(p, r) != 0 && !p_OneComp(p, r)) return;
 
   if (rField_is_Ring(r) /*&& (rHasLocalOrMixedOrdering(r))*/)
@@ -354 +355 @@
 #endif
 
-  if(p_GetComp(p, r) != 0 && !p_OneComp(p, r)) return;
 
 //    for(i=r->N;i>0;i--)
@@ -360 +360 @@
 //      if ((p_GetExp(p,i,r)>0) && (rIsPolyVar(i, r)==TRUE)) return;
 //    }
-  h = pNext(p);
+  poly h = pNext(p);
+  int  i;
 
   if(rField_is_Ring(currRing))
@@ -393 +394 @@
         if (L->p != NULL && pNext(L->p) != NULL)
           pNext(L->p) = NULL;
-
         return;
       }
@@ -4694 +4694 @@
       if (rRing_has_Comp(currRing) && rRing_has_Comp(strat->tailRing))
       {
-        p_SetComp(tmp, p_GetComp(p, strat->tailRing), currRing);
+        p_SetComp(tmp, __p_GetComp(p, strat->tailRing), currRing);
       }
       p_Setm(tmp, currRing);
@@ -4776 +4776 @@
       if (rRing_has_Comp(currRing) && rRing_has_Comp(strat->tailRing))
       {
-        p_SetComp(tmp, p_GetComp(p, strat->tailRing), currRing);
+        p_SetComp(tmp, __p_GetComp(p, strat->tailRing), currRing);
       }
       p_Setm(tmp, currRing);
@@ -7156 +7156 @@
   pWrite(sig);
 #endif
-  int comp = p_GetComp(sig, currRing);
+  int comp = __p_GetComp(sig, currRing);
   int min, max;
   if (comp<=1)
@@ -7601 +7601 @@
         if (Ln.p!=NULL)
         {
-          if (p_GetComp(Ln.p,currRing)> strat->syzComp) break;
+          if (__p_GetComp(Ln.p,currRing)> strat->syzComp) break;
         }
         else
         {
-          if (p_GetComp(Ln.t_p,strat->tailRing)> strat->syzComp) break;
+          if (__p_GetComp(Ln.t_p,strat->tailRing)> strat->syzComp) break;
         }
       }
@@ -7709 +7709 @@
         if (Ln.p!=NULL)
         {
-          if (p_GetComp(Ln.p,currRing)> strat->syzComp) break;
+          if (__p_GetComp(Ln.p,currRing)> strat->syzComp) break;
         }
         else
         {
-          if (p_GetComp(Ln.t_p,strat->tailRing)> strat->syzComp) break;
+          if (__p_GetComp(Ln.t_p,strat->tailRing)> strat->syzComp) break;
         }
       }
@@ -8457 +8457 @@
           p_ExpVectorCopy(q,strat->S[i],currRing);
           q               = p_Neg (q, currRing);
-          p_SetCompP (q, p_GetComp(strat->sig[k], currRing), currRing);
+          p_SetCompP (q, __p_GetComp(strat->sig[k], currRing), currRing);
           Q.sig = p_Add_q (Q.sig, q, currRing);
           Q.sevSig  = p_GetShortExpVector(Q.sig,currRing);
@@ -8501 +8501 @@
       p_ExpVectorCopy(q,strat->L[strat->Ll].p,currRing);
       q               = p_Neg (q, currRing);
-      p_SetCompP (q, p_GetComp(strat->sig[k], currRing), currRing);
+      p_SetCompP (q, __p_GetComp(strat->sig[k], currRing), currRing);
       Q.sig = p_Add_q (Q.sig, q, currRing);
       Q.sevSig = p_GetShortExpVector(Q.sig,currRing);