Standard header cleanup.

[ginac.git] / ginac / expairseq.h

diff --git a/ginac/expairseq.h b/ginac/expairseq.h
index fca1e670f10d749fa770b1e10a0938a50bab08e3..9f16572618718a1b9819d9b8b7889db928bc6096 100644 (file)
--- a/ginac/expairseq.h
+++ b/ginac/expairseq.h
@@ -26,29 +26,12 @@
 #include "expair.h"
 #include "indexed.h"
 
-// CINT needs <algorithm> to work properly with <vector> and <list>
-#include <algorithm>
-#include <list>
-#include <memory>
 #include <vector>
 
 namespace GiNaC {
 
-/** 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
-
 typedef std::vector<expair> epvector;       ///< expair-vector
 typedef epvector::iterator epp;             ///< expair-vector pointer
-typedef std::list<epp> epplist;             ///< list of expair-vector pointers
-typedef std::vector<epplist> epplistvector; ///< vector of epplist
 
 /** Complex conjugate every element of an epvector. Returns zero if this
  *  does not change anything. */
@@ -72,7 +55,7 @@ public:
        expairseq(const ex & lh, const ex & rh);
        expairseq(const exvector & v);
        expairseq(const epvector & v, const ex & oc, bool do_index_renaming = false);
-       expairseq(std::auto_ptr<epvector>, const ex & oc, bool do_index_renaming = false);
+       expairseq(epvector && vp, const ex & oc, bool do_index_renaming = false);
        
        // functions overriding virtual functions from base classes
 public:
@@ -99,7 +82,7 @@ protected:
        // new virtual functions which can be overridden by derived classes
 protected:
        virtual ex thisexpairseq(const epvector & v, const ex & oc, bool do_index_renaming = false) const;
-       virtual ex thisexpairseq(std::auto_ptr<epvector> vp, const ex & oc, bool do_index_renaming = false) const;
+       virtual ex thisexpairseq(epvector && vp, const ex & oc, bool do_index_renaming = false) const;
        virtual void printseq(const print_context & c, char delim,
                              unsigned this_precedence,
                              unsigned upper_precedence) const;
@@ -129,55 +112,27 @@ protected:
                                         const ex & e);
        void construct_from_exvector(const exvector & v);
        void construct_from_epvector(const epvector & v, bool do_index_renaming = false);
+       void construct_from_epvector(epvector && v, bool do_index_renaming = false);
        void make_flat(const exvector & v);
        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;
-       std::auto_ptr<epvector> subschildren(const exmap & m, unsigned options = 0) const;
+       epvector expandchildren(unsigned options) const;
+       epvector evalchildren(int level) const;
+       epvector subschildren(const exmap & m, unsigned options = 0) const;
        
 // member variables
        
 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: