X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fnumeric.h;h=c519eccbda6921f2d5b240574da6adf46fe33e28;hp=30d4edf34116f5bc9b675845a9d64604b0dd4b45;hb=74d3d2ce6bb6dbe073642ec77b23f2a16f8c65aa;hpb=4afb5bbe2c0b0a60928120a042997ba7d89e8f5c diff --git a/ginac/numeric.h b/ginac/numeric.h index 30d4edf3..c519eccb 100644 --- a/ginac/numeric.h +++ b/ginac/numeric.h @@ -3,7 +3,7 @@ * Makes the interface to the underlying bignum package available. */ /* - * GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2001 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,23 @@ #define __GINAC_NUMERIC_H__ #include -#include -#include +#include "basic.h" +#include "ex.h" -class cl_N; // We want to include cln.h only in numeric.cpp in order to - // avoid namespace pollution and keep compile-time low. +#include +// forward decln of cln::cl_N, since cln/complex_class.h is not included: +namespace cln { class cl_N; } -#ifndef NO_GINAC_NAMESPACE +#if defined(G__CINTVERSION) && !defined(__MAKECINT__) +// Cint @$#$! doesn't like forward declaring classes used for casting operators +// so we have to include the definition of cln::cl_N here, but it is enough to +// do so for the compiler, hence the !defined(__MAKECINT__). + #include +#endif + +#ifndef NO_NAMESPACE_GINAC namespace GiNaC { -#endif // ndef NO_GINAC_NAMESPACE +#endif // ndef NO_NAMESPACE_GINAC #define HASHVALUE_NUMERIC 0x80000001U @@ -49,219 +57,195 @@ class _numeric_digits { // member functions public: - _numeric_digits(); - _numeric_digits& operator=(long prec); - operator long(); - void print(ostream & os) const; + _numeric_digits(); + _numeric_digits& operator=(long prec); + operator long(); + void print(std::ostream & os) const; // member variables private: - long digits; - static bool too_late; + long digits; + static bool too_late; }; /** This class is a wrapper around CLN-numbers within the GiNaC class * hierarchy. Objects of this type may directly be created by the user.*/ class numeric : public basic { + GINAC_DECLARE_REGISTERED_CLASS(numeric, basic) + // friends - friend numeric exp(const numeric & x); - friend numeric log(const numeric & x); - friend numeric sin(const numeric & x); - friend numeric cos(const numeric & x); - friend numeric tan(const numeric & x); - friend numeric asin(const numeric & x); - friend numeric acos(const numeric & x); - friend numeric atan(const numeric & x); - friend numeric atan(const numeric & y, const numeric & x); - friend numeric sinh(const numeric & x); - friend numeric cosh(const numeric & x); - friend numeric tanh(const numeric & x); - friend numeric asinh(const numeric & x); - friend numeric acosh(const numeric & x); - friend numeric atanh(const numeric & x); - friend numeric zeta(const numeric & x); - friend numeric bernoulli(const numeric & n); - friend numeric abs(const numeric & x); - friend numeric mod(const numeric & a, const numeric & b); - friend numeric smod(const numeric & a, const numeric & b); - friend numeric irem(const numeric & a, const numeric & b); - friend numeric irem(const numeric & a, const numeric & b, numeric & q); - friend numeric iquo(const numeric & a, const numeric & b); - friend numeric iquo(const numeric & a, const numeric & b, numeric & r); - friend numeric sqrt(const numeric & x); - friend numeric isqrt(const numeric & x); - friend numeric gcd(const numeric & a, const numeric & b); - friend numeric lcm(const numeric & a, const numeric & b); +// (none) // member functions - // default constructor, destructor, copy constructor assignment - // operator and helpers + // default constructor, destructor, copy constructor assignment + // operator and helpers public: - numeric(); - ~numeric(); - numeric(const numeric & other); - const numeric & operator=(const numeric & other); + numeric(); + ~numeric(); + numeric(const numeric & other); + const numeric & operator=(const numeric & other); protected: - void copy(const numeric & other); - void destroy(bool call_parent); + void copy(const numeric & other); + void destroy(bool call_parent); - // other constructors + // other constructors public: - explicit numeric(int i); - explicit numeric(unsigned int i); - explicit numeric(long i); - explicit numeric(unsigned long i); - explicit numeric(long numer, long denom); - explicit numeric(double d); - explicit numeric(char const *); - numeric(cl_N const & z); - - // functions overriding virtual functions from bases classes + explicit numeric(int i); + explicit numeric(unsigned int i); + explicit numeric(long i); + explicit numeric(unsigned long i); + explicit numeric(long numer, long denom); + explicit numeric(double d); + explicit numeric(const char *); + + // functions overriding virtual functions from bases classes public: - basic * duplicate() const; - void print(ostream & os, unsigned precedence=0) const; - void printraw(ostream & os) const; - void printtree(ostream & os, unsigned indent) const; - void printcsrc(ostream & os, unsigned type, unsigned precedence=0) const; - bool info(unsigned inf) const; - ex evalf(int level=0) const; - ex diff(symbol const & s) const; - ex normal(lst &sym_lst, lst &repl_lst, int level=0) const; - numeric integer_content(void) const; - ex smod(const numeric &xi) const; - numeric max_coefficient(void) const; + basic * duplicate() const; + void print(std::ostream & os, unsigned precedence=0) const; + void printraw(std::ostream & os) const; + void printtree(std::ostream & os, unsigned indent) const; + void printcsrc(std::ostream & os, unsigned type, unsigned precedence=0) const; + bool info(unsigned inf) const; + bool has(const ex & other) const; + ex eval(int level=0) const; + ex evalf(int level=0) const; + ex normal(lst &sym_lst, lst &repl_lst, int level=0) const; + ex to_rational(lst &repl_lst) const; + numeric integer_content(void) const; + ex smod(const numeric &xi) const; + numeric max_coefficient(void) const; protected: - int compare_same_type(basic const & other) const; - bool is_equal_same_type(basic const & other) const; - unsigned calchash(void) const { - hashvalue=HASHVALUE_NUMERIC; - return HASHVALUE_NUMERIC; - } + ex derivative(const symbol & s) const; + int compare_same_type(const basic & other) const; + bool is_equal_same_type(const basic & other) const; + unsigned calchash(void) const; - // new virtual functions which can be overridden by derived classes - // (none) + // new virtual functions which can be overridden by derived classes + // (none) - // non-virtual functions in this class + // non-virtual functions in this class public: - numeric add(const numeric & other) const; - numeric sub(const numeric & other) const; - numeric mul(const numeric & other) const; - numeric div(const numeric & other) const; - numeric power(const numeric & other) const; - const numeric & add_dyn(const numeric & other) const; - const numeric & sub_dyn(const numeric & other) const; - const numeric & mul_dyn(const numeric & other) const; - const numeric & div_dyn(const numeric & other) const; - const numeric & power_dyn(const numeric & other) const; - const numeric & operator=(int i); - const numeric & operator=(unsigned int i); - const numeric & operator=(long i); - const numeric & operator=(unsigned long i); - const numeric & operator=(double d); - const numeric & operator=(char const * s); - numeric inverse(void) const; - int csgn(void) const; - int compare(const numeric & other) const; - bool is_equal(const numeric & other) const; - bool is_zero(void) const; - bool is_positive(void) const; - bool is_negative(void) const; - bool is_integer(void) const; - bool is_pos_integer(void) const; - bool is_nonneg_integer(void) const; - bool is_even(void) const; - bool is_odd(void) const; - bool is_prime(void) const; - bool is_rational(void) const; - bool is_real(void) const; - bool is_cinteger(void) const; - bool is_crational(void) const; - bool operator==(const numeric & other) const; - bool operator!=(const numeric & other) const; - bool operator<(const numeric & other) const; - bool operator<=(const numeric & other) const; - bool operator>(const numeric & other) const; - bool operator>=(const numeric & other) const; - int to_int(void) const; - double to_double(void) const; - numeric real(void) const; - numeric imag(void) const; - numeric numer(void) const; - numeric denom(void) const; - int int_length(void) const; + const numeric add(const numeric & other) const; + const numeric sub(const numeric & other) const; + const numeric mul(const numeric & other) const; + const numeric div(const numeric & other) const; + const numeric power(const numeric & other) const; + const numeric & add_dyn(const numeric & other) const; + const numeric & sub_dyn(const numeric & other) const; + const numeric & mul_dyn(const numeric & other) const; + const numeric & div_dyn(const numeric & other) const; + const numeric & power_dyn(const numeric & other) const; + const numeric & operator=(int i); + const numeric & operator=(unsigned int i); + const numeric & operator=(long i); + const numeric & operator=(unsigned long i); + const numeric & operator=(double d); + const numeric & operator=(const char * s); + const numeric inverse(void) const; + int csgn(void) const; + int compare(const numeric & other) const; + bool is_equal(const numeric & other) const; + bool is_zero(void) const; + bool is_positive(void) const; + bool is_negative(void) const; + bool is_integer(void) const; + bool is_pos_integer(void) const; + bool is_nonneg_integer(void) const; + bool is_even(void) const; + bool is_odd(void) const; + bool is_prime(void) const; + bool is_rational(void) const; + bool is_real(void) const; + bool is_cinteger(void) const; + bool is_crational(void) const; + bool operator==(const numeric & other) const; + bool operator!=(const numeric & other) const; + bool operator<(const numeric & other) const; + bool operator<=(const numeric & other) const; + bool operator>(const numeric & other) const; + bool operator>=(const numeric & other) const; + int to_int(void) const; + long to_long(void) const; + double to_double(void) const; + cln::cl_N to_cl_N(void) const; + const numeric real(void) const; + const numeric imag(void) const; + const numeric numer(void) const; + const numeric denom(void) const; + int int_length(void) const; + // converting routines for interfacing with CLN: + numeric(const cln::cl_N & z); // member variables protected: - static unsigned precedence; - cl_N *value; + static unsigned precedence; + cln::cl_number value; }; // global constants extern const numeric some_numeric; extern const numeric I; -extern type_info const & typeid_numeric; +extern const std::type_info & typeid_numeric; extern _numeric_digits Digits; -#define is_a_numeric_hash(x) ((x)==HASHVALUE_NUMERIC) +//#define is_a_numeric_hash(x) ((x)==HASHVALUE_NUMERIC) // may have to be changed to ((x)>=0x80000000U) +// has been changed +//#define is_a_numeric_hash(x) ((x)&0x80000000U) + // global functions -numeric exp(const numeric & x); -numeric log(const numeric & x); -numeric sin(const numeric & x); -numeric cos(const numeric & x); -numeric tan(const numeric & x); -numeric asin(const numeric & x); -numeric acos(const numeric & x); -numeric atan(const numeric & x); -numeric atan(const numeric & y, const numeric & x); -numeric sinh(const numeric & x); -numeric cosh(const numeric & x); -numeric tanh(const numeric & x); -numeric asinh(const numeric & x); -numeric acosh(const numeric & x); -numeric atanh(const numeric & x); -numeric zeta(const numeric & x); -numeric gamma(const numeric & x); -numeric psi(const numeric & x); -numeric psi(const numeric & n, const numeric & x); -numeric factorial(const numeric & n); -numeric doublefactorial(const numeric & n); -numeric binomial(const numeric & n, const numeric & k); -numeric bernoulli(const numeric & n); - -numeric abs(const numeric & x); -numeric mod(const numeric & a, const numeric & b); -numeric smod(const numeric & a, const numeric & b); -numeric irem(const numeric & a, const numeric & b); -numeric irem(const numeric & a, const numeric & b, numeric & q); -numeric iquo(const numeric & a, const numeric & b); -numeric iquo(const numeric & a, const numeric & b, numeric & r); -numeric sqrt(const numeric & x); -numeric isqrt(const numeric & x); - -numeric gcd(const numeric & a, const numeric & b); -numeric lcm(const numeric & a, const numeric & b); - -/** Exception thrown by numeric members to signal failure */ -struct numeric_fail -{ - int failval; - numeric_fail(int n) { failval = n; } -}; +const numeric exp(const numeric & x); +const numeric log(const numeric & x); +const numeric sin(const numeric & x); +const numeric cos(const numeric & x); +const numeric tan(const numeric & x); +const numeric asin(const numeric & x); +const numeric acos(const numeric & x); +const numeric atan(const numeric & x); +const numeric atan(const numeric & y, const numeric & x); +const numeric sinh(const numeric & x); +const numeric cosh(const numeric & x); +const numeric tanh(const numeric & x); +const numeric asinh(const numeric & x); +const numeric acosh(const numeric & x); +const numeric atanh(const numeric & x); +const numeric Li2(const numeric & x); +const numeric zeta(const numeric & x); +const numeric lgamma(const numeric & x); +const numeric tgamma(const numeric & x); +const numeric psi(const numeric & x); +const numeric psi(const numeric & n, const numeric & x); +const numeric factorial(const numeric & n); +const numeric doublefactorial(const numeric & n); +const numeric binomial(const numeric & n, const numeric & k); +const numeric bernoulli(const numeric & n); +const numeric fibonacci(const numeric & n); +const numeric abs(const numeric & x); +const numeric isqrt(const numeric & x); +const numeric sqrt(const numeric & x); +const numeric abs(const numeric & x); +const numeric mod(const numeric & a, const numeric & b); +const numeric smod(const numeric & a, const numeric & b); +const numeric irem(const numeric & a, const numeric & b); +const numeric irem(const numeric & a, const numeric & b, numeric & q); +const numeric iquo(const numeric & a, const numeric & b); +const numeric iquo(const numeric & a, const numeric & b, numeric & r); +const numeric gcd(const numeric & a, const numeric & b); +const numeric lcm(const numeric & a, const numeric & b); // wrapper functions around member functions -inline numeric pow(const numeric & x, const numeric & y) +inline const numeric pow(const numeric & x, const numeric & y) { return x.power(y); } -inline numeric inverse(const numeric & x) +inline const numeric inverse(const numeric & x) { return x.inverse(); } -inline bool csgn(const numeric & x) +inline int csgn(const numeric & x) { return x.csgn(); } inline bool is_zero(const numeric & x) @@ -300,32 +284,48 @@ inline bool is_cinteger(const numeric & x) inline bool is_crational(const numeric & x) { return x.is_crational(); } -inline numeric real(const numeric & x) +inline int to_int(const numeric & x) +{ return x.to_int(); } + +inline long to_long(const numeric & x) +{ return x.to_long(); } + +inline double to_double(const numeric & x) +{ return x.to_double(); } + +inline const numeric real(const numeric & x) { return x.real(); } -inline numeric imag(const numeric & x) +inline const numeric imag(const numeric & x) { return x.imag(); } -inline numeric numer(const numeric & x) +inline const numeric numer(const numeric & x) { return x.numer(); } -inline numeric denom(const numeric & x) +inline const numeric denom(const numeric & x) { return x.denom(); } // numeric evaluation functions for class constant objects: ex PiEvalf(void); -ex EulerGammaEvalf(void); +ex EulerEvalf(void); ex CatalanEvalf(void); + // utility functions inline const numeric &ex_to_numeric(const ex &e) { - return static_cast(*e.bp); + return static_cast(*e.bp); } -#ifndef NO_GINAC_NAMESPACE + +#ifndef NO_NAMESPACE_GINAC } // namespace GiNaC -#endif // ndef NO_GINAC_NAMESPACE +#endif // ndef NO_NAMESPACE_GINAC + +#ifdef __MAKECINT__ +#pragma link off defined_in cln/number.h; +#pragma link off defined_in cln/complex_class.h; +#endif #endif // ndef __GINAC_NUMERIC_H__