Synced to HEAD

[ginac.git] / ginac / basic.h

diff --git a/ginac/basic.h b/ginac/basic.h
index e4c4b09b53daa61e4a4e7f481a989a4185a75d08..a5b71a591f60ba152e417a776b5a524bee874971 100644 (file)
--- 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
@@ -49,6 +49,38 @@ 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;
@@ -164,8 +196,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;
@@ -182,7 +214,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;
 
@@ -208,7 +244,22 @@ public:
        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. */