Changeset 7964f9c in git

Timestamp:

Feb 22, 2013, 6:07:28 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

53568dfd6864f93c0a03e533c7cd650061dab05969745c12a329a3d82624b53e9fec810e6378365b

Parents:

5693d74c7e74fb28bc22148699aebb6524ded48c

Message:

fix: output and simplifation of rat. fct.: ntGreaterZero and heuristicGcdCancellation

File:

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

libpolys/polys/ext_fields/transext.cc

@@ -654 +654 @@
   fraction f = (fraction)a;
   poly g = NUM(f);
-  return (n_GreaterZero(p_GetCoeff(g, ntRing), ntCoeffs) ||
-          (!p_LmIsConstant(g, ntRing)));
+  return (!p_LmIsConstant(g,ntRing)|| n_GreaterZero(pGetCoeff(g), ntCoeffs));
 }
 
@@ -1097 +1096 @@
       definiteGcdCancellation(a, cf, TRUE);
 
-  // TODO: check if it is enough to put the following into definiteGcdCancellation?!
-  if( DEN(f) != NULL )
-    if( !n_GreaterZero(pGetCoeff(DEN(f)), ntCoeffs) )
-    {
-      NUM(f) = p_Neg(NUM(f), ntRing);
-      DEN(f) = p_Neg(DEN(f), ntRing);
+    // TODO: check if it is enough to put the following into definiteGcdCancellation?!
+    if( DEN(f) != NULL )
+    {
+      if( !n_GreaterZero(pGetCoeff(DEN(f)), ntCoeffs) )
+      {
+        NUM(f) = p_Neg(NUM(f), ntRing);
+        DEN(f) = p_Neg(DEN(f), ntRing);
+      }
+      if (ntCoeffs->has_simple_Inverse)
+      {
+        if (!n_IsOne(pGetCoeff(DEN(f)),ntCoeffs))
+        {
+          number inv=n_Invers(pGetCoeff(DEN(f)),ntCoeffs);
+          DEN(f)=p_Mult_nn(DEN(f),inv,ntRing);
+          NUM(f)=p_Mult_nn(NUM(f),inv,ntRing);
+        }
+        if(p_LmIsConstant(DEN(f),ntRing))
+        {
+          p_Delete(&DEN(f),ntRing);
+          COM(f)=0;
+        }
+      }
     }
   }