Changeset 0091f5 in git

Timestamp:

Jan 18, 2017, 4:07:25 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

1082b92ca9710fddf763537ffbccb6abed6ab98e

Parents:

72e8c16151daf886c929fa07bdc27e451c807ccf

Message:

fix: finalReduceByMon: in n_IntMod(A,B,C) B should be positive

Location:

kernel/GBEngine

Files:

• kstd2.cc (modified) (3 diffs)
• kutil.cc (modified) (3 diffs)

kernel/GBEngine/kstd2.cc

@@ -454 +454 @@
       // over ZZ: cleanup coefficients by complete reduction with monomials
       postReduceByMon(h, strat);
+      if(h->p == NULL)
+      {
+        if (h->lcm!=NULL) pLmDelete(h->lcm);
+        h->Clear();
+        return 0;
+      }
       if(nIsZero(pGetCoeff(h->p))) return 2;
       j = kFindDivisibleByInT(strat, h);
@@ -2298 +2304 @@
   if (!errorreported)
   {
-    if(nCoeff_is_Ring_Z(currRing->cf))
+    if(rField_is_Ring_Z(currRing))
+    {
+      for(int i = 0;i<=strat->sl;i++)
+      {
+        if(!nGreaterZero(pGetCoeff(strat->S[i])))
+        {
+          strat->S[i] = pNeg(strat->S[i]);
+        }
+      }
       finalReduceByMon(strat);
-    if(rField_is_Ring(currRing))
-    {
       for(int i = 0;i<=strat->sl;i++)
       {
@@ -2310 +2322 @@
       }
     }
+    else if (rField_is_Ring(currRing))
+      finalReduceByMon(strat);
   }
   /* release temp data-------------------------------- */

kernel/GBEngine/kutil.cc

@@ -1431 +1431 @@
       {
         pLmDelete(h.lcm);
-        h.lcm=NULL;
+        h.lcm=NULL;
       }
       h.Clear();
@@ -11071 +11071 @@
         }
       }
-      pp = pNext(p);
-      while(pp != NULL)
-      {
-        if(pLmDivisibleBy(strat->S[i], pp))
-        {
-          number dummy = n_IntMod(pp->coef, strat->S[i]->coef, currRing->cf);
-          p_SetCoeff(pp,dummy,currRing);
-          if(nIsZero(pp->coef))
+      if (p!=NULL)
+      {
+        pp = pNext(p);
+        while(pp != NULL)
+        {
+          if(pLmDivisibleBy(strat->S[i], pp))
           {
-            pLmDelete(&pNext(p));
-            pp = pNext(p);
-            deleted = TRUE;
+            number dummy = n_IntMod(pp->coef, strat->S[i]->coef, currRing->cf);
+            p_SetCoeff(pp,dummy,currRing);
+            if(nIsZero(pp->coef))
+            {
+              pLmDelete(&pNext(p));
+              pp = pNext(p);
+              deleted = TRUE;
+            }
+            else
+            {
+              p = pp;
+              pp = pNext(p);
+            }
           }
           else
@@ -11090 +11098 @@
           }
         }
-        else
-        {
-          p = pp;
-          pp = pNext(p);
-        }
       }
     }
   }
   h->SetLmCurrRing();
-  if(deleted)
+  if((deleted)&&(h->p!=NULL))
     strat->initEcart(h);
 }