Index renaming issues, sped up simplify_indexed, used defined NC-objects

[ginac.git] / ginac / indexed.h

diff --git a/ginac/indexed.h b/ginac/indexed.h
index 06d36c717f5617f2d63f43a3640c33bda8370568..1ce81945b432cdc40f0537a7699eb35441043eb8 100644 (file)
--- a/ginac/indexed.h
+++ b/ginac/indexed.h
@@ -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__
@@ -153,7 +153,8 @@ protected:
        ex derivative(const symbol & s) const;
        ex thiscontainer(const exvector & v) const;
        ex thiscontainer(std::auto_ptr<exvector> vp) const;
-       unsigned return_type() const { return return_types::commutative; }
+       unsigned return_type() const;
+       unsigned 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
@@ -250,6 +251,26 @@ 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);
+
+/** 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);
+
+/** This function returns the given expression with expanded sums
+ *  for all dummy index summations, where the dimensionality of 
+ *  the dummy index is numeric.
+ *  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
 
 #endif // ndef __GINAC_INDEXED_H__