Changeset 3693cf in git for libpolys/polys/ext_fields/transext.cc

Timestamp:

Feb 19, 2013, 9:45:45 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

5e42ec33c5a0d777cb71dc36d36924181f7d88b3

Parents:

fd60be56d6b370a06c2d461f568680391606dbc1236a4c0b334deb5ef1062f5eeac7f6bcaf807f35

Message:

Merge pull request #284 from YueRen/thurnau

Thurnau

File:

• libpolys/polys/ext_fields/transext.cc (modified) (3 diffs)

libpolys/polys/ext_fields/transext.cc

@@ -609 +609 @@
   ntTest(b);
   number aNumCoeff = NULL; int aNumDeg = -1;
+  number aDenCoeff = NULL; int aDenDeg = -1;
   number bNumCoeff = NULL; int bNumDeg = -1;
+  number bDenCoeff = NULL; int bDenDeg = -1;
   if (!IS0(a))
   {
@@ -615 +617 @@
     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));
@@ -622 +629 @@
     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);
-  if (aNumDeg > bNumDeg) return TRUE;
-  if (aNumDeg < bNumDeg) return FALSE;
-  return n_Greater(aNumCoeff, bNumCoeff, ntCoeffs);
+  if (aNumDeg-aDenDeg > bNumDeg-bDenDeg) return TRUE;
+  if (aNumDeg-aDenDeg < bNumDeg-bDenDeg) return FALSE;
+  number aa;
+  number bb;
+  if (bDenCoeff==NULL) aa=n_Copy(aNumCoeff,ntRing->cf);
+  else                 aa=n_Mult(aNumCoeff,bDenCoeff,ntRing->cf);
+  if (aDenCoeff==NULL) bb=n_Copy(bNumCoeff,ntRing->cf);
+  else                 bb=n_Mult(bNumCoeff,aDenCoeff,ntRing->cf);
+  BOOLEAN rr= n_Greater(aa, bb, ntCoeffs);
+  n_Delete(&aa,ntRing->cf);
+  n_Delete(&bb,ntRing->cf);
+  return rr;
 }