added an "options" parameter to simplify_indexed(), for future extensions

diff --git a/ginac/ex.h b/ginac/ex.h
index 9bfa9e990fbdcee80f115f68c335f797019a4c5e..2447c3f268061bd77ab59f58f5f01c21777c5be0 100644 (file)
--- a/ginac/ex.h
+++ b/ginac/ex.h
@@ -189,8 +189,8 @@ public:
 
        // indexed objects
        exvector get_free_indices() const { return bp->get_free_indices(); }
-       ex simplify_indexed() const;
-       ex simplify_indexed(const scalar_products & sp) const;
+       ex simplify_indexed(unsigned options = 0) const;
+       ex simplify_indexed(const scalar_products & sp, unsigned options = 0) const;
 
        // comparison
        int compare(const ex & other) const;
@@ -769,11 +769,11 @@ inline ex series(const ex & thisex, const ex & r, int order, unsigned options =
 inline bool match(const ex & thisex, const ex & pattern, lst & repl_lst)
 { return thisex.match(pattern, repl_lst); }
 
-inline ex simplify_indexed(const ex & thisex)
-{ return thisex.simplify_indexed(); }
+inline ex simplify_indexed(const ex & thisex, unsigned options = 0)
+{ return thisex.simplify_indexed(options); }
 
-inline ex simplify_indexed(const ex & thisex, const scalar_products & sp)
-{ return thisex.simplify_indexed(sp); }
+inline ex simplify_indexed(const ex & thisex, const scalar_products & sp, unsigned options = 0)
+{ return thisex.simplify_indexed(sp, options); }
 
 inline ex symmetrize(const ex & thisex)
 { return thisex.symmetrize(); }

diff --git a/ginac/indexed.cpp b/ginac/indexed.cpp
index 50e3b01b60b83cbd6b77f5d8cfc0175e19c302dc..edbc730037e9f10036e8fbadea2462af57bb85f0 100644 (file)
--- a/ginac/indexed.cpp
+++ b/ginac/indexed.cpp
@@ -1108,7 +1108,7 @@ ex simplify_indexed(const ex & e, exvector & free_indices, exvector & dummy_indi
  *  the free indices in sums are consistent.
  *
  *  @return simplified expression */
-ex ex::simplify_indexed() const
+ex ex::simplify_indexed(unsigned options) const
 {
        exvector free_indices, dummy_indices;
        scalar_products sp;
@@ -1122,7 +1122,7 @@ ex ex::simplify_indexed() const
  *
  *  @param sp Scalar products to be replaced automatically
  *  @return simplified expression */
-ex ex::simplify_indexed(const scalar_products & sp) const
+ex ex::simplify_indexed(const scalar_products & sp, unsigned options) const
 {
        exvector free_indices, dummy_indices;
        return GiNaC::simplify_indexed(*this, free_indices, dummy_indices, sp);