Changeset 8c676a in git

Timestamp:

Dec 7, 2012, 2:10:10 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

6554ca42ebe1277c9afe7990970390905a6e1cf0

Parents:

7d62506924687f1914af2e044e72b7886ce66aa39f4478c6aeef3d7c745ba2ee7f65f37f65b2ade5

Message:

Merge pull request #221 from mmklee/sw_normalize_fix

Sw normalize fix

Location:

libpolys

Files:

• coeffs/longrat.cc (modified) (2 diffs)
• polys/ext_fields/transext.cc (modified) (3 diffs)
• polys/monomials/p_polys.cc (modified) (1 diff)

libpolys/coeffs/longrat.cc

@@ -2545 +2545 @@
     if (mpz_cmp(tmp,P)<0)
     {
-       // return N/B
-       z=ALLOC_RNUMBER();
-       #ifdef LDEBUG
-       z->debug=123456;
-       #endif
        if (mpz_isNeg(B))
        {
@@ -2555 +2550 @@
          mpz_neg(N,N);
        }
-       mpz_init_set(z->z,N);
-       mpz_init_set(z->n,B);
-       z->s = 0;
-       nlNormalize(z,r);
+       // check for gcd(N,B)==1
+       mpz_gcd(tmp,N,B);
+       if (mpz_cmp_ui(tmp,1)==0)
+       {
+         // return N/B
+         z=ALLOC_RNUMBER();
+         #ifdef LDEBUG
+         z->debug=123456;
+         #endif
+         mpz_init_set(z->z,N);
+         mpz_init_set(z->n,B);
+         z->s = 0;
+         nlNormalize(z,r);
+       }
+       else
+       {
+         // return nN (the input) instead of "fail"
+         z=nlCopy(nN,r);
+       }
        break;
     }

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)