X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fnumeric.cpp;h=965368625a9343dfe59ee2f82aa7803f66561a55;hb=4f87021ee5736f9bd9571dfbe455cf02a380c7d2;hp=b6c95e01e0c9854ee3e2ab7f97156b6966afc573;hpb=8b9b3aa132366c534e5cc8c7a6116afabd885f7d;p=ginac.git

diff --git a/ginac/numeric.cpp b/ginac/numeric.cpp
index b6c95e01..96536862 100644
--- a/ginac/numeric.cpp
+++ b/ginac/numeric.cpp
@@ -7,7 +7,7 @@
  *  of special functions or implement the interface to the bignum package. */
 
 /*
- *  GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2005 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
@@ -21,7 +21,7 @@
  *
  *  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"
@@ -107,7 +107,7 @@ numeric::numeric(unsigned int i) : basic(TINFO_numeric)
 	// 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)))
+	if (i < (1UL << (cl_value_len-1)))
 		value = cln::cl_I(i);
 	else
 		value = cln::cl_I(static_cast<unsigned long>(i));
@@ -238,6 +238,7 @@ numeric::numeric(const cln::cl_N &z) : basic(TINFO_numeric)
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
+
 //////////
 // archiving
 //////////
@@ -630,15 +631,22 @@ bool numeric::has(const ex &other) const
 	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;
 }
@@ -760,7 +768,7 @@ const numeric numeric::power(const numeric &other) const
 {
 	// Shortcut for efficiency and numeric stability (as in 1.0 exponent):
 	// trap the neutral exponent.
-	if (&other==_num1_p || cln::equal(other.value,_num1.value))
+	if (&other==_num1_p || cln::equal(other.value,_num1_p->value))
 		return *this;
 	
 	if (cln::zerop(value)) {
@@ -771,7 +779,7 @@ const numeric numeric::power(const numeric &other) const
 		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(value, other.value));
 }
@@ -857,7 +865,7 @@ const numeric &numeric::power_dyn(const numeric &other) const
 	// 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(other.value, _num1.value))
+	if (&other==_num1_p || cln::equal(other.value, _num1_p->value))
 		return *this;
 	
 	if (cln::zerop(value)) {
@@ -868,7 +876,7 @@ const numeric &numeric::power_dyn(const numeric &other) const
 		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(value, other.value)))->
 	                                     setflag(status_flags::dynallocated));
@@ -1237,7 +1245,7 @@ const numeric numeric::numer() const
 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)));
@@ -1246,7 +1254,7 @@ const numeric numeric::denom() const
 		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))
@@ -1255,7 +1263,7 @@ const numeric numeric::denom() const
 			return numeric(cln::lcm(cln::denominator(r), cln::denominator(i)));
 	}
 	// at least one float encountered
-	return _num1;
+	return *_num1_p;
 }
 
 
@@ -1359,7 +1367,7 @@ const numeric atan(const numeric &x)
 {
 	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());
 }
@@ -1510,7 +1518,7 @@ static cln::cl_N Li2_projection(const cln::cl_N &x,
 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
@@ -1601,8 +1609,8 @@ const numeric factorial(const numeric &n)
  *  @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");
@@ -1619,17 +1627,17 @@ const numeric binomial(const numeric &n, const numeric &k)
 {
 	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(k+1)/gamma(n-k+1) or a suitable limit
-	throw std::range_error("numeric::binomial(): don´t know how to evaluate that.");
+	throw std::range_error("numeric::binomial(): don't know how to evaluate that.");
 }
 
 
@@ -1681,9 +1689,9 @@ const numeric bernoulli(const numeric &nn)
 
 	// 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;
@@ -1700,20 +1708,20 @@ const numeric bernoulli(const numeric &nn)
 	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];
 			}
  		}
@@ -1751,7 +1759,7 @@ const numeric fibonacci(const numeric &n)
 	// 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);
@@ -1803,7 +1811,7 @@ const numeric mod(const numeric &a, const numeric &b)
 		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;
 }
 
 
@@ -1818,7 +1826,7 @@ const numeric smod(const numeric &a, const numeric &b)
 		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;
 }
 
 
@@ -1837,7 +1845,7 @@ const numeric irem(const numeric &a, const numeric &b)
 		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;
 }
 
 
@@ -1859,8 +1867,8 @@ const numeric irem(const numeric &a, const numeric &b, numeric &q)
 		q = rem_quo.quotient;
 		return rem_quo.remainder;
 	} else {
-		q = _num0;
-		return _num0;
+		q = *_num0_p;
+		return *_num0_p;
 	}
 }
 
@@ -1878,7 +1886,7 @@ const numeric iquo(const numeric &a, const numeric &b)
 		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;
 }
 
 
@@ -1899,8 +1907,8 @@ const numeric iquo(const numeric &a, const numeric &b, numeric &r)
 		r = rem_quo.remainder;
 		return rem_quo.quotient;
 	} else {
-		r = _num0;
-		return _num0;
+		r = *_num0_p;
+		return *_num0_p;
 	}
 }
 
@@ -1915,7 +1923,7 @@ const numeric gcd(const numeric &a, const numeric &b)
 		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;
 }
 
 
@@ -1955,7 +1963,7 @@ const numeric isqrt(const numeric &x)
 		cln::isqrt(cln::the<cln::cl_I>(x.to_cl_N()), &root);
 		return root;
 	} else
-		return _num0;
+		return *_num0_p;
 }
 
 
@@ -1991,14 +1999,25 @@ _numeric_digits::_numeric_digits()
 		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;
 }
 
@@ -2018,6 +2037,13 @@ void _numeric_digits::print(std::ostream &os) const
 }
 
 
+/** 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);