Changeset 4567e8e in git

Timestamp:

Feb 20, 2017, 12:19:50 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

1d8b37332905599d7dd138313bbc02aff3627905

Parents:

def3b20bda0f43d4d4bd310a2976c396c69d0bd7

Message:

fix: tr. #779

Files:

• Tst/Short/bug_tr779.res.gz.uu (added)
• Tst/Short/bug_tr779.stat (added)
• Tst/Short/bug_tr779.tst (added)
• Tst/Short/ok_s.lst (modified) (1 diff)
• libpolys/polys/ext_fields/transext.cc (modified) (3 diffs)

Tst/Short/ok_s.lst

@@ -68 +68 @@
 bug_tr774
 bug_tr778
+bug_tr779
 bug_genus_etc
 conv_bi

libpolys/polys/ext_fields/transext.cc

@@ -781 +781 @@
 }
 
-/* this method will only consider the numerator of a, without cancelling
-   the gcd before;
-   returns TRUE iff the leading coefficient of the numerator of a is > 0
-                    or the leading term of the numerator of a is not a
-                    constant */
+/* return FALSE, if a is a constant <=0 */
 static BOOLEAN ntGreaterZero(number a, const coeffs cf)
 {
@@ -796 +792 @@
 }
 
-/* This method will only consider the numerators of a and b, without
-   cancelling gcd's before.
-   Moreover it may return TRUE only if one or both numerators
-   are zero or if their degrees are equal. Then TRUE is returned iff
-   coeff(numerator(a)) > coeff(numerator(b));
-   In all other cases, FALSE will be returned. */
 static BOOLEAN ntGreater(number a, number b, const coeffs cf)
 {
@@ -812 +802 @@
   number bNumCoeff = NULL; int bNumDeg = 0;
   number bDenCoeff = NULL; int bDenDeg = 0;
-  if (!IS0(a))
+  if (IS0(a))
+  {
+    if (IS0(b)) return FALSE;
+    fraction fb = (fraction)b;
+    return (!n_GreaterZero(pGetCoeff(NUM(fb)), ntCoeffs));
+  }
+  if (IS0(b))
   {
     fraction fa = (fraction)a;
-    aNumDeg = p_Totaldegree(NUM(fa), ntRing);
-    aNumCoeff = p_GetCoeff(NUM(fa), ntRing);
-    if (DEN(fa)!=NULL)
-    {
-      aDenDeg = p_Totaldegree(DEN(fa), ntRing);
-      aDenCoeff=p_GetCoeff(DEN(fa),ntRing);
-    }
-  }
-  else return !(ntGreaterZero (b,cf));
-  if (!IS0(b))
-  {
-    fraction fb = (fraction)b;
-    bNumDeg = p_Totaldegree(NUM(fb), ntRing);
-    bNumCoeff = p_GetCoeff(NUM(fb), ntRing);
-    if (DEN(fb)!=NULL)
-    {
-      bDenDeg = p_Totaldegree(DEN(fb), ntRing);
-      bDenCoeff=p_GetCoeff(DEN(fb),ntRing);
-    }
-  }
-  else return ntGreaterZero(a,cf);
+    return (n_GreaterZero(pGetCoeff(NUM(fa)), ntCoeffs));
+  }
+  // now: a!=0, b!=0
+  fraction fa = (fraction)a;
+  aNumDeg = p_Totaldegree(NUM(fa), ntRing);
+  aNumCoeff = p_GetCoeff(NUM(fa), ntRing);
+  if (DEN(fa)!=NULL)
+  {
+    aDenDeg = p_Totaldegree(DEN(fa), ntRing);
+    aDenCoeff=p_GetCoeff(DEN(fa),ntRing);
+  }
+  fraction fb = (fraction)b;
+  bNumDeg = p_Totaldegree(NUM(fb), ntRing);
+  bNumCoeff = p_GetCoeff(NUM(fb), ntRing);
+  if (DEN(fb)!=NULL)
+  {
+    bDenDeg = p_Totaldegree(DEN(fb), ntRing);
+    bDenCoeff=p_GetCoeff(DEN(fb),ntRing);
+  }
   if (aNumDeg-aDenDeg > bNumDeg-bDenDeg) return TRUE;
   if (aNumDeg-aDenDeg < bNumDeg-bDenDeg) return FALSE;