Changeset afda22 in git for libpolys/polys/ext_fields/algext.cc

Timestamp:

Jun 25, 2012, 2:20:45 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

2fd733aba192da5e453cb9e58df6832aeec5bc60

Parents:

eea50a6525a2aac0c87955d053e79c8e99e44044

Message:

fix: #329, part 1: alg. ext

File:

• libpolys/polys/ext_fields/algext.cc (modified) (1 diff)

libpolys/polys/ext_fields/algext.cc

@@ -275 +275 @@
 }
 
-/* TRUE iff (a != 0 and (b == 0 or deg(a) > deg(b))) */
+/* TRUE iff (a != 0 and (b == 0 or deg(a) > deg(b) or (deg(a)==deg(b) && lc(a)>lc(b))) */
 BOOLEAN naGreater(number a, number b, const coeffs cf)
 {
   naTest(a); naTest(b);
-  if (naIsZero(a, cf)) return FALSE;
-  if (naIsZero(b, cf)) return TRUE;
-  int aDeg = 0;
-  if (a != NULL) aDeg = p_Totaldegree((poly)a, naRing);
-  int bDeg = 0;
-  if (b != NULL) bDeg = p_Totaldegree((poly)b, naRing);
-  return (aDeg > bDeg);
+  if (naIsZero(a, cf))
+  {
+    if (naIsZero(b, cf)) return FALSE;
+    return !n_GreaterZero(pGetCoeff((poly)b),cf);
+  }
+  if (naIsZero(b, cf))
+  {
+    return n_GreaterZero(pGetCoeff((poly)a),cf);
+  }
+  int aDeg = p_Totaldegree((poly)a, naRing);
+  int bDeg = p_Totaldegree((poly)b, naRing);
+  if (aDeg>bDeg) return TRUE;
+  if (aDeg<bDeg) return FALSE;
+  return n_Greater(pGetCoeff((poly)a),pGetCoeff((poly)b),cf);
 }