Changeset 6e3023a in git for kernel/kutil.h

Timestamp:

Dec 18, 2013, 2:57:02 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

3a9e92a717b194d4a06a429b452258c0269579076235be46a7d664256bb99b1bd6340cd8ad800e2c

Parents:

74c446222122656dc7859919b51f3806768e7fd331b00db0e867fa73d4415e16969423de4337f6f7

Message:

Merge pull request #437 from ederc/sig-comparisons

Improvements for SBA

File:

• kernel/kutil.h (modified) (8 diffs)

kernel/kutil.h

@@ -180 +180 @@
 public:
   unsigned long sev;
-  unsigned long from; // from which polynomial it comes from
-            // this is important for signature-based
-            // algorithms
+  unsigned long from; // index in sig up to which the correspongin LObject was already checked
   unsigned long checked; // this is the index of S up to which
                       // the corresponding LObject was already checked in
@@ -188 +186 @@
                       // reduction process it is enough to start a second
                       // rewritten criterion check from checked+1 onwards
-                      // NOTE: If checked = 3 then the corresponding pair is
+  BOOLEAN prod_crit;
+                      // NOTE: If prod_crit = TRUE then the corresponding pair is
                       // detected by Buchberger's Product Criterion and can be
                       // deleted
@@ -289 +288 @@
   void (*chainCrit) (poly p,int ecart,kStrategy strat);
   BOOLEAN (*syzCrit) (poly sig, unsigned long not_sevSig, kStrategy strat);
-  BOOLEAN (*rewCrit1) (poly sig, unsigned long not_sevSig, kStrategy strat, int start /*= 0*/);
-  BOOLEAN (*rewCrit2) (poly sig, unsigned long not_sevSig, kStrategy strat, int start /*= 0*/);
+  BOOLEAN (*rewCrit1) (poly sig, unsigned long not_sevSig, poly lm, kStrategy strat, int start /*= 0*/);
+  BOOLEAN (*rewCrit2) (poly sig, unsigned long not_sevSig, poly lm, kStrategy strat, int start /*= 0*/);
+  BOOLEAN (*rewCrit3) (poly sig, unsigned long not_sevSig, poly lm, kStrategy strat, int start /*= 0*/);
   pFDegProc pOrigFDeg;
   pLDegProc pOrigLDeg;
@@ -310 +310 @@
                 // syzygy of component i comes up
                 // important for signature-based algorithms
-  BOOLEAN incremental;
+  unsigned sbaOrder;
   unsigned long currIdx;
   int max_lower_index;
@@ -446 +446 @@
 int posInLSig (const LSet set, const int length,
                LObject* L,const kStrategy strat);
+int posInSyz (const kStrategy strat, const poly sig);
 int posInL0 (const LSet set, const int length,
              LObject* L,const kStrategy strat);
@@ -467 +468 @@
 poly redtailBba (LObject *L, int pos,kStrategy strat,
                  BOOLEAN withT = FALSE,BOOLEAN normalize=FALSE);
+poly redtailSba (LObject *L, int pos,kStrategy strat,
+                 BOOLEAN withT = FALSE,BOOLEAN normalize=FALSE);
 poly redtailBba (TObject *T, int pos,kStrategy strat);
 poly redtail (poly p,int pos,kStrategy strat);
@@ -518 +521 @@
 void initSyzRules (kStrategy strat);
 void updateS(BOOLEAN toT,kStrategy strat);
-void enterSyz (LObject p,kStrategy strat);
+void enterSyz (LObject p,kStrategy strat, int atT);
 void enterT (LObject p,kStrategy strat, int atT = -1);
 void cancelunit (LObject* p,BOOLEAN inNF=FALSE);
@@ -542 +545 @@
 BOOLEAN syzCriterion(poly sig, unsigned long not_sevSig, kStrategy strat);
 BOOLEAN syzCriterionInc(poly sig, unsigned long not_sevSig, kStrategy strat);
-KINLINE BOOLEAN arriRewDummy(poly sig, unsigned long not_sevSig, kStrategy strat, int start);
-BOOLEAN arriRewCriterion(poly sig, unsigned long not_sevSig, kStrategy strat, int start);
-BOOLEAN faugereRewCriterion(poly sig, unsigned long not_sevSig, kStrategy strat, int start);
+KINLINE BOOLEAN arriRewDummy(poly sig, unsigned long not_sevSig, poly lm, kStrategy strat, int start);
+BOOLEAN arriRewCriterion(poly sig, unsigned long not_sevSig, poly lm, kStrategy strat, int start);
+BOOLEAN arriRewCriterionPre(poly sig, unsigned long not_sevSig, poly lm, kStrategy strat, int start);
+BOOLEAN faugereRewCriterion(poly sig, unsigned long not_sevSig, poly lm, kStrategy strat, int start);
 BOOLEAN findMinLMPair(poly sig, unsigned long not_sevSig, kStrategy strat, int start);
 // returns index of p in TSet, or -1 if not found