Changeset 1603fb in git

Timestamp:

Feb 14, 2017, 10:54:07 AM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5f286e30f548bbf278f08a06b3895c4c6bf33388

Parents:

5d4e04d77fef5104429b3e4280bdb19ce50bd4de

Message:

made enterOne... static in kutil.cc

Location:

kernel/GBEngine

Files:

• kutil.cc (modified) (9 diffs)
• kutil.h (modified) (2 diffs)

kernel/GBEngine/kutil.cc

@@ -907 +907 @@
   {
     // now p1 and p2 must be != NULL and must be contained in T
+    // unless for SHIFTGB: here each p_i must be in T or
+    // be shifted from an element in T -> to difficult to test
     int i;
     i = kFindInT(L->p1, T, tlength);
@@ -1274 +1276 @@
 * put the pair (s[i],p)  into the set B, ecart=ecart(p) (ring case)
 */
-void enterOnePairRing (int i,poly p,int /*ecart*/, int isFromQ,kStrategy strat, int atR = -1)
+static void enterOnePairRing (int i,poly p,int /*ecart*/, int isFromQ,kStrategy strat, int atR)
 {
   assume(atR >= 0);
@@ -1514 +1516 @@
 */
 
-BOOLEAN enterOneStrongPoly (int i,poly p,int /*ecart*/, int /*isFromQ*/,kStrategy strat, int atR, bool enterTstrong)
+static BOOLEAN enterOneStrongPoly (int i,poly p,int /*ecart*/, int /*isFromQ*/,kStrategy strat, int atR, bool enterTstrong)
 {
   number d, s, t;
@@ -1709 +1711 @@
 }
 
-BOOLEAN enterOneStrongPolySig (int i,poly p,poly sig,int /*ecart*/, int /*isFromQ*/,kStrategy strat, int atR)
+static BOOLEAN enterOneStrongPolySig (int i,poly p,poly sig,int /*ecart*/, int /*isFromQ*/,kStrategy strat, int atR)
 {
   number d, s, t;
@@ -2218 +2220 @@
 */
 
-void enterOnePairLift (int i,poly p,int ecart, int isFromQ,kStrategy strat, int atR = -1)
+static void enterOnePairLift (int i,poly p,int ecart, int isFromQ,kStrategy strat, int atR = -1)
 {
   assume(ALLOW_PROD_CRIT(strat));
@@ -2432 +2434 @@
 
 #ifdef DEBUGF5
-void enterOnePairSig (int i, poly p, poly pSig, int from, int ecart, int isFromQ, kStrategy strat, int atR = -1)
+static void enterOnePairSig (int i, poly p, poly pSig, int from, int ecart, int isFromQ, kStrategy strat, int atR = -1)
 #else
-void enterOnePairSig (int i, poly p, poly pSig, int, int ecart, int isFromQ, kStrategy strat, int atR = -1)
+static void enterOnePairSig (int i, poly p, poly pSig, int, int ecart, int isFromQ, kStrategy strat, int atR = -1)
 #endif
 {
@@ -2689 +2691 @@
 
 #ifdef DEBUGF5
-void enterOnePairSigRing (int i, poly p, poly pSig, int from, int ecart, int isFromQ, kStrategy strat, int atR = -1)
+static void enterOnePairSigRing (int i, poly p, poly pSig, int from, int ecart, int isFromQ, kStrategy strat, int atR = -1)
 #else
-void enterOnePairSigRing (int i, poly p, poly pSig, int, int ecart, int isFromQ, kStrategy strat, int atR = -1)
+static void enterOnePairSigRing (int i, poly p, poly pSig, int, int ecart, int isFromQ, kStrategy strat, int atR = -1)
 #endif
 {
@@ -12174 +12176 @@
 * put the pairs (sh \dot s[i],p)  into the set B, ecart=ecart(p)
 */
-void enterOnePairManyShifts (int i, poly p, int ecart, int isFromQ, kStrategy strat, int /*atR*/, int uptodeg, int lV)
+void enterOnePairManyShifts (int i, poly p, int ecart, int isFromQ, kStrategy strat, int atR, int uptodeg, int lV)
 {
   /* p comes from strat->P.p, that is LObject with LM in currRing and Tail in tailRing */
@@ -12239 +12241 @@
     //}
 #endif
+    //kFindInTShift(q,atR,strat);
     enterOnePairShift(q, p, ecart, isFromQ, strat, -1, ecartq, qfromQ, j, i, uptodeg, lV);
   }

kernel/GBEngine/kutil.h

@@ -527 +527 @@
 void entersets (LObject h);
 void pairs ();
-BOOLEAN enterOneStrongPoly (int i,poly p,int /*ecart*/, int /*isFromQ*/,kStrategy strat, int atR = -1, bool enterTstrong = FALSE);
 BOOLEAN sbaCheckGcdPair (LObject* h,kStrategy strat);
-BOOLEAN enterOneStrongPolySig (int i,poly p,poly sig,int /*ecart*/, int /*isFromQ*/,kStrategy strat, int atR = -1);
 void message (int i,int* reduc,int* olddeg,kStrategy strat,int red_result);
 void messageStat (int hilbcount,kStrategy strat);
@@ -576 +574 @@
 void kFreeStrat(kStrategy strat);
 void enterOnePairNormal (int i,poly p,int ecart, int isFromQ,kStrategy strat, int atR);
-void enterOnePairLift (int i,poly p,int ecart, int isFromQ,kStrategy strat, int atR);
-void enterOnePairSig (int i,poly p,poly pSig,int ecart, int isFromQ,kStrategy strat, int atR);
-void enterOnePairSigRing (int i,poly p,poly pSig,int ecart, int isFromQ,kStrategy strat, int atR);
 void chainCritNormal (poly p,int ecart,kStrategy strat);
 void chainCritOpt_1 (poly,int,kStrategy strat);