Changeset e56eb1a in git

Timestamp:

Dec 6, 2012, 3:55:39 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

9f4478c6aeef3d7c745ba2ee7f65f37f65b2ade5

Parents:

7d62506924687f1914af2e044e72b7886ce66aa3

git-author:

Martin Lee <martinlee84@web.de>2012-12-06 15:55:39+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-12-07 10:46:35+01:00

Message:

fix: ntClearDenominators

Location:

libpolys/polys

Files:

• ext_fields/transext.cc (modified) (3 diffs)
• monomials/p_polys.cc (modified) (1 diff)

libpolys/polys/ext_fields/transext.cc

@@ -1239 +1239 @@
 void ntNormalize (number &a, const coeffs cf)
 {
-  if ((a!=NULL)&&(DEN(a)!=NULL))
+  if ((a!=NULL))
   {
     definiteGcdCancellation(a, cf, FALSE);
@@ -1862 +1862 @@
     ntNormalize(n, cf);
 
-    fraction f = (fraction)n;
+    fraction f = (fraction)ntGetDenom (n, cf);
 
     assume( f != NULL );
 
-    const poly den = DEN(f);
+    const poly den = NUM(f);
 
     if( den == NULL ) // ?? / 1 ?
@@ -1879 +1879 @@
       // TODO: move the following to factory?
       poly gcd = singclap_gcd(p_Copy(cand, R), p_Copy(den, R), R); // gcd(cand, den) is monic no mater leading coeffs! :((((
+      if (nCoeff_is_Q (Q))
+      {
+        number LcGcd= n_Gcd (p_GetCoeff (cand, R), p_GetCoeff(den, R), Q);
+        gcd = p_Mult_nn(gcd, LcGcd, R);
+      }
 //      assume( n_IsOne(pGetCoeff(gcd), Q) ); // TODO: this may be wrong...
       cand = p_Mult_q(cand, p_Copy(den, R), R); // cand *= den

libpolys/polys/monomials/p_polys.cc

@@ -1908 +1908 @@
 static number p_InitContent(poly ph, const ring r);
 
-#define CLEARENUMERATORS 0
+#define CLEARENUMERATORS 1
 
 void p_Content(poly ph, const ring r)