X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginac%2Fnumeric.h;h=da41bd32fb3b5ec1cae346fd0c802a8ea9b4805d;hb=709e61093f43462b5816f859a32a31cc00758da8;hp=2cf93480cf9eb16fb812cc4403882f526c20f33b;hpb=56fe6d8d9e7bd113e44bf2eadf26af0b9d480a01;p=ginac.git diff --git a/ginac/numeric.h b/ginac/numeric.h index 2cf93480..da41bd32 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-2006 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2019 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 @@ -20,24 +20,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __GINAC_NUMERIC_H__ -#define __GINAC_NUMERIC_H__ +#ifndef GINAC_NUMERIC_H +#define GINAC_NUMERIC_H #include "basic.h" #include "ex.h" +#include "archive.h" +#include #include #include -#include - -#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 - namespace GiNaC { /** Function pointer to implement callbacks in the case 'Digits' gets changed. @@ -51,7 +44,7 @@ typedef void (* digits_changed_callback)(long); * than a dumber basic type since as a side-effect we let it change * cl_default_float_format when it gets changed. The only other * meaningful thing to do with it is converting it to an unsigned, - * for temprary storing its value e.g. The user must not create an + * for temporarily storing its value e.g. The user must not create an * own working object of this class! Since C++ forces us to make the * class definition visible in order to use an object we put in a * flag which prevents other objects of that class to be created. */ @@ -103,28 +96,35 @@ public: // functions overriding virtual functions from base classes public: - unsigned precedence() const {return 30;} - bool info(unsigned inf) const; - int degree(const ex & s) const; - int ldegree(const ex & s) const; - ex coeff(const ex & s, int n = 1) const; - bool has(const ex &other, unsigned options = 0) const; - ex eval(int level = 0) const; - ex evalf(int level = 0) const; - ex subs(const exmap & m, unsigned options = 0) const { return subs_one_level(m, options); } // overwrites basic::subs() for performance reasons - ex normal(exmap & repl, exmap & rev_lookup, int level = 0) const; - ex to_rational(exmap & repl) const; - ex to_polynomial(exmap & repl) const; - numeric integer_content() const; - ex smod(const numeric &xi) const; - numeric max_coefficient() const; - ex conjugate() const; + unsigned precedence() const override {return 30;} + bool info(unsigned inf) const override; + bool is_polynomial(const ex & var) const override; + int degree(const ex & s) const override; + int ldegree(const ex & s) const override; + ex coeff(const ex & s, int n = 1) const override; + bool has(const ex &other, unsigned options = 0) const override; + ex eval() const override; + ex evalf() const override; + ex subs(const exmap & m, unsigned options = 0) const override { return subs_one_level(m, options); } // overwrites basic::subs() for performance reasons + ex normal(exmap & repl, exmap & rev_lookup) const override; + ex to_rational(exmap & repl) const override; + ex to_polynomial(exmap & repl) const override; + numeric integer_content() const override; + ex smod(const numeric &xi) const override; + numeric max_coefficient() const override; + ex conjugate() const override; + ex real_part() const override; + ex imag_part() const override; + /** Save (a.k.a. serialize) object into archive. */ + void archive(archive_node& n) const override; + /** Read (a.k.a. deserialize) object from archive. */ + void read_archive(const archive_node& n, lst& syms) override; protected: /** Implementation of ex::diff for a numeric always returns 0. * @see ex::diff */ - ex derivative(const symbol &s) const { return 0; } - bool is_equal_same_type(const basic &other) const; - unsigned calchash() const; + ex derivative(const symbol &s) const override { return 0; } + bool is_equal_same_type(const basic &other) const override; + unsigned calchash() const override; // new virtual functions which can be overridden by derived classes // (none) @@ -148,7 +148,7 @@ public: const numeric & operator=(double d); const numeric & operator=(const char *s); const numeric inverse() const; - int step() const; + numeric step() const; int csgn() const; int compare(const numeric &other) const; bool is_equal(const numeric &other) const; @@ -181,7 +181,7 @@ public: const numeric denom() const; int int_length() const; // converting routines for interfacing with CLN: - numeric(const cln::cl_N &z); + explicit numeric(const cln::cl_N &z); protected: void 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; @@ -197,6 +197,7 @@ protected: protected: cln::cl_N value; }; +GINAC_DECLARE_UNARCHIVER(numeric); // global constants @@ -251,7 +252,7 @@ inline const numeric pow(const numeric &x, const numeric &y) inline const numeric inverse(const numeric &x) { return x.inverse(); } -inline int step(const numeric &x) +inline numeric step(const numeric &x) { return x.step(); } inline int csgn(const numeric &x) @@ -263,6 +264,9 @@ inline bool is_zero(const numeric &x) inline bool is_positive(const numeric &x) { return x.is_positive(); } +inline bool is_negative(const numeric &x) +{ return x.is_negative(); } + inline bool is_integer(const numeric &x) { return x.is_integer(); } @@ -323,9 +327,4 @@ ex CatalanEvalf(); } // 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__ +#endif // ndef GINAC_NUMERIC_H