X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fnumeric.cpp;h=6e28b270d1c2c547bfc630e29eacaeab053e45e7;hp=2102e94b6086e4ce146bbb7d9ea8731a5f31a97f;hb=HEAD;hpb=1b8bcb068171ce9d5c8202ae3c76647b65c9a06d diff --git a/ginac/numeric.cpp b/ginac/numeric.cpp index 2102e94b..900cac17 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-2015 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2024 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 @@ -24,15 +24,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "numeric.h" #include "ex.h" #include "operators.h" #include "archive.h" -#include "tostring.h" #include "utils.h" #include @@ -90,7 +85,7 @@ numeric::numeric() numeric::numeric(int i) { // 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 + // first. This is due to the behavior 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. ) @@ -111,7 +106,7 @@ numeric::numeric(int i) numeric::numeric(unsigned int i) { // 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 + // first. This is due to the behavior 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. ) @@ -142,6 +137,17 @@ numeric::numeric(unsigned long i) setflag(status_flags::evaluated | status_flags::expanded); } +numeric::numeric(long long i) +{ + value = cln::cl_I(i); + setflag(status_flags::evaluated | status_flags::expanded); +} + +numeric::numeric(unsigned long long i) +{ + value = cln::cl_I(i); + setflag(status_flags::evaluated | status_flags::expanded); +} /** Constructor for rational numerics a/b. * @@ -225,7 +231,7 @@ numeric::numeric(const char *s) // E to lower case term = term.replace(term.find("E"),1,"e"); // append _ to term - term += "_" + ToString((unsigned)Digits); + term += "_" + std::to_string((unsigned)Digits); // construct float using cln::cl_F(const char *) ctor. if (imaginary) ctorval = ctorval + cln::complex(cln::cl_I(0),cln::cl_F(term.c_str())); @@ -443,7 +449,7 @@ static void print_real_csrc(const print_context & c, const cln::cl_R & x) // Rational number const cln::cl_I numer = cln::numerator(cln::the(x)); const cln::cl_I denom = cln::denominator(cln::the(x)); - if (cln::plusp(x) > 0) { + if (cln::plusp(x)) { c.s << "("; print_integer_csrc(c, numer); } else { @@ -467,7 +473,7 @@ static inline bool coerce(T1& dst, const T2& arg); /** * @brief Check if CLN integer can be converted into int * - * @sa http://www.ginac.de/pipermail/cln-list/2006-October/000248.html + * @sa https://www.ginac.de/pipermail/cln-list/2006-October/000248.html */ template<> inline bool coerce(int& dst, const cln::cl_I& arg) @@ -507,7 +513,7 @@ static void print_real_cl_N(const print_context & c, const cln::cl_R & x) if (coerce(dst, cln::the(x))) { // can be converted to native int if (dst < 0) - c.s << "(-" << dst << ")"; + c.s << '(' << dst << ')'; else c.s << dst; } else { @@ -715,8 +721,6 @@ bool numeric::info(unsigned inf) const return is_odd(); case info_flags::prime: return is_prime(); - case info_flags::algebraic: - return !is_real(); } return false; } @@ -776,10 +780,8 @@ bool numeric::has(const ex &other, unsigned options) const /** Evaluation of numbers doesn't do anything at all. */ -ex numeric::eval(int level) const +ex numeric::eval() const { - // Warning: if this is ever gonna do something, the ex ctors from all kinds - // of numbers should be checking for status_flags::evaluated. return this->hold(); } @@ -789,11 +791,9 @@ ex numeric::eval(int level) const * currently set. In case the object already was a floating point number the * precision is trimmed to match the currently set default. * - * @param level ignored, only needed for overriding basic::evalf. * @return an ex-handle to a numeric. */ -ex numeric::evalf(int level) const +ex numeric::evalf() const { - // level can safely be discarded for numeric objects. return numeric(cln::cl_float(1.0, cln::default_float_format) * value); } @@ -930,9 +930,8 @@ const numeric &numeric::add_dyn(const numeric &other) const return other; else if (&other==_num0_p) return *this; - - return static_cast((new numeric(value + other.value))-> - setflag(status_flags::dynallocated)); + + return dynallocate(value + other.value); } @@ -946,9 +945,8 @@ const numeric &numeric::sub_dyn(const numeric &other) const // hack is supposed to keep the number of distinct numeric objects low. if (&other==_num0_p || cln::zerop(other.value)) return *this; - - return static_cast((new numeric(value - other.value))-> - setflag(status_flags::dynallocated)); + + return dynallocate(value - other.value); } @@ -965,8 +963,7 @@ const numeric &numeric::mul_dyn(const numeric &other) const else if (&other==_num1_p) return *this; - return static_cast((new numeric(value * other.value))-> - setflag(status_flags::dynallocated)); + return dynallocate(value * other.value); } @@ -984,8 +981,8 @@ const numeric &numeric::div_dyn(const numeric &other) const return *this; if (cln::zerop(cln::the(other.value))) throw std::overflow_error("division by zero"); - return static_cast((new numeric(value / other.value))-> - setflag(status_flags::dynallocated)); + + return dynallocate(value / other.value); } @@ -1011,8 +1008,8 @@ const numeric &numeric::power_dyn(const numeric &other) const else return *_num0_p; } - return static_cast((new numeric(cln::expt(value, other.value)))-> - setflag(status_flags::dynallocated)); + + return dynallocate(cln::expt(value, other.value)); } @@ -1749,7 +1746,7 @@ class lanczos_coeffs std::vector *current_vector; }; -std::vector* lanczos_coeffs::coeffs = 0; +std::vector* lanczos_coeffs::coeffs = nullptr; bool lanczos_coeffs::sufficiently_accurate(int digits) { if (digits<=20) { @@ -2024,7 +2021,7 @@ lanczos_coeffs::lanczos_coeffs() coeffs[3].swap(coeffs_120); } -static const cln::float_format_t guess_precision(const cln::cl_N& x) +static cln::float_format_t guess_precision(const cln::cl_N& x) { cln::float_format_t prec = cln::default_float_format; if (!instanceof(realpart(x), cln::cl_RA_ring)) @@ -2141,8 +2138,10 @@ const numeric doublefactorial(const numeric &n) /** The Binomial coefficients. It computes the binomial coefficients. For * integer n and k and positive n this is the number of ways of choosing k - * objects from n distinct objects. If n is negative, the formula - * binomial(n,k) == (-1)^k*binomial(k-n-1,k) is used to compute the result. */ + * objects from n distinct objects. If n is a negative integer, the formula + * binomial(n,k) == (-1)^k*binomial(k-n-1,k) (if k>=0) + * binomial(n,k) == (-1)^(n-k)*binomial(-k-1,n-k) (otherwise) + * is used to compute the result. */ const numeric binomial(const numeric &n, const numeric &k) { if (n.is_integer() && k.is_integer()) { @@ -2152,7 +2151,10 @@ const numeric binomial(const numeric &n, const numeric &k) else return *_num0_p; } else { - return _num_1_p->power(k)*binomial(k-n-(*_num1_p),k); + if (k.is_nonneg_integer()) + return _num_1_p->power(k)*binomial(k-n-(*_num1_p), k); + else + return _num_1_p->power(n-k)*binomial(-k-(*_num1_p), n-k); } } @@ -2227,7 +2229,7 @@ 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_I c = 1; // seed for binomial coefficients 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