Changeset 8e8744 in git for kernel

Timestamp:

Nov 12, 2022, 6:37:40 PM (18 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7afda2f3c573a61d019acbe60473bfe15eda6636c3c704ae428df052f1a454e90db10d6be4c5b98e

Parents:

4969bd84679f00e0090770de53eae064004f1330

Message:

fix: (number)0 is not valid for generic cf

Location:

kernel/GBEngine

Files:

• kutil.cc (modified) (10 diffs)
• ringgb.cc (modified) (2 diffs)

kernel/GBEngine/kutil.cc

@@ -4325 +4325 @@
 #ifdef HAVE_RINGS
 /*2
-* Generates spoly(0, h) if applicable. Assumes ring in Z/2^n.
+* Generates spoly(0, h) if applicable. Assumes ring has zero divisors
 */
 void enterExtendedSpoly(poly h,kStrategy strat)
@@ -4331 +4331 @@
   if (nIsOne(pGetCoeff(h))) return;
   number gcd;
+  number zero=n_Init(0,currRing->cf);
   bool go = false;
-  if (n_DivBy((number) 0, pGetCoeff(h), currRing->cf))
+  if (n_DivBy(zero, pGetCoeff(h), currRing->cf))
   {
     gcd = n_Ann(pGetCoeff(h),currRing->cf);
@@ -4338 +4339 @@
   }
   else
-    gcd = n_Gcd((number) 0, pGetCoeff(h), strat->tailRing->cf);
+    gcd = n_Gcd(zero, pGetCoeff(h), strat->tailRing->cf);
   if (go || !nIsOne(gcd))
   {
@@ -4350 +4351 @@
     p_Test(p,strat->tailRing);
     p = __pp_Mult_nn(p, gcd, strat->tailRing);
-    nDelete(&gcd);
 
     if (p != NULL)
@@ -4407 +4407 @@
     }
   }
+  nDelete(&zero);
   nDelete(&gcd);
 }
@@ -4414 +4415 @@
   if (nIsOne(pGetCoeff(h))) return;
   number gcd;
+  number zero=n_Init(0,currRing->cf);
   bool go = false;
-  if (n_DivBy((number) 0, pGetCoeff(h), currRing->cf))
+  if (n_DivBy(zero, pGetCoeff(h), currRing->cf))
   {
     gcd = n_Ann(pGetCoeff(h),currRing->cf);
@@ -4421 +4423 @@
   }
   else
-    gcd = n_Gcd((number) 0, pGetCoeff(h), strat->tailRing->cf);
+    gcd = n_Gcd(zero, pGetCoeff(h), strat->tailRing->cf);
   if (go || !nIsOne(gcd))
   {
@@ -4477 +4479 @@
           p_Delete(&Lp.sig,currRing);Lp.sig = NULL;
           strat->sigdrop = FALSE;
-          return;
         }
         else
@@ -4485 +4486 @@
           strat->enterS(Lp,0,strat,strat->tl);
           #endif
-          return;
-        }
-
+        }
+        nDelete(&zero);
+        nDelete(&gcd);
+        return;
       }
       #else
@@ -4521 +4523 @@
       }
     }
-    nDelete(&gcd);
   }
   nDelete(&gcd);
+  nDelete(&zero);
 }
 #endif

kernel/GBEngine/ringgb.cc

@@ -181 +181 @@
 
 /*2
-* Generates spoly(0, h) if applicable. Assumes ring in Z/2^n.
+* Generates spoly(0, h) if applicable. Assumes ring has zero divisors
 */
 poly plain_zero_spoly(poly h)
 {
   poly p = NULL;
-  number gcd = n_Gcd((number) 0, pGetCoeff(h), currRing->cf);
+  number zero=n_Init(0,currRing->cf);
+  number gcd = n_Gcd(zero, pGetCoeff(h), currRing->cf);
   if (!n_IsOne( gcd,  currRing->cf ))
   {
@@ -194 +195 @@
     n_Delete(&tmp,currRing->cf);
   }
+   n_Delete(&zero,currRing->cf);
   return p;
 }