Changeset 5116b54 in git

Timestamp:

Nov 30, 2017, 11:15:26 AM (6 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d3b5daad4e83852adf7e56ca035de6b4bcf4a06e

Parents:

bf25dfc7fcad90a083d05ce14ff812d9495a62be

git-author:

Christian Eder <ederc@mathematik.uni-kl.de>2017-11-30 11:15:26+01:00

git-committer:

Christian Eder <ederc@mathematik.uni-kl.de>2018-08-16 09:52:17+02:00

Message:

adds a pair lcm check in bba() if we are working over rings

Location:

kernel/GBEngine

Files:

• kstd2.cc (modified) (1 diff)
• kutil.cc (modified) (1 diff)
• kutil.h (modified) (1 diff)

kernel/GBEngine/kstd2.cc

@@ -2341 +2341 @@
         minimcnt++;
       }
+
+      // a first test for removing old pairs where
+      // strat->P.p divides lcm of pair
+      /* if (rField_is_Ring(currRing))
+       *   pairLcmCriterion(strat); */
 
       // enter into S, L, and T

kernel/GBEngine/kutil.cc

@@ -3913 +3913 @@
   }
 }
-
 #ifdef HAVE_RINGS
+// a first test for removing old pairs where
+// strat->P.p divides lcm of pair
+void pairLcmCriterion(kStrategy strat)
+{
+        number a  = pGetCoeff(strat->P.p);
+        poly t    = strat->P.p;
+        for (int l = 0; l < strat->Ll; ++l) {
+                if (n_DivBy(a, pGetCoeff(strat->L[l].p), currRing->cf) &&
+                                /* !(strat->sevS[j] & ~sev) && */
+                                p_LmDivisibleBy(strat->L[l].p, t, currRing)) {
+                        deleteInL(strat->L, &strat->Ll, l, strat);
+                        printf("!!\n");
+                }
+        }
+}
+
 /*2
 *the pairset B of pairs of type (s[i],p) is complete now. It will be updated

kernel/GBEngine/kutil.h

@@ -574 +574 @@
 void kFreeStrat(kStrategy strat);
 void enterOnePairNormal (int i,poly p,int ecart, int isFromQ,kStrategy strat, int atR);
+void pairLcmCriterion(kStrategy strat);
 void chainCritNormal (poly p,int ecart,kStrategy strat);
 void chainCritOpt_1 (poly,int,kStrategy strat);