Happy New Year!

[ginac.git] / ginac / polynomial / mgcd.cpp

diff --git a/ginac/polynomial/mgcd.cpp b/ginac/polynomial/mgcd.cpp
index 5b9da128223d8a6d9024b24e775398b2e3ed8b53..a0d3e35fe9d77624fe95483e5b0c73a00b1ec566 100644 (file)
--- a/ginac/polynomial/mgcd.cpp
+++ b/ginac/polynomial/mgcd.cpp
@@ -3,7 +3,7 @@
  *  Chinese remainder algorithm. */
 
 /*
- *  GiNaC Copyright (C) 1999-2010 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2019 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -40,21 +40,22 @@ static cln::cl_I extract_integer_content(ex& Apr, const ex& A)
 {
        static const cln::cl_I n1(1);
        const numeric icont_ = A.integer_content();
-       if (cln::instanceof(icont_.to_cl_N(), cln::cl_RA_ring)) {
+       GINAC_ASSERT(cln::instanceof(icont_.to_cl_N(), cln::cl_RA_ring));
+       if (cln::instanceof(icont_.to_cl_N(), cln::cl_I_ring)) {
+               const cln::cl_I icont = cln::the<cln::cl_I>(icont_.to_cl_N());
+               if (icont != 1) {
+                       Apr = (A/icont_).expand();
+                       return icont;
+               } else {
+                       Apr = A;
+                       return n1;
+               }
+       } else {
                Apr = (A/icont_).expand();
-               // A is a polynomail over rationals, so GCD is defined
+               // A is a polynomial over rationals, so GCD is defined
                // up to arbitrary rational number.
                return n1;
        }
-       GINAC_ASSERT(cln::instanceof(icont_.to_cl_N(), cln::cl_I_ring));
-       const cln::cl_I icont = cln::the<cln::cl_I>(icont_.to_cl_N());
-       if (icont != 1) {
-               Apr = (A/icont_).expand();
-               return icont;
-       } else {
-               Apr = A;
-               return n1;
-       }
 }
 
 ex chinrem_gcd(const ex& A_, const ex& B_, const exvector& vars)
@@ -68,7 +69,6 @@ ex chinrem_gcd(const ex& A_, const ex& B_, const exvector& vars)
        const cln::cl_I b_lc = integer_lcoeff(B, vars);
        const cln::cl_I g_lc = cln::gcd(a_lc, b_lc);
 
-       const ex& x(vars.back());
        exp_vector_t n = std::min(degree_vector(A, vars), degree_vector(B, vars));
        const int nTot = std::accumulate(n.begin(), n.end(), 0);
        const cln::cl_I A_max_coeff = to_cl_I(A.max_coefficient()); 
@@ -99,7 +99,7 @@ ex chinrem_gcd(const ex& A_, const ex& B_, const exvector& vars)
                Cp = (Cp*numeric(nlc)).expand().smod(pnum);
                exp_vector_t cp_deg = degree_vector(Cp, vars);
                if (zerop(cp_deg))
-                       return numeric(g_lc);
+                       return numeric(c);
                if (zerop(q)) {
                        H = Cp;
                        n = cp_deg;