X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fbasic.h;h=9f88d7b88946ec65a2f37add7a3cf393752803db;hp=1d81c6e19bc2f6ced70962e468fa7bac5ad824ab;hb=8ce440866e23bd6e534131b117fd6ec34484e5e5;hpb=0f7b8280ad89fa88a0cbaab7785a4b7cb06e6a63

diff --git a/ginac/basic.h b/ginac/basic.h
index 1d81c6e1..9f88d7b8 100644
--- a/ginac/basic.h
+++ b/ginac/basic.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's ABC. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2004 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
@@ -31,6 +31,7 @@
 
 #include "flags.h"
 #include "tinfos.h"
+#include "ptr.h"
 #include "assertion.h"
 #include "registrar.h"
 
@@ -43,12 +44,43 @@ class numeric;
 class relational;
 class archive_node;
 class print_context;
-template <class> class ptr;
 
 typedef std::vector<ex> exvector;
 typedef std::map<ex, ex, ex_is_less> exmap;
 
 
+// Define this to enable some statistical output for comparisons and hashing
+#undef GINAC_COMPARE_STATISTICS
+
+#ifdef GINAC_COMPARE_STATISTICS
+class compare_statistics_t {
+public:
+	compare_statistics_t()
+	 : total_compares(0), nontrivial_compares(0), total_basic_compares(0), compare_same_hashvalue(0), compare_same_type(0),
+	   total_is_equals(0), nontrivial_is_equals(0), total_basic_is_equals(0), is_equal_same_hashvalue(0), is_equal_same_type(0),
+	   total_gethash(0), gethash_cached(0) {}
+	~compare_statistics_t();
+
+	unsigned long total_compares;
+	unsigned long nontrivial_compares;
+	unsigned long total_basic_compares;
+	unsigned long compare_same_hashvalue;
+	unsigned long compare_same_type;
+
+	unsigned long total_is_equals;
+	unsigned long nontrivial_is_equals;
+	unsigned long total_basic_is_equals;
+	unsigned long is_equal_same_hashvalue;
+	unsigned long is_equal_same_type;
+
+	unsigned long total_gethash;
+	unsigned long gethash_cached;
+};
+
+extern compare_statistics_t compare_statistics;
+#endif
+
+
 /** Function object for map(). */
 struct map_function {
 	typedef const ex & argument_type;
@@ -66,25 +98,23 @@ protected:
 };
 
 
-/** This class is the ABC (abstract base class) of GiNaC's class hierarchy.
- *  It is responsible for the reference counting. */
-class basic
+/** This class is the ABC (abstract base class) of GiNaC's class hierarchy. */
+class basic : public refcounted
 {
 	GINAC_DECLARE_REGISTERED_CLASS_NO_CTORS(basic, void)
 	
 	friend class ex;
-	friend class ptr<basic>;
 	
 	// default constructor, destructor, copy constructor and assignment operator
 protected:
-	basic() : tinfo_key(TINFO_basic), flags(0), refcount(0) {}
+	basic() : tinfo_key(TINFO_basic), flags(0) {}
 
 public:
 	/** basic destructor, virtual because class ex will delete objects of
 	 *  derived classes via a basic*. */
 	virtual ~basic()
 	{
-		GINAC_ASSERT((!(flags & status_flags::dynallocated))||(refcount==0));
+		GINAC_ASSERT((!(flags & status_flags::dynallocated)) || (get_refcount() == 0));
 	}
 	basic(const basic & other);
 	const basic & operator=(const basic & other);
@@ -92,7 +122,7 @@ public:
 protected:
 	/** Constructor with specified tinfo_key (used by derived classes instead
 	 *  of the default constructor to avoid assigning tinfo_key twice). */
-	basic(unsigned ti) : tinfo_key(ti), flags(0), refcount(0) {}
+	basic(unsigned ti) : tinfo_key(ti), flags(0) {}
 	
 	// new virtual functions which can be overridden by derived classes
 public: // only const functions please (may break reference counting)
@@ -106,6 +136,7 @@ public: // only const functions please (may break reference counting)
 	virtual ex eval(int level = 0) const;
 	virtual ex evalf(int level = 0) const;
 	virtual ex evalm() const;
+	virtual ex eval_integ() const;
 protected:
 	virtual ex eval_ncmul(const exvector & v) const;
 public:
@@ -166,8 +197,8 @@ public:
 
 	// rational functions
 	virtual ex normal(exmap & repl, exmap & rev_lookup, int level = 0) const;
-	virtual ex to_rational(lst &repl_lst) const;
-	virtual ex to_polynomial(lst &repl_lst) const;
+	virtual ex to_rational(exmap & repl) const;
+	virtual ex to_polynomial(exmap & repl) const;
 
 	// polynomial algorithms
 	virtual numeric integer_content() const;
@@ -184,7 +215,11 @@ public:
 	virtual unsigned return_type() const;
 	virtual unsigned return_type_tinfo() const;
 
-protected: // functions that should be called from class ex only
+	// complex conjugation
+	virtual ex conjugate() const;
+
+	// functions that should be called from class ex only
+protected:
 	virtual int compare_same_type(const basic & other) const;
 	virtual bool is_equal_same_type(const basic & other) const;
 
@@ -192,12 +227,40 @@ protected: // functions that should be called from class ex only
 	
 	// non-virtual functions in this class
 public:
+	/** Like print(), but dispatch to the specified class. Can be used by
+	 *  implementations of print methods to dispatch to the method of the
+	 *  superclass.
+	 *
+	 *  @see basic::print */
+	template <class T>
+	void print_dispatch(const print_context & c, unsigned level) const
+	{
+		print_dispatch(T::get_class_info_static(), c, level);
+	}
+
+	void print_dispatch(const registered_class_info & ri, const print_context & c, unsigned level) const;
+
 	ex subs_one_level(const exmap & m, unsigned options) const;
 	ex diff(const symbol & s, unsigned nth = 1) const;
 	int compare(const basic & other) const;
 	bool is_equal(const basic & other) const;
 	const basic & hold() const;
-	unsigned gethash() const { if (flags & status_flags::hash_calculated) return hashvalue; else return calchash(); }
+
+	unsigned gethash() const
+	{
+#ifdef GINAC_COMPARE_STATISTICS
+		compare_statistics.total_gethash++;
+#endif
+		if (flags & status_flags::hash_calculated) {
+#ifdef GINAC_COMPARE_STATISTICS
+			compare_statistics.gethash_cached++;
+#endif
+			return hashvalue;
+		} else {
+			return calchash();
+		}
+	}
+
 	unsigned tinfo() const {return tinfo_key;}
 
 	/** Set some status_flags. */
@@ -208,14 +271,16 @@ public:
 
 protected:
 	void ensure_if_modifiable() const;
+
+	void do_print(const print_context & c, unsigned level) const;
+	void do_print_tree(const print_tree & c, unsigned level) const;
+	void do_print_python_repr(const print_python_repr & c, unsigned level) const;
 	
 	// member variables
 protected:
 	unsigned tinfo_key;                 ///< typeinfo
 	mutable unsigned flags;             ///< of type status_flags
 	mutable unsigned hashvalue;         ///< hash value
-private:
-	size_t refcount;                    ///< reference counter, managed by ptr<basic>
 };
 
 
@@ -237,9 +302,9 @@ inline bool is_a(const basic &obj)
  *  inefficient default.  It should in all time-critical cases be overridden
  *  by template specializations that use the TINFO_* constants directly. */
 template <class T>
-inline bool is_exactly_a(const class basic &obj)
+inline bool is_exactly_a(const basic &obj)
 {
-	return obj.tinfo() == T::reg_info.tinfo_key;
+	return obj.tinfo() == T::get_class_info_static().options.get_id();
 }
 
 } // namespace GiNaC