Changeset 8e2c77 in git for kernel

Timestamp:

Oct 11, 2022, 3:35:34 PM (19 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

6469c282bedf5898b267f26f0af5ad47b00729aa

Parents:

4cf1180106290c8ffa0f19cc40e6b396523235d1

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2022-10-11 15:35:34+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2022-10-11 15:55:31+02:00

Message:

fix: redMoraNF/redMoraNFRing: n_DivBy nad SubringGCD

File:

• kernel/GBEngine/kstd1.cc (modified) (6 diffs)

kernel/GBEngine/kstd1.cc

@@ -1047 +1047 @@
         * we have to reduce with bad ecart: H has to enter in T
         */
-        doRed(&H,&(strat->T[ii]),TRUE,strat,TRUE);
-        if (H.p == NULL)
-          return NULL;
+        LObject L= H;
+        L.Copy();
+        H.GetP();
+        H.length=H.pLength=pLength(H.p);
+        ksReducePoly(&L, &(strat->T[ii]), strat->kNoetherTail(), NULL, NULL, strat,
+                            (flag & KSTD_NF_NONORM)==0);
+        enterT(H,strat);
+        H = L;
       }
       else
@@ -1056 +1061 @@
         * we reduce with good ecart, h need not to be put to T
         */
-        doRed(&H,&(strat->T[ii]),FALSE,strat,TRUE);
-        if (H.p == NULL)
-          return NULL;
-      }
+        ksReducePoly(&H, &(strat->T[ii]), strat->kNoetherTail(), NULL, NULL, strat,
+                            (flag & KSTD_NF_NONORM)==0);
+      }
+      if (H.p == NULL)
+        return NULL;
       /*- try to reduce the s-polynomial -*/
       o = H.SetpFDeg();
-      if ((flag &2 ) == 0) cancelunit(&H,TRUE);
+      if ((flag & KSTD_NF_ECART) == 0) cancelunit(&H,TRUE);
       H.ecart = currRing->pLDeg(H.p,&(H.length),currRing)-o;
       j = 0;
@@ -1085 +1091 @@
     int o = H.SetpFDeg();
     H.ecart = currRing->pLDeg(H.p,&H.length,currRing)-o;
-    if ((flag & 2) == 0) cancelunit(&H,TRUE);
+    if ((flag & KSTD_NF_ECART) == 0) cancelunit(&H,TRUE);
     H.sev = pGetShortExpVector(H.p);
     unsigned long not_sev = ~ H.sev;
@@ -1180 +1186 @@
                  * we have to reduce with bad ecart: H has to enter in T
                  */
-                doRed(&H,&(strat->T[ii]),TRUE,strat,TRUE);
-                if (H.p == NULL)
-                    return NULL;
+              LObject L= H;
+              L.Copy();
+              H.GetP();
+              H.length=H.pLength=pLength(H.p);
+              ksReducePoly(&L, &(strat->T[ii]), strat->kNoetherTail(), NULL, NULL, strat,
+                            (flag & KSTD_NF_NONORM)==0);
+              enterT_strong(H,strat);
+              H = L;
             }
             else
@@ -1189 +1200 @@
                  * we reduce with good ecart, h need not to be put to T
                  */
-                doRed(&H,&(strat->T[ii]),FALSE,strat,TRUE);
-                if (H.p == NULL)
-                    return NULL;
+                ksReducePoly(&H, &(strat->T[ii]), strat->kNoetherTail(), NULL, NULL, strat,
+                            (flag & KSTD_NF_NONORM)==0);
             }
+            if (H.p == NULL)
+              return NULL;
             /*- try to reduce the s-polynomial -*/
             o = H.SetpFDeg();
@@ -2358 +2370 @@
         if(rField_is_Ring(currRing))
         {
-          p = redMoraNFRing(p,strat, lazyReduce & KSTD_NF_ECART);
+          p = redMoraNFRing(p,strat, lazyReduce);
         }
         else
-          p = redMoraNF(p,strat, lazyReduce & KSTD_NF_ECART);
+          p = redMoraNF(p,strat, lazyReduce);
         if ((p!=NULL)&&((lazyReduce & KSTD_NF_LAZY)==0))
         {