Bug in expand_dummy_sum is fixed.

[ginac.git] / ginac / indexed.h

diff --git a/ginac/indexed.h b/ginac/indexed.h
index d798107f8cf31eb23ac272cfb89e136a3e9ac1f0..30719e7c38a80a8e6ffcdf14600288c63ed9912a 100644 (file)
--- a/ginac/indexed.h
+++ b/ginac/indexed.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's indexed expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 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
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef __GINAC_INDEXED_H__
@@ -140,20 +140,23 @@ public:
        // internal constructors
        indexed(const symmetry & symm, const exprseq & es);
        indexed(const symmetry & symm, const exvector & v, bool discardable = false);
-       indexed(const symmetry & symm, exvector * vp); // vp will be deleted
+       indexed(const symmetry & symm, std::auto_ptr<exvector> vp);
 
        // functions overriding virtual functions from base classes
 public:
        unsigned precedence() const {return 55;}
        bool info(unsigned inf) const;
        ex eval(int level = 0) const;
+       ex real_part() const;
+       ex imag_part() const;
        exvector get_free_indices() const;
 
 protected:
        ex derivative(const symbol & s) const;
        ex thiscontainer(const exvector & v) const;
-       ex thiscontainer(exvector * vp) const;
-       unsigned return_type() const { return return_types::commutative; }
+       ex thiscontainer(std::auto_ptr<exvector> vp) const;
+       unsigned return_type() const;
+       tinfo_t return_type_tinfo() const { return op(0).return_type_tinfo(); }
        ex expand(unsigned options = 0) const;
 
        // new virtual functions which can be overridden by derived classes
@@ -172,7 +175,8 @@ public:
        exvector get_dummy_indices() const;
 
        /** Return a vector containing the dummy indices in the contraction with
-        *  another indexed object. */
+        *  another indexed object. This is symmetric: a.get_dummy_indices(b)
+        *  == b.get_dummy_indices(a) */
        exvector get_dummy_indices(const indexed & other) const;
 
        /** Check whether the object has an index that forms a dummy index pair
@@ -243,11 +247,37 @@ protected:
 
 // utility functions
 
-/** Specialization of is_exactly_a<indexed>(obj) for indexed objects. */
-template<> inline bool is_exactly_a<indexed>(const basic & obj)
-{
-       return obj.tinfo()==TINFO_indexed;
-}
+/** Returns all dummy indices from the expression */
+exvector get_all_dummy_indices(const ex & e);
+
+/** More reliable version of the form. The former assumes that e is an
+  * expanded epxression. */
+exvector get_all_dummy_indices_safely(const ex & e);
+
+/** Returns b with all dummy indices, which are listed in va, renamed 
+ *  if modify_va is set to TRUE all dummy indices of b will be appended to va */
+ex rename_dummy_indices_uniquely(exvector & va, const ex & b, bool modify_va = false);
+
+/** Returns b with all dummy indices, which are common with a, renamed */
+ex rename_dummy_indices_uniquely(const ex & a, const ex & b);
+
+/** Same as above, where va and vb contain the indices of a and b and are sorted */
+ex rename_dummy_indices_uniquely(const exvector & va, const exvector & vb, const ex & b);
+
+/** Similar to above, where va and vb are the same and the return value is a list of two lists 
+ *  for substitution in b */
+lst rename_dummy_indices_uniquely(const exvector & va, const exvector & vb);
+
+/** This function returns the given expression with expanded sums
+ *  for all dummy index summations, where the dimensionality of 
+ *  the dummy index is a nonnegative integer.
+ *  Optionally all indices with a variance will be substituted by 
+ *  indices with the corresponding numeric values without variance.
+ *
+ *  @param e the given expression
+ *  @param subs_idx indicates if variance of dummy indixes should be neglected
+ */
+ex expand_dummy_sum(const ex & e, bool subs_idx = false);
 
 } // namespace GiNaC