X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginac%2Findexed.h;h=222107081ca3cbeb5449ddf2a11d49f1196aee90;hb=276f1bc79bd0f41a12fb45ece6c7857e13c6668e;hp=b15ed8b30ec892975e322178fb6f32da7f0b222a;hpb=094911eb78cacb6f2877a70c9ac74766df58ccea;p=ginac.git

diff --git a/ginac/indexed.h b/ginac/indexed.h
index b15ed8b3..22210708 100644
--- a/ginac/indexed.h
+++ b/ginac/indexed.h
@@ -31,6 +31,7 @@ namespace GiNaC {
 
 
 class scalar_products;
+class symmetry;
 
 /** This class holds an indexed expression. It consists of a 'base' expression
  *  (the expression being indexed) which can be accessed as op(0), and n (n >= 0)
@@ -39,18 +40,8 @@ class indexed : public exprseq
 {
 	GINAC_DECLARE_REGISTERED_CLASS(indexed, exprseq)
 
-	friend ex simplify_indexed(const ex & e, exvector & free_indices, const scalar_products & sp);
-	friend ex simplify_indexed_product(const ex & e, exvector & free_indices, const scalar_products & sp);
-
-	// types
-public:
-	/** Type of symmetry of the object with respect to commutation of its indices. */
-	typedef enum {
-		unknown,       /**< symmetry properties unknown */
-		symmetric,     /**< totally symmetric */
-		antisymmetric, /**< totally antisymmetric */
-		mixed          /**< mixed symmetry (unimplemented) */
-	} symmetry_type;
+	friend ex simplify_indexed(const ex & e, exvector & free_indices, exvector & dummy_indices, const scalar_products & sp);
+	friend ex simplify_indexed_product(const ex & e, exvector & free_indices, exvector & dummy_indices, const scalar_products & sp);
 
 	// other constructors
 public:
@@ -102,7 +93,7 @@ public:
 	 *  @param i1 First index
 	 *  @param i2 Second index
 	 *  @return newly constructed indexed object */
-	indexed(const ex & b, symmetry_type symm, const ex & i1, const ex & i2);
+	indexed(const ex & b, const symmetry & symm, const ex & i1, const ex & i2);
 
 	/** Construct indexed object with three indices and a specified symmetry.
 	 *  The indices must be of class idx.
@@ -113,7 +104,7 @@ public:
 	 *  @param i2 Second index
 	 *  @param i3 Third index
 	 *  @return newly constructed indexed object */
-	indexed(const ex & b, symmetry_type symm, const ex & i1, const ex & i2, const ex & i3);
+	indexed(const ex & b, const symmetry & symm, const ex & i1, const ex & i2, const ex & i3);
 
 	/** Construct indexed object with four indices and a specified symmetry. The
 	 *  indices must be of class idx.
@@ -125,7 +116,7 @@ public:
 	 *  @param i3 Third index
 	 *  @param i4 Fourth index
 	 *  @return newly constructed indexed object */
-	indexed(const ex & b, symmetry_type symm, const ex & i1, const ex & i2, const ex & i3, const ex & i4);
+	indexed(const ex & b, const symmetry & symm, const ex & i1, const ex & i2, const ex & i3, const ex & i4);
 
 	/** Construct indexed object with a specified vector of indices. The indices
 	 *  must be of class idx.
@@ -142,20 +133,21 @@ public:
 	 *  @param symm Symmetry of indices
 	 *  @param iv Vector of indices
 	 *  @return newly constructed indexed object */
-	indexed(const ex & b, symmetry_type symm, const exvector & iv);
+	indexed(const ex & b, const symmetry & symm, const exvector & iv);
 
 	// internal constructors
-	indexed(symmetry_type symm, const exprseq & es);
-	indexed(symmetry_type symm, const exvector & v, bool discardable = false);
-	indexed(symmetry_type symm, exvector * vp); // vp will be deleted
+	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
 
 	// functions overriding virtual functions from base classes
 public:
-	void printraw(std::ostream & os) const;
-	void printtree(std::ostream & os, unsigned indent) const;
-	void print(std::ostream & os, unsigned upper_precedence=0) const;
+	void print(const print_context & c, unsigned level = 0) const;
 	bool info(unsigned inf) const;
 	ex eval(int level = 0) const;
+	int degree(const ex & s) const;
+	int ldegree(const ex & s) const;
+	ex coeff(const ex & s, int n = 1) const;
 	exvector get_free_indices(void) const;
 
 protected:
@@ -173,15 +165,30 @@ public:
 	 *  @see class info_flags */
 	bool all_index_values_are(unsigned inf) const;
 
+	/** Return a vector containing the object's indices. */
+	exvector get_indices(void) const;
+
+	/** Return a vector containing the dummy indices of the object, if any. */
+	exvector get_dummy_indices(void) const;
+
+	/** Return a vector containing the dummy indices in the contraction with
+	 *  another indexed object. */
+	exvector get_dummy_indices(const indexed & other) const;
+
+	/** Check whether the object has an index that forms a dummy index pair
+	 *  with a given index. */
+	bool has_dummy_index_for(const ex & i) const;
+
+	/** Return symmetry properties. */
+	ex get_symmetry(void) const {return symtree;}
+
 protected:
-	void printrawindices(std::ostream & os) const;
-	void printtreeindices(std::ostream & os, unsigned indent) const;
-	void printindices(std::ostream & os) const;
-	bool all_indices_of_type_idx(void) const;
+	void printindices(const print_context & c, unsigned level) const;
+	void validate(void) const;
 
 	// member variables
 protected:
-	symmetry_type symmetry; /**< Index symmetry */
+	ex symtree; /**< Index symmetry (tree of symmetry objects) */
 };
 
 
@@ -206,6 +213,11 @@ public:
 	/** Register scalar product pair and its value. */
 	void add(const ex & v1, const ex & v2, const ex & sp);
 
+	/** Register list of vectors. This adds all possible pairs of products
+	 *  a.i * b.i with the value a*b (note that this is not a scalar vector
+	 *  product but an ordinary product of scalars). */
+	void add_vectors(const lst & l);
+
 	/** Clear all registered scalar products. */
 	void clear(void);
 
@@ -226,26 +238,6 @@ inline const indexed &ex_to_indexed(const ex &e)
 	return static_cast<const indexed &>(*e.bp);
 }
 
-
-/** Simplify/canonicalize expression containing indexed objects. This
- *  performs contraction of dummy indices where possible and checks whether
- *  the free indices in sums are consistent.
- *
- *  @param e The expression to be simplified
- *  @return simplified expression */
-ex simplify_indexed(const ex & e);
-
-/** Simplify/canonicalize expression containing indexed objects. This
- *  performs contraction of dummy indices where possible, checks whether
- *  the free indices in sums are consistent, and automatically replaces
- *  scalar products by known values if desired.
- *
- *  @param e The expression to be simplified
- *  @param sp Scalar products to be replaced automatically
- *  @return simplified expression */
-ex simplify_indexed(const ex & e, const scalar_products & sp);
-
-
 } // namespace GiNaC
 
 #endif // ndef __GINAC_INDEXED_H__