Changeset 036a5e in git

Timestamp:

Feb 15, 2021, 6:09:41 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

897be4e9d0d99f6edc2785f7a335bdde34c0ad73

Parents:

7b5b095ed2434be9e1783ac23414e01c2a75fec4

Message:

new ksReducePoly

Location:

kernel/GBEngine

Files:

• kspoly.cc (modified) (3 diffs)
• kstd1.cc (modified) (3 diffs)
• kstd2.cc (modified) (7 diffs)

kernel/GBEngine/kspoly.cc

@@ -187 +187 @@
                  poly spNoether,
                  number *coef,
+                 poly *mon,
                  kStrategy strat)
 {
@@ -239 +240 @@
 #endif
 
-  if (t2==NULL)           // Divisor is just one term, therefore it will
+  if ((t2==NULL)&&(mon==NULL)) // Divisor is just one term, therefore it will
   {                       // just cancel the leading term
     PR->LmDeleteAndIter();
@@ -293 +294 @@
     if (coef != NULL) *coef = n_Init(1, tailRing->cf);
   }
-
+  if(mon!=NULL) *mon=pHead(lm);
 
   // and finally,

kernel/GBEngine/kstd1.cc

@@ -141 +141 @@
     h->GetP();
     h->length=h->pLength=pLength(h->p);
-    ret = ksReducePoly(&L, with, strat->kNoetherTail(), NULL, strat);
+    ret = ksReducePoly(&L, with, strat->kNoetherTail(), NULL, NULL, strat);
     if (ret)
     {
@@ -157 +157 @@
   }
   else
-    ret = ksReducePoly(h, with, strat->kNoetherTail(), NULL, strat);
+    ret = ksReducePoly(h, with, strat->kNoetherTail(), NULL, NULL, strat);
 #ifdef KDEBUG
   if (TEST_OPT_DEBUG)
@@ -817 +817 @@
     }
 #endif
-    ksReducePoly(h, &(strat->T[j]), strat->kNoetherTail(), NULL, strat);
+    ksReducePoly(h, &(strat->T[j]), strat->kNoetherTail(), NULL, NULL, strat);
 #ifdef KDEBUG
     if (TEST_OPT_DEBUG)

kernel/GBEngine/kstd2.cc

@@ -736 +736 @@
     else
     {
-      ksReducePoly(h, &(strat->T[j]), NULL, NULL, strat);
+      ksReducePoly(h, &(strat->T[j]), NULL, NULL, NULL, strat);
     }
     /* printf("\nAfter small red: ");pWrite(h->p); */
@@ -842 +842 @@
     //printf("\nFound one: ");pWrite(strat->T[j].p);
     //enterT(*h, strat);
-    ksReducePoly(h, &(strat->T[j]), NULL, NULL, strat); // with debug output
+    ksReducePoly(h, &(strat->T[j]), NULL, NULL, NULL, strat); // with debug output
     //printf("\nAfter small red: ");pWrite(h->p);
     if (h->GetLmTailRing() == NULL)
@@ -970 +970 @@
     assume(strat->fromT == FALSE);
 
-    ksReducePoly(h, &(strat->T[ii]), NULL, NULL, strat);
+    ksReducePoly(h, &(strat->T[ii]), NULL, NULL, NULL, strat);
 #if SBA_PRINT_REDUCTION_STEPS
     sba_interreduction_steps++;
@@ -1715 +1715 @@
 #endif
 
-    ksReducePoly(h, &(strat->T[ii]), NULL, NULL, strat);
+    ksReducePoly(h, &(strat->T[ii]), NULL, NULL, NULL, strat);
 #if SBA_PRINT_REDUCTION_STEPS
     sba_interreduction_steps++;
@@ -1937 +1937 @@
     assume(strat->fromT == FALSE);
 
-    ksReducePoly(h,&(strat->T[ii]),strat->kNoetherTail(),NULL,strat);
+    ksReducePoly(h,&(strat->T[ii]),strat->kNoetherTail(),NULL,NULL, strat);
 #if SBA_PRINT_REDUCTION_STEPS
     sba_interreduction_steps++;
@@ -2548 +2548 @@
       if ((TEST_OPT_INTSTRATEGY) || (rField_is_Ring(currRing)))
       {
-        strat->P.pCleardenom();
+        if (TEST_OPT_IDLIFT) 
+          strat->P.pContent();
+        else
+          strat->P.pCleardenom();
         if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
         {
@@ -4778 +4781 @@
     }
 #endif
-    ksReducePoly(h, &(strat->T[j]), strat->kNoetherTail(), NULL, strat);
+    ksReducePoly(h, &(strat->T[j]), strat->kNoetherTail(), NULL, NULL, strat);
 
 #ifdef KDEBUG