Remove unfinished code for hash table-based expairseq.

[ginac.git] / ginac / expairseq.h

diff --git a/ginac/expairseq.h b/ginac/expairseq.h
index 5f707f7679e19e9780da6586d3e0613deca1dd02..6e98bbfcc70572ae56aa1b55a88f8380dc858714 100644 (file)
--- a/ginac/expairseq.h
+++ b/ginac/expairseq.h
@@ -3,7 +3,7 @@
  *  Interface to sequences of expression pairs. */
 
 /*
- *  GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2015 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,30 +20,19 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_EXPAIRSEQ_H__
-#define __GINAC_EXPAIRSEQ_H__
-
-#include <vector>
-#include <list>
-#include <memory>
-// CINT needs <algorithm> to work properly with <vector> and <list>
-#include <algorithm>
+#ifndef GINAC_EXPAIRSEQ_H
+#define GINAC_EXPAIRSEQ_H
 
 #include "expair.h"
 #include "indexed.h"
 
-namespace GiNaC {
+// CINT needs <algorithm> to work properly with <vector> and <list>
+#include <algorithm>
+#include <list>
+#include <memory>
+#include <vector>
 
-/** Using hash tables can potentially enhance the asymptotic behaviour of
- *  combining n terms into one large sum (or n terms into one large product)
- *  from O(n*log(n)) to about O(n).  There are, however, several drawbacks.
- *  The constant in front of O(n) is quite large, when copying such an object
- *  one also has to copy the has table, comparison is quite expensive because
- *  there is no ordering any more, it doesn't help at all when combining two
- *  expairseqs because due to the presorted nature the behaviour would be
- *  O(n) anyways, the code is quite messy, etc, etc.  The code is here as
- *  an example for following generations to tinker with. */
-#define EXPAIRSEQ_USE_HASHTAB 0
+namespace GiNaC {
 
 typedef std::vector<expair> epvector;       ///< expair-vector
 typedef epvector::iterator epp;             ///< expair-vector pointer
@@ -87,7 +76,9 @@ public:
        bool match(const ex & pattern, exmap& repl_lst) const;
        ex subs(const exmap & m, unsigned options = 0) const;
        ex conjugate() const;
-       bool is_polynomial(const ex & var) const;
+
+       void archive(archive_node& n) const;
+       void read_archive(const archive_node& n, lst& syms);
 protected:
        bool is_equal_same_type(const basic & other) const;
        unsigned return_type() const;
@@ -105,9 +96,9 @@ protected:
                               unsigned upper_precedence) const;
        virtual expair split_ex_to_pair(const ex & e) const;
        virtual expair combine_ex_with_coeff_to_pair(const ex & e,
-                                                                                                const ex & c) const;
+                                                    const ex & c) const;
        virtual expair combine_pair_with_coeff_to_pair(const expair & p,
-                                                                                                  const ex & c) const;
+                                                      const ex & c) const;
        virtual ex recombine_pair_to_ex(const expair & p) const;
        virtual bool expair_needs_further_processing(epp it);
        virtual ex default_overall_coeff() const;
@@ -131,27 +122,6 @@ protected:
        void make_flat(const epvector & v, bool do_index_renaming = false);
        void canonicalize();
        void combine_same_terms_sorted_seq();
-#if EXPAIRSEQ_USE_HASHTAB
-       void combine_same_terms();
-       unsigned calc_hashtabsize(unsigned sz) const;
-       unsigned calc_hashindex(const ex & e) const;
-       void shrink_hashtab();
-       void remove_hashtab_entry(epvector::const_iterator element);
-       void move_hashtab_entry(epvector::const_iterator oldpos,
-                               epvector::iterator newpos);
-       void sorted_insert(epplist & eppl, epvector::const_iterator elem);
-       void build_hashtab_and_combine(epvector::iterator & first_numeric,
-                                      epvector::iterator & last_non_zero,
-                                      vector<bool> & touched,
-                                      unsigned & number_of_zeroes);
-       void drop_coeff_0_terms(epvector::iterator & first_numeric,
-                               epvector::iterator & last_non_zero,
-                               vector<bool> & touched,
-                               unsigned & number_of_zeroes);
-       bool has_coeff_0() const;
-       void add_numerics_to_hashtab(epvector::iterator first_numeric,
-                                    epvector::const_iterator last_non_zero);
-#endif // EXPAIRSEQ_USE_HASHTAB
        bool is_canonical() const;
        std::auto_ptr<epvector> expandchildren(unsigned options) const;
        std::auto_ptr<epvector> evalchildren(int level) const;
@@ -162,20 +132,12 @@ protected:
 protected:
        epvector seq;
        ex overall_coeff;
-#if EXPAIRSEQ_USE_HASHTAB
-       epplistvector hashtab;
-       unsigned hashtabsize;
-       unsigned hashmask;
-       static unsigned maxhashtabsize;
-       static unsigned minhashtabsize;
-       static unsigned hashtabfactor;
-#endif // EXPAIRSEQ_USE_HASHTAB
 };
 
 /** Class to handle the renaming of dummy indices. It holds a vector of
- *  indices that are being used in the expression so-far. If the same
+ *  indices that are being used in the expression so far. If the same
  *  index occurs again as a dummy index in a factor, it is to be renamed.
- *  Unless dummy index renaming was swichted of, of course ;-) . */
+ *  Unless dummy index renaming was switched off, of course ;-) . */
 class make_flat_inserter
 {
        public:
@@ -228,4 +190,4 @@ class make_flat_inserter
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_EXPAIRSEQ_H__
+#endif // ndef GINAC_EXPAIRSEQ_H