Changeset 98f4749 in git

Timestamp:

Oct 5, 2018, 12:16:14 PM (6 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

a75fc358053e71da8efed299e30de63ea29f3c0f

Parents:

28ac7f47ccca7ef7dbc24705df22abae3603b39b

git-author:

Christian Eder <ederc@mathematik.uni-kl.de>2018-10-05 12:16:14+02:00

git-committer:

Christian Eder <ederc@mathematik.uni-kl.de>2018-10-05 12:37:42+02:00

Message:

uses locally defined ring r instead of currRing when searching for reducers in T

File:

• kernel/GBEngine/kstd2.cc (modified) (4 diffs)

kernel/GBEngine/kstd2.cc

@@ -104 +104 @@
       if (p_LmShortDivisibleBy(T[j].p, sevT[j],p, not_sev, r) && p_LmEqual(T[j].p, p, r))
       {
-        mult= n_QuotRem(pGetCoeff(p), pGetCoeff(T[j].p),
-            &rest, currRing->cf);
+        mult= n_QuotRem(pGetCoeff(p), pGetCoeff(T[j].p), &rest, r->cf);
         if (!n_IsZero(mult, currRing)) {
           /* try to get the probably best one, i.e. with smallest coeff */
           if (o == -1 ||
-              n_Greater(pGetCoeff(T[o].p), pGetCoeff(T[j].p), currRing->cf))
+              n_Greater(pGetCoeff(T[o].p), pGetCoeff(T[j].p), r->cf))
             o = j;
         }
@@ -125 +124 @@
       if (p_LmShortDivisibleBy(T[j].p, sevT[j],p, not_sev, r) && p_LmEqual(T[j].p, p, r))
       {
-        mult = n_QuotRem(pGetCoeff(p), pGetCoeff(T[j].p),
-            &rest, currRing->cf);
+        mult = n_QuotRem(pGetCoeff(p), pGetCoeff(T[j].p), &rest, r->cf);
         if (!n_IsZero(mult, currRing)) {
           /* try to get the probably best one, i.e. with smallest coeff */
           if (o == -1 ||
-              n_Greater(pGetCoeff(T[o].p), pGetCoeff(T[j].p), currRing->cf))
+              n_Greater(pGetCoeff(T[o].p), pGetCoeff(T[j].p), r->cf))
             o = j;
         }
@@ -162 +160 @@
       if (p_LmShortDivisibleBy(T[j].p, sevT[j],p, not_sev, r))
       {
-        mult= n_QuotRem(pGetCoeff(p), pGetCoeff(T[j].p),
-            &rest, currRing->cf);
-        if (!n_IsZero(mult, currRing)) {
+        mult= n_QuotRem(pGetCoeff(p), pGetCoeff(T[j].p), &rest, r->cf);
+        if (!n_IsZero(mult, r)) {
           return j;
         }
       }
 #else
-      if (!(sevT[j] & not_sev) &&
-          p_LmDivisibleBy(T[j].p, p, r))
-      {
-        mult = n_QuotRem(pGetCoeff(p), pGetCoeff(T[j].p),
-            &rest, currRing->cf);
-        if (!n_IsZero(mult, currRing)) {
+      if (!(sevT[j] & not_sev) && p_LmDivisibleBy(T[j].p, p, r))
+      {
+        mult = n_QuotRem(pGetCoeff(p), pGetCoeff(T[j].p), &rest, r->cf);
+        if (!n_IsZero(mult, r)) {
           return j;
         }
@@ -193 +188 @@
             p, not_sev, r))
       {
-        mult = n_QuotRem(pGetCoeff(p), pGetCoeff(T[j].p),
-            &rest, currRing->cf);
-        if (!n_IsZero(mult, currRing)) {
+        mult = n_QuotRem(pGetCoeff(p), pGetCoeff(T[j].p), &rest, r->cf);
+        if (!n_IsZero(mult, r)) {
           return j;
         }
       }
 #else
-      if (!(sevT[j] & not_sev) &&
-          p_LmDivisibleBy(T[j].t_p, p, r))
-      {
-        mult = n_QuotRem(pGetCoeff(p), pGetCoeff(T[j].p),
-            &rest, currRing->cf);
-        if (!n_IsZero(mult, currRing)) {
+      if (!(sevT[j] & not_sev) && p_LmDivisibleBy(T[j].t_p, p, r))
+      {
+        mult = n_QuotRem(pGetCoeff(p), pGetCoeff(T[j].p), &rest, r->cf);
+        if (!n_IsZero(mult, r)) {
           return j;
         }