Improved dummy index renaming.

[ginac.git] / ginac / expairseq.h

diff --git a/ginac/expairseq.h b/ginac/expairseq.h
index 8edda5ce460ec1479b3d55a701d215c87a80c9ce..1b980cfc5eba2424d07b07af6a52eba8637efcd5 100644 (file)
--- a/ginac/expairseq.h
+++ b/ginac/expairseq.h
@@ -3,7 +3,7 @@
  *  Interface to sequences of expression pairs. */
 
 /*
- *  GiNaC Copyright (C) 1999-2005 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
@@ -70,8 +70,8 @@ class expairseq : public basic
 public:
        expairseq(const ex & lh, const ex & rh);
        expairseq(const exvector & v);
-       expairseq(const epvector & v, const ex & oc);
-       expairseq(std::auto_ptr<epvector>, const ex & oc);
+       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);
        
        // functions overriding virtual functions from base classes
 public:
@@ -86,6 +86,7 @@ public:
        bool match(const ex & pattern, lst & repl_lst) const;
        ex subs(const exmap & m, unsigned options = 0) const;
        ex conjugate() const;
+       bool is_polynomial(const ex & var) const;
 protected:
        bool is_equal_same_type(const basic & other) const;
        unsigned return_type() const;
@@ -94,8 +95,8 @@ protected:
        
        // new virtual functions which can be overridden by derived classes
 protected:
-       virtual ex thisexpairseq(const epvector & v, const ex & oc) const;
-       virtual ex thisexpairseq(std::auto_ptr<epvector> vp, const ex & oc) const;
+       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 void printseq(const print_context & c, char delim,
                              unsigned this_precedence,
                              unsigned upper_precedence) const;
@@ -124,9 +125,9 @@ protected:
        void construct_from_expairseq_ex(const expairseq & s,
                                         const ex & e);
        void construct_from_exvector(const exvector & v);
-       void construct_from_epvector(const epvector & v);
+       void construct_from_epvector(const epvector & v, bool do_index_renaming = false);
        void make_flat(const exvector & v);
-       void make_flat(const epvector & v);
+       void make_flat(const epvector & v, bool do_index_renaming = false);
        void canonicalize();
        void combine_same_terms_sorted_seq();
 #if EXPAIRSEQ_USE_HASHTAB
@@ -170,14 +171,6 @@ protected:
 #endif // EXPAIRSEQ_USE_HASHTAB
 };
 
-// utility functions
-
-/** Specialization of is_exactly_a<expairseq>(obj) for expairseq objects. */
-template<> inline bool is_exactly_a<expairseq>(const basic & obj)
-{
-       return obj.tinfo()==TINFO_expairseq;
-}
-
 } // namespace GiNaC
 
 #endif // ndef __GINAC_EXPAIRSEQ_H__