- Made determinant_algo (in flags.h) really work.

[ginac.git] / ginac / numeric.h

diff --git a/ginac/numeric.h b/ginac/numeric.h
index d99f08dcda4ab9c25b96a722e200898d5929a95d..c5086f433cac0142f542799cf39c85c9750247ea 100644 (file)
--- a/ginac/numeric.h
+++ b/ginac/numeric.h
@@ -30,9 +30,9 @@
 class cl_N;     // We want to include cln.h only in numeric.cpp in order to 
                 // avoid namespace pollution and keep compile-time low.
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 #define HASHVALUE_NUMERIC 0x80000001U
 
@@ -52,7 +52,7 @@ public:
     _numeric_digits();
     _numeric_digits& operator=(long prec);
     operator long();
-    void print(ostream & os) const;
+    void print(std::ostream & os) const;
 // member variables
 private:
     long digits;
@@ -81,8 +81,9 @@ class numeric : public basic
     friend const numeric asinh(const numeric & x);
     friend const numeric acosh(const numeric & x);
     friend const numeric atanh(const numeric & x);
+    friend const numeric Li2(const numeric & x);
     friend const numeric zeta(const numeric & x);
-    friend const numeric bernoulli(const numeric & n);
+    friend const numeric fibonacci(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);
@@ -117,29 +118,29 @@ public:
     explicit numeric(long numer, long denom);
     explicit numeric(double d);
     explicit numeric(const char *);
-    numeric(cl_N const & z);
-
+    numeric(const cl_N & z);
+    
     // 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;
+    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 diff(const symbol & s) 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:
+    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 {
-        hashvalue=HASHVALUE_NUMERIC;
-        return HASHVALUE_NUMERIC;
-    }
+    unsigned calchash(void) const;
 
     // new virtual functions which can be overridden by derived classes
     // (none)
@@ -164,6 +165,7 @@ public:
     const numeric & operator=(const char * s);
     numeric inverse(void) const;
     int csgn(void) const;
+    ::cl_N* clnptr(void) const { return value; } /**< ptr to representation. */
     int compare(const numeric & other) const;
     bool is_equal(const numeric & other) const;
     bool is_zero(void) const;
@@ -188,17 +190,17 @@ public:
     int to_int(void) const;
     long to_long(void) const;
     double to_double(void) const;
-    numeric real(void) const;
-    numeric imag(void) const;
-    numeric numer(void) const;
-    numeric denom(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;
 
 // member variables
 
 protected:
     static unsigned precedence;
-    cl_N *value;
+    ::cl_N *value;
 };
 
 // global constants
@@ -208,9 +210,12 @@ extern const numeric I;
 extern const 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
 
 const numeric exp(const numeric & x);
@@ -228,8 +233,10 @@ 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 gamma(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);
@@ -251,13 +258,6 @@ 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; }
-};
-
 // wrapper functions around member functions
 inline numeric pow(const numeric & x, const numeric & y)
 { return x.power(y); }
@@ -265,7 +265,7 @@ inline numeric pow(const numeric & x, const numeric & y)
 inline 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)
@@ -304,32 +304,34 @@ 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 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<const numeric &>(*e.bp);
 }
 
-#ifndef NO_GINAC_NAMESPACE
+
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_NUMERIC_H__