Fixed problems on 64-bit machines and introduced has_options::algebraic.

[ginac.git] / ginac / numeric.h

diff --git a/ginac/numeric.h b/ginac/numeric.h
index 45bd853b790808e9c94af6d4fe974282208cfa06..0456b81de8af5d4877b793096d6acadae66c5d69 100644 (file)
--- 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-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2006 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
@@ -17,7 +17,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
  */
 
 #ifndef __GINAC_NUMERIC_H__
@@ -27,10 +27,9 @@
 #include "ex.h"
 
 #include <stdexcept>
+#include <vector>
 
-#include <cln/number.h>
-// forward decln of cln::cl_N, since cln/complex_class.h is not included:
-namespace cln { class cl_N; }
+#include <cln/complex.h>
 
 #if defined(G__CINTVERSION) && !defined(__MAKECINT__)
 // Cint @$#$! doesn't like forward declaring classes used for casting operators
@@ -41,6 +40,12 @@ namespace cln { class cl_N; }
 
 namespace GiNaC {
 
+/** Function pointer to implement callbacks in the case 'Digits' gets changed.
+ *  Main purpose of such callbacks is to adjust look-up tables of certain
+ *  functions to the new precision. Parameter contains the signed difference
+ *  between new Digits and old Digits. */
+typedef void (* digits_changed_callback)(long);
+
 /** This class is used to instantiate a global singleton object Digits
  *  which behaves just like Maple's Digits.  We need an object rather 
  *  than a dumber basic type since as a side-effect we let it change
@@ -57,11 +62,14 @@ public:
        _numeric_digits();
        _numeric_digits& operator=(long prec);
        operator long();
-       void print(std::ostream &os) const;
+       void print(std::ostream& os) const;
+       void add_callback(digits_changed_callback callback);
 // member variables
 private:
        long digits;                        ///< Number of decimal digits
        static bool too_late;               ///< Already one object present
+       // Holds a list of functions that get called when digits is changed.
+       std::vector<digits_changed_callback> callbacklist;
 };
 
 
@@ -100,7 +108,7 @@ public:
        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) 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
@@ -110,6 +118,7 @@ public:
        numeric integer_content() const;
        ex smod(const numeric &xi) const;
        numeric max_coefficient() const;
+       ex conjugate() const;
 protected:
        /** Implementation of ex::diff for a numeric always returns 0.
         *  @see ex::diff */
@@ -185,7 +194,7 @@ protected:
 // member variables
 
 protected:
-       cln::cl_number value;
+       cln::cl_N value;
 };
 
 
@@ -308,14 +317,6 @@ ex EulerEvalf();
 ex CatalanEvalf();
 
 
-// utility functions
-
-/** Specialization of is_exactly_a<numeric>(obj) for numeric objects. */
-template<> inline bool is_exactly_a<numeric>(const basic & obj)
-{
-       return obj.tinfo()==TINFO_numeric;
-}
-
 } // namespace GiNaC
 
 #ifdef __MAKECINT__