Changeset 0d7851 in git for kernel

Timestamp:

Aug 17, 2021, 3:58:50 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

d28095befe49d41be7cd3b72963b0f39b4bcd6cd

Parents:

7dce1335d7f3fd3a06f55ad720041785a58b35bd

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-08-17 15:58:50+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-08-17 16:40:08+02:00

Message:

ring-cf: do not use content/ cleardenom

Location:

kernel/GBEngine

Files:

• kstd1.cc (modified) (1 diff)
• kstd2.cc (modified) (7 diffs)
• kutil.cc (modified) (4 diffs)

kernel/GBEngine/kstd1.cc

@@ -3583 +3583 @@
       // in the ring case we cannot expect LC(f) = 1,
       // therefore we call pCleardenom instead of pNorm
-      if ((TEST_OPT_INTSTRATEGY) || (rField_is_Ring(currRing)))
+      if (TEST_OPT_INTSTRATEGY)
       {
         strat->P.pCleardenom();

kernel/GBEngine/kstd2.cc

@@ -755 +755 @@
         {
           redtailBbaAlsoLC_Z(&h2, j, strat);
-          h2.pCleardenom();
         }
         /* replace h2 for tj in L (already generated pairs with tj), S and T */
@@ -2526 +2525 @@
       // reduce the tail and normalize poly
       // in the ring case we cannot expect LC(f) = 1,
-      // therefore we call pCleardenom instead of pNorm
       strat->redTailChange=FALSE;
 
@@ -2534 +2532 @@
       {
         redtailBbaAlsoLC_Z(&(strat->P), strat->tl, strat);
-        strat->P.pCleardenom();
-      }
-
-      if ((TEST_OPT_INTSTRATEGY) || (rField_is_Ring(currRing)))
+      }
+
+      if (TEST_OPT_INTSTRATEGY)
       {
         strat->P.pCleardenom();
@@ -3159 +3156 @@
       // reduce the tail and normalize poly
       // in the ring case we cannot expect LC(f) = 1,
-      // therefore we call pCleardenom instead of pNorm
       #ifdef HAVE_RINGS
       poly beforetailred;
@@ -4193 +4189 @@
       // reduce the tail and normalize poly
       // in the ring case we cannot expect LC(f) = 1,
-      // therefore we call pCleardenom instead of pNorm
 #if F5CTAILRED
       BOOLEAN withT = TRUE;
-      if ((TEST_OPT_INTSTRATEGY) || (rField_is_Ring(currRing)))
+      if (TEST_OPT_INTSTRATEGY)
       {
         strat->P.pCleardenom();
@@ -4498 +4493 @@
       // reduce the tail and normalize poly
       // in the ring case we cannot expect LC(f) = 1,
-      // therefore we call pCleardenom instead of pNorm
       strat->redTailChange=FALSE;
 
@@ -4506 +4500 @@
       {
         redtailBbaAlsoLC_Z(&(strat->P), strat->tl, strat);
-        strat->P.pCleardenom();
-      }
-
-      if ((TEST_OPT_INTSTRATEGY) || (rField_is_Ring(currRing)))
+      }
+
+      if (TEST_OPT_INTSTRATEGY)
       {
         strat->P.pCleardenom();

kernel/GBEngine/kutil.cc

@@ -1702 +1702 @@
   h.tailRing = strat->tailRing;
   int posx;
-  h.pCleardenom();
   strat->initEcart(&h);
   h.sev = pGetShortExpVector(h.p);
@@ -1909 +1908 @@
   h.sig = pairsig;
   int posx;
-  h.pCleardenom();
   strat->initEcart(&h);
   h.sev = pGetShortExpVector(h.p);
@@ -9310 +9308 @@
   if (strat->homog) strat->initEcart(&p);
       strat->redTailChange=FALSE;
-  if ((TEST_OPT_INTSTRATEGY) || (rField_is_Ring(currRing)))
+  if (TEST_OPT_INTSTRATEGY)
   {
     p.pCleardenom();
@@ -12175 +12173 @@
   h.tailRing = strat->tailRing;
   int posx;
-  h.pCleardenom();
   strat->initEcart(&h);
   h.sev = pGetShortExpVector(h.p);