Added complex conjugation methods and GiNaC function "conjugate".

[ginac.git] / ginac / ex.h

diff --git a/ginac/ex.h b/ginac/ex.h
index 9bfa9e990fbdcee80f115f68c335f797019a4c5e..95115a30fbbc6b35375329ca9c5989418d11808b 100644 (file)
--- a/ginac/ex.h
+++ b/ginac/ex.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's light-weight expression handles. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2004 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
@@ -132,6 +132,9 @@ public:
        ex lhs() const;
        ex rhs() const;
 
+       // complex conjugation
+       ex conjugate() const { return bp->conjugate(); }
+
        // pattern matching
        bool has(const ex & pattern) const { return bp->has(pattern); }
        bool find(const ex & pattern, lst & found) const;
@@ -189,8 +192,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 +772,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(); }