Ticket #300: fix component check in gcd poly creation and tidied up division checks for ring coefficients.2.patch

kernel/kutil.cc

@@ -162 +162 @@
     if (b) return pDivComp_GREATER;
     if (!a & !b) return pDivComp_EQUAL;
   }
-  return 0;
+  return pDivComp_INCOMP;
 }
 #endif
 
@@ -1134 +1134 @@
   {
     compare=pDivCompRing(strat->B[j].lcm,Lp.lcm);
     compareCoeff = nDivComp(pGetCoeff(strat->B[j].lcm), pGetCoeff(Lp.lcm));
-    if (compareCoeff == 0 || compare == compareCoeff)
+    if (compareCoeff == pDivComp_EQUAL || compare == compareCoeff)
     {
       if (compare == 1)
       {
@@ -2925 +2925 @@
       // Print("j:%d, Ll:%d\n",j,strat->Ll);
 //      if (((unsigned long) pGetCoeff(h) % (unsigned long) pGetCoeff(strat->S[j]) != 0) &&
 //         ((unsigned long) pGetCoeff(strat->S[j]) % (unsigned long) pGetCoeff(h) != 0))
-      if ( iCompH == pGetComp(strat->S[k]) )
+      if ( iCompH == pGetComp(strat->S[j]) )
       {
         {
           if (enterOneStrongPoly(j,h,ecart,isFromQ,strat, atR))

kernel/numbers.cc

@@ -117 +117 @@
 
 #ifdef HAVE_RINGS
 BOOLEAN ndDivBy(number a, number b) { return TRUE; } // assume a,b !=0
-int ndDivComp(number a, number b) { return 0; }
+int ndDivComp(number a, number b) { return 2; }
 BOOLEAN ndIsUnit(number a) { return !nIsZero(a); }
 number  ndExtGcd (number a, number b, number *s, number *t) { return nInit(1); }
 #endif

kernel/rintegers.cc

@@ -185 +185 @@
 
 int nrzDivComp(number a, number b)
 {
-  if (nrzEqual(a, b)) return 0;
-  if (nrzDivBy(a, b)) return -1;
+  if (nrzDivBy(a, b)) 
+  {
+    if (nrzDivBy(b, a)) return 2;
+    return -1;
+  }    
   if (nrzDivBy(b, a)) return 1;
-  return 2;
+  return 0;
 }
 
 BOOLEAN nrzDivBy (number a,number b)

kernel/rmodulo2m.cc

@@ -252 +252 @@
   {
     if (b % 2 == 1)
     {
-      return 0;
+      return 2;
     }
     else
     {

kernel/rmodulon.cc

@@ -286 +286 @@
 
 int nrnDivComp(number a, number b)
 {
-  if (nrnEqual(a, b)) return 0;
+  if (nrnEqual(a, b)) return 2;
   if (mpz_divisible_p((int_number) a, (int_number) b)) return -1;
   if (mpz_divisible_p((int_number) b, (int_number) a)) return 1;
-  return 2;
+  return 0;
 }
 
 number nrnDiv (number a,number b)