Changeset 4ecc6fa in git for kernel/GBEngine/kutil.h

Timestamp:

Apr 7, 2021, 6:09:07 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

e596bb3ff97e8946fdc0b593d1972a8e219125ca

Parents:

0941e691a2fa61260a13f8455d1e5ae84290b65e

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-04-07 18:09:07+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-04-07 21:21:06+02:00

Message:

GB stuff: removed strat->R, S_2_R, etc

File:

• kernel/GBEngine/kutil.h (modified) (12 diffs)

kernel/GBEngine/kutil.h

@@ -74 +74 @@
   int ecart,
     length,     // as of pLDeg
-    pLength,    // either == 0, or == pLength(p)
-    i_r;        // index of TObject in R set, or -1 if not in T
+    pLength;    // either == 0, or == pLength(p)
 
 #ifdef HAVE_SHIFTBBA
@@ -187 +186 @@
   poly  lcm;   /*- the lcm of p1,p2 -*/
   kBucket_pt bucket;
-  int   i_r1, i_r2;
   unsigned checked; // this is the index of S up to which
                       // the corresponding LObject was already checked in
@@ -281 +279 @@
   int (*posInL)(const LSet set, const int length,
                 LObject* L,const kStrategy strat);
-  void (*enterS)(LObject &h, int pos,kStrategy strat, int atR/* =-1*/ );
+  void (*enterS)(LObject &h, int pos,kStrategy strat);
   void (*initEcartPair)(LObject * h, poly f, poly g, int ecartF, int ecartG);
   int (*posInLOld)(const LSet Ls,const int Ll,
                    LObject* Lo,const kStrategy strat);
-  void (*enterOnePair) (int i,poly p,int ecart, int isFromQ,kStrategy strat, int atR /*= -1*/);
+  void (*enterOnePair) (int i,poly p,int ecart, int isFromQ,kStrategy strat);
   void (*chainCrit) (poly p,int ecart,kStrategy strat);
   BOOLEAN (*syzCrit) (poly sig, unsigned long not_sevSig, kStrategy strat);
@@ -336 +334 @@
   // procedure for ShalloCopy from tailRing  to currRing
   pShallowCopyDeleteProc p_shallow_copy_delete;
-  // pointers to Tobjects R[i] is ith Tobject which is generated
-  TObject**  R;
-  // S_2_R[i] yields Tobject which corresponds to S[i]
-  int*      S_2_R;
   ring tailRing;
   omBin lmBin;
@@ -423 +417 @@
 void deleteInL(LSet set, int *length, int j,kStrategy strat);
 void enterL (LSet *set,int *length, int *LSetmax, LObject p,int at);
-void enterSBba (LObject &p,int atS,kStrategy strat, int atR = -1);
-void enterSBbaShift (LObject &p,int atS,kStrategy strat, int atR = -1);
-void enterSSba (LObject &p,int atS,kStrategy strat, int atR = -1);
+void enterSBba (LObject &p,int atS,kStrategy strat);
+void enterSBbaShift (LObject &p,int atS,kStrategy strat);
+void enterSSba (LObject &p,int atS,kStrategy strat);
 void initEcartPairBba (LObject* Lp,poly f,poly g,int ecartF,int ecartG);
 void initEcartPairMora (LObject* Lp,poly f,poly g,int ecartF,int ecartG);
@@ -515 +509 @@
 void enterExtendedSpoly(poly h,kStrategy strat);
 void enterExtendedSpolySig(poly h,poly hSig,kStrategy strat);
-void superenterpairs (poly h,int k,int ecart,int pos,kStrategy strat, int atR = -1);
-void superenterpairsSig (poly h,poly hSig,int hFrom,int k,int ecart,int pos,kStrategy strat, int atR = -1);
+void superenterpairs (poly h,int k,int ecart,int pos,kStrategy strat);
+void superenterpairsSig (poly h,poly hSig,int hFrom,int k,int ecart,int pos,kStrategy strat);
 poly kCreateZeroPoly(long exp[], long cabsind, poly* t_p, ring leadRing, ring tailRing);
 long ind2(long arg);
@@ -529 +523 @@
 int redSigRing (LObject* h,kStrategy strat);
 //adds hSig to be able to check with F5's criteria when entering pairs!
-void enterpairsSig (poly h, poly hSig, int from, int k, int ec, int pos,kStrategy strat, int atR = -1);
-void enterpairs (poly h, int k, int ec, int pos,kStrategy strat, int atR = -1);
+void enterpairsSig (poly h, poly hSig, int from, int k, int ec, int pos,kStrategy strat);
+void enterpairs (poly h, int k, int ec, int pos,kStrategy strat);
 void entersets (LObject h);
 void pairs ();
@@ -580 +574 @@
 void completeReduce (kStrategy strat, BOOLEAN withT=FALSE);
 void kFreeStrat(kStrategy strat);
-void enterOnePairNormal (int i,poly p,int ecart, int isFromQ,kStrategy strat, int atR);
+void enterOnePairNormal (int i,poly p,int ecart, int isFromQ,kStrategy strat);
 void chainCritNormal (poly p,int ecart,kStrategy strat);
 void chainCritOpt_1 (poly,int,kStrategy strat);
@@ -785 +779 @@
 void ksCreateSpoly(LObject* Pair, poly spNoether = NULL,
                    int use_buckets=0, ring tailRing=currRing,
-                   poly m1 = NULL, poly m2 = NULL, TObject** R = NULL);
+                   poly m1 = NULL, poly m2 = NULL);
 
 /*2
@@ -814 +808 @@
 BOOLEAN kCheckSpolyCreation(LObject* L, kStrategy strat, poly &m1, poly &m2);
 #ifdef HAVE_RINGS
-// return TRUE if gcdpoly creation of R[atR] and S[atS] does not violate
-//             exponent bound of strat->tailRing
-//      FALSE, otherwise
-BOOLEAN kCheckStrongCreation(int atR, poly m1, int atS, poly m2, kStrategy strat);
 poly preIntegerCheck(ideal F, ideal Q);
 void postReduceByMon(LObject* h, kStrategy strat);
@@ -858 +848 @@
 void enterTShift(LObject p, kStrategy strat, int atT = -1);
 
-void enterOnePairShift (poly q, poly p, int ecart, int isFromQ, kStrategy strat, int atR, int ecartq, int qisFromQ, int shiftcount, int ifromS);
-
-void enterpairsShift (poly h,int k,int ecart,int pos,kStrategy strat, int atR);
-
-void superenterpairsShift (poly h,int k,int ecart,int pos,kStrategy strat, int atR);
+void enterOnePairShift (poly q, poly p, int ecart, int isFromQ, kStrategy strat, int ecartq, int qisFromQ, int shiftcount, int ifromS);
+
+void enterpairsShift (poly h,int k,int ecart,int pos,kStrategy strat);
+
+void superenterpairsShift (poly h,int k,int ecart,int pos,kStrategy strat);
 
 poly redtailBbaShift (LObject* L, int pos, kStrategy strat, BOOLEAN withT, BOOLEAN normalize);
@@ -888 +878 @@
 }
 
-void initenterpairs (poly h,int k,int ecart,int isFromQ,kStrategy strat, int atR = -1);
-#endif
+void initenterpairs (poly h,int k,int ecart,int isFromQ,kStrategy strat);
+#endif