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

Timestamp:

Feb 14, 2017, 4:15:23 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

54c80cb81ed58f166a023fc060f541e24ebd5892

Parents:

d9cb95f3845a633ab0381967b7930368de50baa8

Message:

more static in kutil.cc

File:

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

kernel/GBEngine/kutil.cc

@@ -12176 +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)
+static 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 */
@@ -12605 +12605 @@
 
 #ifdef HAVE_SHIFTBBA
-/*2
-*(s[0],h),...,(s[k],h) will be put to the pairset L(via initenterpairs)
-*superfluous elements in S will be deleted
-*/
-void enterpairsShift (poly h,int k,int ecart,int pos,kStrategy strat, int atR,int uptodeg, int lV)
-{
-  /* h is strat->P.p, that is LObject with LM in currRing and Tail in tailRing */
-  /* Q: what is exactly the strat->fromT ? A: a local case trick; don't need it yet*/
-  int j=pos;
-
-  assume (!rField_is_Ring(currRing));
-  initenterpairsShift(h,k,ecart,0,strat, atR,uptodeg,lV);
-  if ( (!strat->fromT)
-  && ((strat->syzComp==0)
-    ||(pGetComp(h)<=strat->syzComp)))
-  {
-    //Print("start clearS k=%d, pos=%d, sl=%d\n",k,pos,strat->sl);
-    unsigned long h_sev = pGetShortExpVector(h);
-    loop
-    {
-      if (j > k) break;
-      clearS(h,h_sev, &j,&k,strat);
-      j++;
-    }
-    //Print("end clearS sl=%d\n",strat->sl);
-  }
- // PrintS("end enterpairs\n");
-}
-#endif
-
-#ifdef HAVE_SHIFTBBA
 /*3
 *(s[0], s \dot h),...,(s[k],s \dot h) will be put to the pairset L
@@ -12706 +12675 @@
 
   }
+}
+#endif
+
+#ifdef HAVE_SHIFTBBA
+/*2
+*(s[0],h),...,(s[k],h) will be put to the pairset L(via initenterpairs)
+*superfluous elements in S will be deleted
+*/
+void enterpairsShift (poly h,int k,int ecart,int pos,kStrategy strat, int atR,int uptodeg, int lV)
+{
+  /* h is strat->P.p, that is LObject with LM in currRing and Tail in tailRing */
+  /* Q: what is exactly the strat->fromT ? A: a local case trick; don't need it yet*/
+  int j=pos;
+
+  assume (!rField_is_Ring(currRing));
+  initenterpairsShift(h,k,ecart,0,strat, atR,uptodeg,lV);
+  if ( (!strat->fromT)
+  && ((strat->syzComp==0)
+    ||(pGetComp(h)<=strat->syzComp)))
+  {
+    //Print("start clearS k=%d, pos=%d, sl=%d\n",k,pos,strat->sl);
+    unsigned long h_sev = pGetShortExpVector(h);
+    loop
+    {
+      if (j > k) break;
+      clearS(h,h_sev, &j,&k,strat);
+      j++;
+    }
+    //Print("end clearS sl=%d\n",strat->sl);
+  }
+ // PrintS("end enterpairs\n");
 }
 #endif