* of special functions or implement the interface to the bignum package. */
/*
- * GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2006 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "config.h"
//////////
/** default ctor. Numerically it initializes to an integer zero. */
-numeric::numeric() : basic(TINFO_numeric)
+numeric::numeric() : basic(&numeric::tinfo_static)
{
value = cln::cl_I(0);
setflag(status_flags::evaluated | status_flags::expanded);
// public
-numeric::numeric(int i) : basic(TINFO_numeric)
+numeric::numeric(int i) : basic(&numeric::tinfo_static)
{
// Not the whole int-range is available if we don't cast to long
// first. This is due to the behaviour of the cl_I-ctor, which
// emphasizes efficiency. However, if the integer is small enough
// we save space and dereferences by using an immediate type.
// (C.f. <cln/object.h>)
+ // The #if clause prevents compiler warnings on 64bit machines where the
+ // comparision is always true.
+#if cl_value_len >= 32
+ value = cln::cl_I(i);
+#else
if (i < (1L << (cl_value_len-1)) && i >= -(1L << (cl_value_len-1)))
value = cln::cl_I(i);
else
value = cln::cl_I(static_cast<long>(i));
+#endif
setflag(status_flags::evaluated | status_flags::expanded);
}
-numeric::numeric(unsigned int i) : basic(TINFO_numeric)
+numeric::numeric(unsigned int i) : basic(&numeric::tinfo_static)
{
// Not the whole uint-range is available if we don't cast to ulong
// first. This is due to the behaviour of the cl_I-ctor, which
// emphasizes efficiency. However, if the integer is small enough
// we save space and dereferences by using an immediate type.
// (C.f. <cln/object.h>)
- if (i < (1U << (cl_value_len-1)))
+ // The #if clause prevents compiler warnings on 64bit machines where the
+ // comparision is always true.
+#if cl_value_len >= 32
+ value = cln::cl_I(i);
+#else
+ if (i < (1UL << (cl_value_len-1)))
value = cln::cl_I(i);
else
value = cln::cl_I(static_cast<unsigned long>(i));
+#endif
setflag(status_flags::evaluated | status_flags::expanded);
}
-numeric::numeric(long i) : basic(TINFO_numeric)
+numeric::numeric(long i) : basic(&numeric::tinfo_static)
{
value = cln::cl_I(i);
setflag(status_flags::evaluated | status_flags::expanded);
}
-numeric::numeric(unsigned long i) : basic(TINFO_numeric)
+numeric::numeric(unsigned long i) : basic(&numeric::tinfo_static)
{
value = cln::cl_I(i);
setflag(status_flags::evaluated | status_flags::expanded);
/** Constructor for rational numerics a/b.
*
* @exception overflow_error (division by zero) */
-numeric::numeric(long numer, long denom) : basic(TINFO_numeric)
+numeric::numeric(long numer, long denom) : basic(&numeric::tinfo_static)
{
if (!denom)
throw std::overflow_error("division by zero");
}
-numeric::numeric(double d) : basic(TINFO_numeric)
+numeric::numeric(double d) : basic(&numeric::tinfo_static)
{
// We really want to explicitly use the type cl_LF instead of the
// more general cl_F, since that would give us a cl_DF only which
/** ctor from C-style string. It also accepts complex numbers in GiNaC
* notation like "2+5*I". */
-numeric::numeric(const char *s) : basic(TINFO_numeric)
+numeric::numeric(const char *s) : basic(&numeric::tinfo_static)
{
cln::cl_N ctorval = 0;
// parse complex numbers (functional but not completely safe, unfortunately
/** Ctor from CLN types. This is for the initiated user or internal use
* only. */
-numeric::numeric(const cln::cl_N &z) : basic(TINFO_numeric)
+numeric::numeric(const cln::cl_N &z) : basic(&numeric::tinfo_static)
{
value = z;
setflag(status_flags::evaluated | status_flags::expanded);
}
+
//////////
// archiving
//////////
// Write number as string
std::ostringstream s;
if (this->is_crational())
- s << cln::the<cln::cl_N>(value);
+ s << value;
else {
// Non-rational numbers are written in an integer-decoded format
// to preserve the precision
void numeric::print_numeric(const print_context & c, const char *par_open, const char *par_close, const char *imag_sym, const char *mul_sym, unsigned level) const
{
- const cln::cl_R r = cln::realpart(cln::the<cln::cl_N>(value));
- const cln::cl_R i = cln::imagpart(cln::the<cln::cl_N>(value));
+ const cln::cl_R r = cln::realpart(value);
+ const cln::cl_R i = cln::imagpart(value);
if (cln::zerop(i)) {
else
c.s << "float>(";
- print_real_csrc(c, cln::realpart(cln::the<cln::cl_N>(value)));
+ print_real_csrc(c, cln::realpart(value));
c.s << ",";
- print_real_csrc(c, cln::imagpart(cln::the<cln::cl_N>(value)));
+ print_real_csrc(c, cln::imagpart(value));
c.s << ")";
}
// Complex number
c.s << "cln::complex(";
- print_real_cl_N(c, cln::realpart(cln::the<cln::cl_N>(value)));
+ print_real_cl_N(c, cln::realpart(value));
c.s << ",";
- print_real_cl_N(c, cln::imagpart(cln::the<cln::cl_N>(value)));
+ print_real_cl_N(c, cln::imagpart(value));
c.s << ")";
}
}
void numeric::do_print_tree(const print_tree & c, unsigned level) const
{
- c.s << std::string(level, ' ') << cln::the<cln::cl_N>(value)
+ c.s << std::string(level, ' ') << value
<< " (" << class_name() << ")" << " @" << this
<< std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
<< std::endl;
return false;
}
+bool numeric::is_polynomial(const ex & var) const
+{
+ return true;
+}
+
int numeric::degree(const ex & s) const
{
return 0;
* results: (2+I).has(-2) -> true. But this is consistent, since we also
* would like to have (-2+I).has(2) -> true and we want to think about the
* sign as a multiplicative factor. */
-bool numeric::has(const ex &other) const
+bool numeric::has(const ex &other, unsigned options) const
{
if (!is_exactly_a<numeric>(other))
return false;
const numeric &o = ex_to<numeric>(other);
if (this->is_equal(o) || this->is_equal(-o))
return true;
- if (o.imag().is_zero()) // e.g. scan for 3 in -3*I
- return (this->real().is_equal(o) || this->imag().is_equal(o) ||
- this->real().is_equal(-o) || this->imag().is_equal(-o));
+ if (o.imag().is_zero()) { // e.g. scan for 3 in -3*I
+ if (!this->real().is_equal(*_num0_p))
+ if (this->real().is_equal(o) || this->real().is_equal(-o))
+ return true;
+ if (!this->imag().is_equal(*_num0_p))
+ if (this->imag().is_equal(o) || this->imag().is_equal(-o))
+ return true;
+ return false;
+ }
else {
if (o.is_equal(I)) // e.g scan for I in 42*I
return !this->is_real();
if (o.real().is_zero()) // e.g. scan for 2*I in 2*I+1
- return (this->real().has(o*I) || this->imag().has(o*I) ||
- this->real().has(-o*I) || this->imag().has(-o*I));
+ if (!this->imag().is_equal(*_num0_p))
+ if (this->imag().is_equal(o*I) || this->imag().is_equal(-o*I))
+ return true;
}
return false;
}
ex numeric::evalf(int level) const
{
// level can safely be discarded for numeric objects.
- return numeric(cln::cl_float(1.0, cln::default_float_format) *
- (cln::the<cln::cl_N>(value)));
+ return numeric(cln::cl_float(1.0, cln::default_float_format) * value);
+}
+
+ex numeric::conjugate() const
+{
+ if (is_real()) {
+ return *this;
+ }
+ return numeric(cln::conjugate(this->value));
+}
+
+ex numeric::real_part() const
+{
+ return numeric(cln::realpart(value));
+}
+
+ex numeric::imag_part() const
+{
+ return numeric(cln::imagpart(value));
}
// protected
// equivalence relation on numbers). As a consequence, 3 and 3.0 share
// the same hashvalue. That shouldn't really matter, though.
setflag(status_flags::hash_calculated);
- hashvalue = golden_ratio_hash(cln::equal_hashcode(cln::the<cln::cl_N>(value)));
+ hashvalue = golden_ratio_hash(cln::equal_hashcode(value));
return hashvalue;
}
* a numeric object. */
const numeric numeric::add(const numeric &other) const
{
- return numeric(cln::the<cln::cl_N>(value)+cln::the<cln::cl_N>(other.value));
+ return numeric(value + other.value);
}
* result as a numeric object. */
const numeric numeric::sub(const numeric &other) const
{
- return numeric(cln::the<cln::cl_N>(value)-cln::the<cln::cl_N>(other.value));
+ return numeric(value - other.value);
}
* result as a numeric object. */
const numeric numeric::mul(const numeric &other) const
{
- return numeric(cln::the<cln::cl_N>(value)*cln::the<cln::cl_N>(other.value));
+ return numeric(value * other.value);
}
* @exception overflow_error (division by zero) */
const numeric numeric::div(const numeric &other) const
{
- if (cln::zerop(cln::the<cln::cl_N>(other.value)))
+ if (cln::zerop(other.value))
throw std::overflow_error("numeric::div(): division by zero");
- return numeric(cln::the<cln::cl_N>(value)/cln::the<cln::cl_N>(other.value));
+ return numeric(value / other.value);
}
{
// Shortcut for efficiency and numeric stability (as in 1.0 exponent):
// trap the neutral exponent.
- if (&other==_num1_p || cln::equal(cln::the<cln::cl_N>(other.value),cln::the<cln::cl_N>(_num1.value)))
+ if (&other==_num1_p || cln::equal(other.value,_num1_p->value))
return *this;
- if (cln::zerop(cln::the<cln::cl_N>(value))) {
- if (cln::zerop(cln::the<cln::cl_N>(other.value)))
+ if (cln::zerop(value)) {
+ if (cln::zerop(other.value))
throw std::domain_error("numeric::eval(): pow(0,0) is undefined");
- else if (cln::zerop(cln::realpart(cln::the<cln::cl_N>(other.value))))
+ else if (cln::zerop(cln::realpart(other.value)))
throw std::domain_error("numeric::eval(): pow(0,I) is undefined");
- else if (cln::minusp(cln::realpart(cln::the<cln::cl_N>(other.value))))
+ else if (cln::minusp(cln::realpart(other.value)))
throw std::overflow_error("numeric::eval(): division by zero");
else
- return _num0;
+ return *_num0_p;
}
- return numeric(cln::expt(cln::the<cln::cl_N>(value),cln::the<cln::cl_N>(other.value)));
+ return numeric(cln::expt(value, other.value));
}
else if (&other==_num0_p)
return *this;
- return static_cast<const numeric &>((new numeric(cln::the<cln::cl_N>(value)+cln::the<cln::cl_N>(other.value)))->
+ return static_cast<const numeric &>((new numeric(value + other.value))->
setflag(status_flags::dynallocated));
}
{
// Efficiency shortcut: trap the neutral exponent (first by pointer). This
// hack is supposed to keep the number of distinct numeric objects low.
- if (&other==_num0_p || cln::zerop(cln::the<cln::cl_N>(other.value)))
+ if (&other==_num0_p || cln::zerop(other.value))
return *this;
- return static_cast<const numeric &>((new numeric(cln::the<cln::cl_N>(value)-cln::the<cln::cl_N>(other.value)))->
+ return static_cast<const numeric &>((new numeric(value - other.value))->
setflag(status_flags::dynallocated));
}
else if (&other==_num1_p)
return *this;
- return static_cast<const numeric &>((new numeric(cln::the<cln::cl_N>(value)*cln::the<cln::cl_N>(other.value)))->
+ return static_cast<const numeric &>((new numeric(value * other.value))->
setflag(status_flags::dynallocated));
}
return *this;
if (cln::zerop(cln::the<cln::cl_N>(other.value)))
throw std::overflow_error("division by zero");
- return static_cast<const numeric &>((new numeric(cln::the<cln::cl_N>(value)/cln::the<cln::cl_N>(other.value)))->
+ return static_cast<const numeric &>((new numeric(value / other.value))->
setflag(status_flags::dynallocated));
}
// Efficiency shortcut: trap the neutral exponent (first try by pointer, then
// try harder, since calls to cln::expt() below may return amazing results for
// floating point exponent 1.0).
- if (&other==_num1_p || cln::equal(cln::the<cln::cl_N>(other.value),cln::the<cln::cl_N>(_num1.value)))
+ if (&other==_num1_p || cln::equal(other.value, _num1_p->value))
return *this;
- if (cln::zerop(cln::the<cln::cl_N>(value))) {
- if (cln::zerop(cln::the<cln::cl_N>(other.value)))
+ if (cln::zerop(value)) {
+ if (cln::zerop(other.value))
throw std::domain_error("numeric::eval(): pow(0,0) is undefined");
- else if (cln::zerop(cln::realpart(cln::the<cln::cl_N>(other.value))))
+ else if (cln::zerop(cln::realpart(other.value)))
throw std::domain_error("numeric::eval(): pow(0,I) is undefined");
- else if (cln::minusp(cln::realpart(cln::the<cln::cl_N>(other.value))))
+ else if (cln::minusp(cln::realpart(other.value)))
throw std::overflow_error("numeric::eval(): division by zero");
else
- return _num0;
+ return *_num0_p;
}
- return static_cast<const numeric &>((new numeric(cln::expt(cln::the<cln::cl_N>(value),cln::the<cln::cl_N>(other.value))))->
+ return static_cast<const numeric &>((new numeric(cln::expt(value, other.value)))->
setflag(status_flags::dynallocated));
}
/** Inverse of a number. */
const numeric numeric::inverse() const
{
- if (cln::zerop(cln::the<cln::cl_N>(value)))
+ if (cln::zerop(value))
throw std::overflow_error("numeric::inverse(): division by zero");
- return numeric(cln::recip(cln::the<cln::cl_N>(value)));
+ return numeric(cln::recip(value));
}
+/** Return the step function of a numeric. The imaginary part of it is
+ * ignored because the step function is generally considered real but
+ * a numeric may develop a small imaginary part due to rounding errors.
+ */
+numeric numeric::step() const
+{ cln::cl_R r = cln::realpart(value);
+ if(cln::zerop(r))
+ return numeric(1,2);
+ if(cln::plusp(r))
+ return 1;
+ return 0;
+}
/** Return the complex half-plane (left or right) in which the number lies.
* csgn(x)==0 for x==0, csgn(x)==1 for Re(x)>0 or Re(x)=0 and Im(x)>0,
* @see numeric::compare(const numeric &other) */
int numeric::csgn() const
{
- if (cln::zerop(cln::the<cln::cl_N>(value)))
+ if (cln::zerop(value))
return 0;
- cln::cl_R r = cln::realpart(cln::the<cln::cl_N>(value));
+ cln::cl_R r = cln::realpart(value);
if (!cln::zerop(r)) {
if (cln::plusp(r))
return 1;
else
return -1;
} else {
- if (cln::plusp(cln::imagpart(cln::the<cln::cl_N>(value))))
+ if (cln::plusp(cln::imagpart(value)))
return 1;
else
return -1;
return cln::compare(cln::the<cln::cl_R>(value), cln::the<cln::cl_R>(other.value));
else {
// No, first cln::compare real parts...
- cl_signean real_cmp = cln::compare(cln::realpart(cln::the<cln::cl_N>(value)), cln::realpart(cln::the<cln::cl_N>(other.value)));
+ cl_signean real_cmp = cln::compare(cln::realpart(value), cln::realpart(other.value));
if (real_cmp)
return real_cmp;
// ...and then the imaginary parts.
- return cln::compare(cln::imagpart(cln::the<cln::cl_N>(value)), cln::imagpart(cln::the<cln::cl_N>(other.value)));
+ return cln::compare(cln::imagpart(value), cln::imagpart(other.value));
}
}
bool numeric::is_equal(const numeric &other) const
{
- return cln::equal(cln::the<cln::cl_N>(value),cln::the<cln::cl_N>(other.value));
+ return cln::equal(value, other.value);
}
/** True if object is zero. */
bool numeric::is_zero() const
{
- return cln::zerop(cln::the<cln::cl_N>(value));
+ return cln::zerop(value);
}
bool numeric::operator==(const numeric &other) const
{
- return cln::equal(cln::the<cln::cl_N>(value), cln::the<cln::cl_N>(other.value));
+ return cln::equal(value, other.value);
}
bool numeric::operator!=(const numeric &other) const
{
- return !cln::equal(cln::the<cln::cl_N>(value), cln::the<cln::cl_N>(other.value));
+ return !cln::equal(value, other.value);
}
if (cln::instanceof(value, cln::cl_I_ring))
return true;
else if (!this->is_real()) { // complex case, handle n+m*I
- if (cln::instanceof(cln::realpart(cln::the<cln::cl_N>(value)), cln::cl_I_ring) &&
- cln::instanceof(cln::imagpart(cln::the<cln::cl_N>(value)), cln::cl_I_ring))
+ if (cln::instanceof(cln::realpart(value), cln::cl_I_ring) &&
+ cln::instanceof(cln::imagpart(value), cln::cl_I_ring))
return true;
}
return false;
if (cln::instanceof(value, cln::cl_RA_ring))
return true;
else if (!this->is_real()) { // complex case, handle Q(i):
- if (cln::instanceof(cln::realpart(cln::the<cln::cl_N>(value)), cln::cl_RA_ring) &&
- cln::instanceof(cln::imagpart(cln::the<cln::cl_N>(value)), cln::cl_RA_ring))
+ if (cln::instanceof(cln::realpart(value), cln::cl_RA_ring) &&
+ cln::instanceof(cln::imagpart(value), cln::cl_RA_ring))
return true;
}
return false;
double numeric::to_double() const
{
GINAC_ASSERT(this->is_real());
- return cln::double_approx(cln::realpart(cln::the<cln::cl_N>(value)));
+ return cln::double_approx(cln::realpart(value));
}
*/
cln::cl_N numeric::to_cl_N() const
{
- return cln::cl_N(cln::the<cln::cl_N>(value));
+ return value;
}
/** Real part of a number. */
const numeric numeric::real() const
{
- return numeric(cln::realpart(cln::the<cln::cl_N>(value)));
+ return numeric(cln::realpart(value));
}
/** Imaginary part of a number. */
const numeric numeric::imag() const
{
- return numeric(cln::imagpart(cln::the<cln::cl_N>(value)));
+ return numeric(cln::imagpart(value));
}
return numeric(cln::numerator(cln::the<cln::cl_RA>(value)));
else if (!this->is_real()) { // complex case, handle Q(i):
- const cln::cl_RA r = cln::the<cln::cl_RA>(cln::realpart(cln::the<cln::cl_N>(value)));
- const cln::cl_RA i = cln::the<cln::cl_RA>(cln::imagpart(cln::the<cln::cl_N>(value)));
+ const cln::cl_RA r = cln::the<cln::cl_RA>(cln::realpart(value));
+ const cln::cl_RA i = cln::the<cln::cl_RA>(cln::imagpart(value));
if (cln::instanceof(r, cln::cl_I_ring) && cln::instanceof(i, cln::cl_I_ring))
return numeric(*this);
if (cln::instanceof(r, cln::cl_I_ring) && cln::instanceof(i, cln::cl_RA_ring))
const numeric numeric::denom() const
{
if (cln::instanceof(value, cln::cl_I_ring))
- return _num1; // integer case
+ return *_num1_p; // integer case
if (cln::instanceof(value, cln::cl_RA_ring))
return numeric(cln::denominator(cln::the<cln::cl_RA>(value)));
if (!this->is_real()) { // complex case, handle Q(i):
- const cln::cl_RA r = cln::the<cln::cl_RA>(cln::realpart(cln::the<cln::cl_N>(value)));
- const cln::cl_RA i = cln::the<cln::cl_RA>(cln::imagpart(cln::the<cln::cl_N>(value)));
+ const cln::cl_RA r = cln::the<cln::cl_RA>(cln::realpart(value));
+ const cln::cl_RA i = cln::the<cln::cl_RA>(cln::imagpart(value));
if (cln::instanceof(r, cln::cl_I_ring) && cln::instanceof(i, cln::cl_I_ring))
- return _num1;
+ return *_num1_p;
if (cln::instanceof(r, cln::cl_I_ring) && cln::instanceof(i, cln::cl_RA_ring))
return numeric(cln::denominator(i));
if (cln::instanceof(r, cln::cl_RA_ring) && cln::instanceof(i, cln::cl_I_ring))
return numeric(cln::lcm(cln::denominator(r), cln::denominator(i)));
}
// at least one float encountered
- return _num1;
+ return *_num1_p;
}
{
if (!x.is_real() &&
x.real().is_zero() &&
- abs(x.imag()).is_equal(_num1))
+ abs(x.imag()).is_equal(*_num1_p))
throw pole_error("atan(): logarithmic pole",0);
return cln::atan(x.to_cl_N());
}
const numeric Li2(const numeric &x)
{
if (x.is_zero())
- return _num0;
+ return *_num0_p;
// what is the desired float format?
// first guess: default format
else if (!x.imag().is_rational())
prec = cln::float_format(cln::the<cln::cl_F>(cln::imagpart(value)));
- if (cln::the<cln::cl_N>(value)==1) // may cause trouble with log(1-x)
+ if (value==1) // may cause trouble with log(1-x)
return cln::zeta(2, prec);
if (cln::abs(value) > 1)
* @exception range_error (argument must be integer >= -1) */
const numeric doublefactorial(const numeric &n)
{
- if (n.is_equal(_num_1))
- return _num1;
+ if (n.is_equal(*_num_1_p))
+ return *_num1_p;
if (!n.is_nonneg_integer())
throw std::range_error("numeric::doublefactorial(): argument must be integer >= -1");
{
if (n.is_integer() && k.is_integer()) {
if (n.is_nonneg_integer()) {
- if (k.compare(n)!=1 && k.compare(_num0)!=-1)
+ if (k.compare(n)!=1 && k.compare(*_num0_p)!=-1)
return numeric(cln::binomial(n.to_int(),k.to_int()));
else
- return _num0;
+ return *_num0_p;
} else {
- return _num_1.power(k)*binomial(k-n-_num1,k);
+ return _num_1_p->power(k)*binomial(k-n-(*_num1_p),k);
}
}
- // should really be gamma(n+1)/gamma(r+1)/gamma(n-r+1) or a suitable limit
- throw std::range_error("numeric::binomial(): donยดt know how to evaluate that.");
+ // should really be gamma(n+1)/gamma(k+1)/gamma(n-k+1) or a suitable limit
+ throw std::range_error("numeric::binomial(): don't know how to evaluate that.");
}
// the special cases not covered by the algorithm below
if (n & 1)
- return (n==1) ? _num_1_2 : _num0;
+ return (n==1) ? (*_num_1_2_p) : (*_num0_p);
if (!n)
- return _num1;
+ return *_num1_p;
// store nonvanishing Bernoulli numbers here
static std::vector< cln::cl_RA > results;
results.reserve(n/2);
for (unsigned p=next_r; p<=n; p+=2) {
cln::cl_I c = 1; // seed for binonmial coefficients
- cln::cl_RA b = cln::cl_RA(1-p)/2;
- const unsigned p3 = p+3;
- const unsigned pm = p-2;
- unsigned i, k, p_2;
- // test if intermediate unsigned int can be represented by immediate
- // objects by CLN (i.e. < 2^29 for 32 Bit machines, see <cln/object.h>)
+ cln::cl_RA b = cln::cl_RA(p-1)/-2;
+ // The CLN manual says: "The conversion from `unsigned int' works only
+ // if the argument is < 2^29" (This is for 32 Bit machines. More
+ // generally, cl_value_len is the limiting exponent of 2. We must make
+ // sure that no intermediates are created which exceed this value. The
+ // largest intermediate is (p+3-2*k)*(p/2-k+1) <= (p^2+p)/2.
if (p < (1UL<<cl_value_len/2)) {
- for (i=2, k=1, p_2=p/2; i<=pm; i+=2, ++k, --p_2) {
- c = cln::exquo(c * ((p3-i) * p_2), (i-1)*k);
+ for (unsigned k=1; k<=p/2-1; ++k) {
+ c = cln::exquo(c * ((p+3-2*k) * (p/2-k+1)), (2*k-1)*k);
b = b + c*results[k-1];
}
} else {
- for (i=2, k=1, p_2=p/2; i<=pm; i+=2, ++k, --p_2) {
- c = cln::exquo((c * (p3-i)) * p_2, cln::cl_I(i-1)*k);
+ for (unsigned k=1; k<=p/2-1; ++k) {
+ c = cln::exquo((c * (p+3-2*k)) * (p/2-k+1), cln::cl_I(2*k-1)*k);
b = b + c*results[k-1];
}
}
// hence
// F(2n+2) = F(n+1)*(2*F(n) + F(n+1))
if (n.is_zero())
- return _num0;
+ return *_num0_p;
if (n.is_negative())
if (n.is_even())
return -fibonacci(-n);
return cln::mod(cln::the<cln::cl_I>(a.to_cl_N()),
cln::the<cln::cl_I>(b.to_cl_N()));
else
- return _num0;
+ return *_num0_p;
}
/** Modulus (in symmetric representation).
* Equivalent to Maple's mods.
*
- * @return a mod b in the range [-iquo(abs(m)-1,2), iquo(abs(m),2)]. */
+ * @return a mod b in the range [-iquo(abs(b)-1,2), iquo(abs(b),2)]. */
const numeric smod(const numeric &a, const numeric &b)
{
if (a.is_integer() && b.is_integer()) {
return cln::mod(cln::the<cln::cl_I>(a.to_cl_N()) + b2,
cln::the<cln::cl_I>(b.to_cl_N())) - b2;
} else
- return _num0;
+ return *_num0_p;
}
return cln::rem(cln::the<cln::cl_I>(a.to_cl_N()),
cln::the<cln::cl_I>(b.to_cl_N()));
else
- return _num0;
+ return *_num0_p;
}
q = rem_quo.quotient;
return rem_quo.remainder;
} else {
- q = _num0;
- return _num0;
+ q = *_num0_p;
+ return *_num0_p;
}
}
return cln::truncate1(cln::the<cln::cl_I>(a.to_cl_N()),
cln::the<cln::cl_I>(b.to_cl_N()));
else
- return _num0;
+ return *_num0_p;
}
r = rem_quo.remainder;
return rem_quo.quotient;
} else {
- r = _num0;
- return _num0;
+ r = *_num0_p;
+ return *_num0_p;
}
}
return cln::gcd(cln::the<cln::cl_I>(a.to_cl_N()),
cln::the<cln::cl_I>(b.to_cl_N()));
else
- return _num1;
+ return *_num1_p;
}
cln::isqrt(cln::the<cln::cl_I>(x.to_cl_N()), &root);
return root;
} else
- return _num0;
+ return *_num0_p;
}
throw(std::runtime_error("I told you not to do instantiate me!"));
too_late = true;
cln::default_float_format = cln::float_format(17);
+
+ // add callbacks for built-in functions
+ // like ... add_callback(Li_lookuptable);
}
/** Assign a native long to global Digits object. */
_numeric_digits& _numeric_digits::operator=(long prec)
{
+ long digitsdiff = prec - digits;
digits = prec;
- cln::default_float_format = cln::float_format(prec);
+ cln::default_float_format = cln::float_format(prec);
+
+ // call registered callbacks
+ std::vector<digits_changed_callback>::const_iterator it = callbacklist.begin(), end = callbacklist.end();
+ for (; it != end; ++it) {
+ (*it)(digitsdiff);
+ }
+
return *this;
}
}
+/** Add a new callback function. */
+void _numeric_digits::add_callback(digits_changed_callback callback)
+{
+ callbacklist.push_back(callback);
+}
+
+
std::ostream& operator<<(std::ostream &os, const _numeric_digits &e)
{
e.print(os);
git://www.ginac.de / ginac.git / blobdiff