#define USE_REMEMBER 0
// Set this if you want divide_in_z() to use trial division followed by
-// polynomial interpolation (usually slower except for very large problems)
+// polynomial interpolation (always slower except for completely dense
+// polynomials)
#define USE_TRIAL_DIVISION 0
// Set this to enable some statistical output for the GCD routines
};
// Vector of sym_desc structures
-typedef vector<sym_desc> sym_desc_vec;
+typedef std::vector<sym_desc> sym_desc_vec;
// Add symbol the sym_desc_vec (used internally by get_symbol_stats())
static void add_symbol(const symbol *s, sym_desc_vec &v)
}
sort(v.begin(), v.end());
#if 0
- clog << "Symbols:\n";
+ std::clog << "Symbols:\n";
it = v.begin(); itend = v.end();
while (it != itend) {
- clog << " " << *it->sym << ": deg_a=" << it->deg_a << ", deg_b=" << it->deg_b << ", ldeg_a=" << it->ldeg_a << ", ldeg_b=" << it->ldeg_b << ", max_deg=" << it->max_deg << endl;
- clog << " lcoeff_a=" << a.lcoeff(*(it->sym)) << ", lcoeff_b=" << b.lcoeff(*(it->sym)) << endl;
+ std::clog << " " << *it->sym << ": deg_a=" << it->deg_a << ", deg_b=" << it->deg_b << ", ldeg_a=" << it->ldeg_a << ", ldeg_b=" << it->ldeg_b << ", max_deg=" << it->max_deg << endl;
+ std::clog << " lcoeff_a=" << a.lcoeff(*(it->sym)) << ", lcoeff_b=" << b.lcoeff(*(it->sym)) << endl;
it++;
}
#endif
* Remembering
*/
-typedef pair<ex, ex> ex2;
-typedef pair<ex, bool> exbool;
+typedef std::pair<ex, ex> ex2;
+typedef std::pair<ex, bool> exbool;
struct ex2_less {
bool operator() (const ex2 p, const ex2 q) const
}
};
-typedef map<ex2, exbool, ex2_less> ex2_exbool_remember;
+typedef std::map<ex2, exbool, ex2_less> ex2_exbool_remember;
#endif
* GCD of multivariate polynomials
*/
-/** Compute GCD of multivariate polynomials using the Euclidean PRS algorithm
- * (not really suited for multivariate GCDs). This function is only provided
- * for testing purposes.
+/** Compute GCD of polynomials in Q[X] using the Euclidean algorithm (not
+ * really suited for multivariate GCDs). This function is only provided for
+ * testing purposes.
*
* @param a first multivariate polynomial
* @param b second multivariate polynomial
static ex eu_gcd(const ex &a, const ex &b, const symbol *x)
{
-//clog << "eu_gcd(" << a << "," << b << ")\n";
+//std::clog << "eu_gcd(" << a << "," << b << ")\n";
// Sort c and d so that c has higher degree
ex c, d;
d = a;
}
+ // Normalize in Q[x]
+ c = c / c.lcoeff(*x);
+ d = d / d.lcoeff(*x);
+
// Euclidean algorithm
ex r;
for (;;) {
-//clog << " d = " << d << endl;
+//std::clog << " d = " << d << endl;
r = rem(c, d, *x, false);
if (r.is_zero())
- return d.primpart(*x);
+ return d / d.lcoeff(*x);
c = d;
d = r;
}
static ex euprem_gcd(const ex &a, const ex &b, const symbol *x)
{
-//clog << "euprem_gcd(" << a << "," << b << ")\n";
+//std::clog << "euprem_gcd(" << a << "," << b << ")\n";
// Sort c and d so that c has higher degree
ex c, d;
d = a;
}
+ // Calculate GCD of contents
+ ex gamma = gcd(c.content(*x), d.content(*x), NULL, NULL, false);
+
// Euclidean algorithm with pseudo-remainders
ex r;
for (;;) {
-//clog << " d = " << d << endl;
+//std::clog << " d = " << d << endl;
r = prem(c, d, *x, false);
if (r.is_zero())
- return d.primpart(*x);
+ return d.primpart(*x) * gamma;
c = d;
d = r;
}
static ex peu_gcd(const ex &a, const ex &b, const symbol *x)
{
-//clog << "peu_gcd(" << a << "," << b << ")\n";
+//std::clog << "peu_gcd(" << a << "," << b << ")\n";
// Sort c and d so that c has higher degree
ex c, d;
// Euclidean algorithm with content removal
ex r;
for (;;) {
-//clog << " d = " << d << endl;
+//std::clog << " d = " << d << endl;
r = prem(c, d, *x, false);
if (r.is_zero())
return gamma * d;
static ex red_gcd(const ex &a, const ex &b, const symbol *x)
{
-//clog << "red_gcd(" << a << "," << b << ")\n";
+//std::clog << "red_gcd(" << a << "," << b << ")\n";
// Sort c and d so that c has higher degree
ex c, d;
c = c.primpart(*x, cont_c);
d = d.primpart(*x, cont_d);
- // First element of subresultant sequence
+ // First element of divisor sequence
ex r, ri = _ex1();
int delta = cdeg - ddeg;
for (;;) {
// Calculate polynomial pseudo-remainder
-//clog << " d = " << d << endl;
+//std::clog << " d = " << d << endl;
r = prem(c, d, *x, false);
if (r.is_zero())
return gamma * d.primpart(*x);
/** Compute GCD of multivariate polynomials using the subresultant PRS
* algorithm. This function is used internally by gcd().
*
- * @param a first multivariate polynomial
- * @param b second multivariate polynomial
- * @param x pointer to symbol (main variable) in which to compute the GCD in
+ * @param a first multivariate polynomial
+ * @param b second multivariate polynomial
+ * @param var iterator to first element of vector of sym_desc structs
* @return the GCD as a new expression
* @see gcd */
-static ex sr_gcd(const ex &a, const ex &b, const symbol *x)
+
+static ex sr_gcd(const ex &a, const ex &b, sym_desc_vec::const_iterator var)
{
-//clog << "sr_gcd(" << a << "," << b << ")\n";
+//std::clog << "sr_gcd(" << a << "," << b << ")\n";
#if STATISTICS
sr_gcd_called++;
#endif
+ // The first symbol is our main variable
+ const symbol &x = *(var->sym);
+
// Sort c and d so that c has higher degree
ex c, d;
- int adeg = a.degree(*x), bdeg = b.degree(*x);
+ int adeg = a.degree(x), bdeg = b.degree(x);
int cdeg, ddeg;
if (adeg >= bdeg) {
c = a;
}
// Remove content from c and d, to be attached to GCD later
- ex cont_c = c.content(*x);
- ex cont_d = d.content(*x);
+ ex cont_c = c.content(x);
+ ex cont_d = d.content(x);
ex gamma = gcd(cont_c, cont_d, NULL, NULL, false);
if (ddeg == 0)
return gamma;
- c = c.primpart(*x, cont_c);
- d = d.primpart(*x, cont_d);
-//clog << " content " << gamma << " removed, continuing with sr_gcd(" << c << "," << d << ")\n";
+ c = c.primpart(x, cont_c);
+ d = d.primpart(x, cont_d);
+//std::clog << " content " << gamma << " removed, continuing with sr_gcd(" << c << "," << d << ")\n";
// First element of subresultant sequence
ex r = _ex0(), ri = _ex1(), psi = _ex1();
for (;;) {
// Calculate polynomial pseudo-remainder
-//clog << " start of loop, psi = " << psi << ", calculating pseudo-remainder...\n";
-//clog << " d = " << d << endl;
- r = prem(c, d, *x, false);
+//std::clog << " start of loop, psi = " << psi << ", calculating pseudo-remainder...\n";
+//std::clog << " d = " << d << endl;
+ r = prem(c, d, x, false);
if (r.is_zero())
- return gamma * d.primpart(*x);
+ return gamma * d.primpart(x);
c = d;
cdeg = ddeg;
-//clog << " dividing...\n";
- if (!divide(r, ri * pow(psi, delta), d, false))
+//std::clog << " dividing...\n";
+ if (!divide_in_z(r, ri * pow(psi, delta), d, var))
throw(std::runtime_error("invalid expression in sr_gcd(), division failed"));
- ddeg = d.degree(*x);
+ ddeg = d.degree(x);
if (ddeg == 0) {
if (is_ex_exactly_of_type(r, numeric))
return gamma;
else
- return gamma * r.primpart(*x);
+ return gamma * r.primpart(x);
}
// Next element of subresultant sequence
-//clog << " calculating next subresultant...\n";
- ri = c.expand().lcoeff(*x);
+//std::clog << " calculating next subresultant...\n";
+ ri = c.expand().lcoeff(x);
if (delta == 1)
psi = ri;
else if (delta)
- divide(pow(ri, delta), pow(psi, delta-1), psi, false);
+ divide_in_z(pow(ri, delta), pow(psi, delta-1), psi, var+1);
delta = cdeg - ddeg;
}
}
}
+/** xi-adic polynomial interpolation */
+static ex interpolate(const ex &gamma, const numeric &xi, const symbol &x)
+{
+ ex g = _ex0();
+ ex e = gamma;
+ numeric rxi = xi.inverse();
+ for (int i=0; !e.is_zero(); i++) {
+ ex gi = e.smod(xi);
+ g += gi * power(x, i);
+ e = (e - gi) * rxi;
+ }
+ return g;
+}
+
/** Exception thrown by heur_gcd() to signal failure. */
class gcdheu_failed {};
* @exception gcdheu_failed() */
static ex heur_gcd(const ex &a, const ex &b, ex *ca, ex *cb, sym_desc_vec::const_iterator var)
{
-//clog << "heur_gcd(" << a << "," << b << ")\n";
+//std::clog << "heur_gcd(" << a << "," << b << ")\n";
#if STATISTICS
heur_gcd_called++;
#endif
}
// The first symbol is our main variable
- const symbol *x = var->sym;
+ const symbol &x = *(var->sym);
// Remove integer content
numeric gc = gcd(a.integer_content(), b.integer_content());
numeric rgc = gc.inverse();
ex p = a * rgc;
ex q = b * rgc;
- int maxdeg = max(p.degree(*x), q.degree(*x));
+ int maxdeg = max(p.degree(x), q.degree(x));
// Find evaluation point
numeric mp = p.max_coefficient(), mq = q.max_coefficient();
// 6 tries maximum
for (int t=0; t<6; t++) {
if (xi.int_length() * maxdeg > 100000) {
-//clog << "giving up heur_gcd, xi.int_length = " << xi.int_length() << ", maxdeg = " << maxdeg << endl;
+//std::clog << "giving up heur_gcd, xi.int_length = " << xi.int_length() << ", maxdeg = " << maxdeg << endl;
throw gcdheu_failed();
}
// Apply evaluation homomorphism and calculate GCD
- ex gamma = heur_gcd(p.subs(*x == xi), q.subs(*x == xi), NULL, NULL, var+1).expand();
+ ex cp, cq;
+ ex gamma = heur_gcd(p.subs(x == xi), q.subs(x == xi), &cp, &cq, var+1).expand();
if (!is_ex_exactly_of_type(gamma, fail)) {
// Reconstruct polynomial from GCD of mapped polynomials
- ex g = _ex0();
- numeric rxi = xi.inverse();
- for (int i=0; !gamma.is_zero(); i++) {
- ex gi = gamma.smod(xi);
- g += gi * power(*x, i);
- gamma = (gamma - gi) * rxi;
- }
+ ex g = interpolate(gamma, xi, x);
+
// Remove integer content
g /= g.integer_content();
- // If the calculated polynomial divides both a and b, this is the GCD
+ // If the calculated polynomial divides both p and q, this is the GCD
ex dummy;
if (divide_in_z(p, g, ca ? *ca : dummy, var) && divide_in_z(q, g, cb ? *cb : dummy, var)) {
g *= gc;
- ex lc = g.lcoeff(*x);
+ ex lc = g.lcoeff(x);
if (is_ex_exactly_of_type(lc, numeric) && ex_to_numeric(lc).is_negative())
return -g;
else
return g;
}
+#if 0
+ cp = interpolate(cp, xi, x);
+ if (divide_in_z(cp, p, g, var)) {
+ if (divide_in_z(g, q, cb ? *cb : dummy, var)) {
+ g *= gc;
+ if (ca)
+ *ca = cp;
+ ex lc = g.lcoeff(x);
+ if (is_ex_exactly_of_type(lc, numeric) && ex_to_numeric(lc).is_negative())
+ return -g;
+ else
+ return g;
+ }
+ }
+ cq = interpolate(cq, xi, x);
+ if (divide_in_z(cq, q, g, var)) {
+ if (divide_in_z(g, p, ca ? *ca : dummy, var)) {
+ g *= gc;
+ if (cb)
+ *cb = cq;
+ ex lc = g.lcoeff(x);
+ if (is_ex_exactly_of_type(lc, numeric) && ex_to_numeric(lc).is_negative())
+ return -g;
+ else
+ return g;
+ }
+ }
+#endif
}
// Next evaluation point
* @return the GCD as a new expression */
ex gcd(const ex &a, const ex &b, ex *ca, ex *cb, bool check_args)
{
-//clog << "gcd(" << a << "," << b << ")\n";
+//std::clog << "gcd(" << a << "," << b << ")\n";
#if STATISTICS
gcd_called++;
#endif
// The symbol with least degree is our main variable
sym_desc_vec::const_iterator var = sym_stats.begin();
- const symbol *x = var->sym;
+ const symbol &x = *(var->sym);
// Cancel trivial common factor
int ldeg_a = var->ldeg_a;
int ldeg_b = var->ldeg_b;
int min_ldeg = min(ldeg_a, ldeg_b);
if (min_ldeg > 0) {
- ex common = power(*x, min_ldeg);
-//clog << "trivial common factor " << common << endl;
+ ex common = power(x, min_ldeg);
+//std::clog << "trivial common factor " << common << endl;
return gcd((aex / common).expand(), (bex / common).expand(), ca, cb, false) * common;
}
// Try to eliminate variables
if (var->deg_a == 0) {
-//clog << "eliminating variable " << *x << " from b" << endl;
- ex c = bex.content(*x);
+//std::clog << "eliminating variable " << x << " from b" << endl;
+ ex c = bex.content(x);
ex g = gcd(aex, c, ca, cb, false);
if (cb)
- *cb *= bex.unit(*x) * bex.primpart(*x, c);
+ *cb *= bex.unit(x) * bex.primpart(x, c);
return g;
} else if (var->deg_b == 0) {
-//clog << "eliminating variable " << *x << " from a" << endl;
- ex c = aex.content(*x);
+//std::clog << "eliminating variable " << x << " from a" << endl;
+ ex c = aex.content(x);
ex g = gcd(c, bex, ca, cb, false);
if (ca)
- *ca *= aex.unit(*x) * aex.primpart(*x, c);
+ *ca *= aex.unit(x) * aex.primpart(x, c);
return g;
}
g = *new ex(fail());
}
if (is_ex_exactly_of_type(g, fail)) {
-//clog << "heuristics failed" << endl;
+//std::clog << "heuristics failed" << endl;
#if STATISTICS
heur_gcd_failed++;
#endif
#endif
// g = heur_gcd(aex, bex, ca, cb, var);
-// g = eu_gcd(aex, bex, x);
-// g = euprem_gcd(aex, bex, x);
-// g = peu_gcd(aex, bex, x);
-// g = red_gcd(aex, bex, x);
- g = sr_gcd(aex, bex, x);
+// g = eu_gcd(aex, bex, &x);
+// g = euprem_gcd(aex, bex, &x);
+// g = peu_gcd(aex, bex, &x);
+// g = red_gcd(aex, bex, &x);
+ g = sr_gcd(aex, bex, var);
if (g.is_equal(_ex1())) {
// Keep cofactors factored if possible
if (ca)
ex den = d;
numeric pre_factor = _num1();
-//clog << "frac_cancel num = " << num << ", den = " << den << endl;
+//std::clog << "frac_cancel num = " << num << ", den = " << den << endl;
// Handle special cases where numerator or denominator is 0
if (num.is_zero())
}
// Return result as list
-//clog << " returns num = " << num << ", den = " << den << ", pre_factor = " << pre_factor << endl;
+//std::clog << " returns num = " << num << ", den = " << den << ", pre_factor = " << pre_factor << endl;
return (new lst(num * pre_factor.numer(), den * pre_factor.denom()))->setflag(status_flags::dynallocated);
}
// Determine common denominator
ex den = _ex1();
exvector::const_iterator ait = o.begin(), aitend = o.end();
-//clog << "add::normal uses the following summands:\n";
+//std::clog << "add::normal uses the following summands:\n";
while (ait != aitend) {
-//clog << " num = " << ait->op(0) << ", den = " << ait->op(1) << endl;
+//std::clog << " num = " << ait->op(0) << ", den = " << ait->op(1) << endl;
den = lcm(ait->op(1), den, false);
ait++;
}
-//clog << " common denominator = " << den << endl;
+//std::clog << " common denominator = " << den << endl;
// Add fractions
if (den.is_equal(_ex1())) {
git://www.ginac.de / ginac.git / blobdiff