Changeset 7453b4 in git

Timestamp:

Jan 27, 2012, 2:50:24 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

f3cdf9e5f707acda78af0e21e064d4b843c72a1a

Parents:

5e17976a905ed4b96978d782901ce629d68cadb7

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-01-27 14:50:24+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-01-27 14:51:08+01:00

Message:

chg: farey changes from master

Files:

• factory/cf_chinese.cc (modified) (2 diffs)
• libpolys/coeffs/longrat.cc (modified) (1 diff)

factory/cf_chinese.cc

@@ -198 +198 @@
     CanonicalForm c;
     CFIterator i;
+#ifdef HAVE_NTL
+    ZZ NTLq= convertFacCF2NTLZZ (q);
+    ZZ bound;
+    SqrRoot (bound, NTLq/2);
+#endif
     for ( i = f; i.hasTerms(); i++ )
     {
@@ -210 +215 @@
             if (lessZero)
               NTL::negate (NTLc, NTLc);
-            ZZ NTLq= convertFacCF2NTLZZ (q);
-            ZZ bound;
-            SqrRoot (bound, NTLq/2);
             ZZ NTLnum, NTLden;
             if (ReconstructRational (NTLnum, NTLden, NTLc, NTLq, bound, bound))

libpolys/coeffs/longrat.cc

@@ -2563 +2563 @@
        break;
     }
-    mpz_mod(D,E,N);
-    mpz_div(tmp,E,N);
+    //mpz_mod(D,E,N);
+    //mpz_div(tmp,E,N);
+    mpz_divmod(tmp,D,E,N);
     mpz_mul(tmp,tmp,B);
     mpz_sub(C,A,tmp);