X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginac%2Fidx.h;h=13004fd4db8359e36d723b63225773a6b1ccff19;hb=b72b6c8a2d0fe1620e9a3dfd94335d3f2eb27bb8;hp=3811a4efe400123bc1d0f63303b87ec36ef3fc7b;hpb=dc9588b89a3f53b0d63b0a80ee7d67a98580c067;p=ginac.git

diff --git a/ginac/idx.h b/ginac/idx.h
index 3811a4ef..13004fd4 100644
--- a/ginac/idx.h
+++ b/ginac/idx.h
@@ -48,16 +48,17 @@ public:
 
 	// functions overriding virtual functions from base classes
 public:
-	void print(const print_context & c, unsigned level = 0) const;
 	bool info(unsigned inf) const;
-	unsigned nops() const;
-	ex & let_op(int i);
+	size_t nops() const;
+	ex op(size_t i) const;
+	ex map(map_function & f) const;
 	ex evalf(int level = 0) const;
-	ex subs(const lst & ls, const lst & lr, bool no_pattern = false) const;
+	ex subs(const exmap & m, unsigned options = 0) const;
 
 protected:
 	ex derivative(const symbol & s) const;
 	bool match_same_type(const basic & other) const;
+	unsigned calchash() const;
 
 	// new virtual functions in this class
 public:
@@ -68,22 +69,22 @@ public:
 	// non-virtual functions in this class
 public:
 	/** Get value of index. */
-	ex get_value(void) const {return value;}
+	ex get_value() const {return value;}
 
 	/** Check whether the index is numeric. */
-	bool is_numeric(void) const {return is_exactly_a<numeric>(value);}
+	bool is_numeric() const {return is_exactly_a<numeric>(value);}
 
 	/** Check whether the index is symbolic. */
-	bool is_symbolic(void) const {return !is_exactly_a<numeric>(value);}
+	bool is_symbolic() const {return !is_exactly_a<numeric>(value);}
 
 	/** Get dimension of index space. */
-	ex get_dim(void) const {return dim;}
+	ex get_dim() const {return dim;}
 
 	/** Check whether the dimension is numeric. */
-	bool is_dim_numeric(void) const {return is_exactly_a<numeric>(dim);}
+	bool is_dim_numeric() const {return is_exactly_a<numeric>(dim);}
 
 	/** Check whether the dimension is symbolic. */
-	bool is_dim_symbolic(void) const {return !is_exactly_a<numeric>(dim);}
+	bool is_dim_symbolic() const {return !is_exactly_a<numeric>(dim);}
 
 	/** Make a new index with the same value but a different dimension. */
 	ex replace_dim(const ex & new_dim) const;
@@ -92,6 +93,12 @@ public:
 	 *  If this is undecidable, throw an exception. */
 	ex minimal_dim(const idx & other) const;
 
+protected:
+	void print_index(const print_context & c, unsigned level) const;
+	void do_print(const print_context & c, unsigned level) const;
+	void do_print_latex(const print_latex & c, unsigned level) const;
+	void do_print_tree(const print_tree & c, unsigned level) const;
+
 protected:
 	ex value; /**< Expression that constitutes the index (numeric or symbolic name) */
 	ex dim;   /**< Dimension of space (can be symbolic or numeric) */
@@ -116,7 +123,6 @@ public:
 
 	// functions overriding virtual functions from base classes
 public:
-	void print(const print_context & c, unsigned level = 0) const;
 	bool is_dummy_pair_same_type(const basic & other) const;
 
 protected:
@@ -125,13 +131,17 @@ protected:
 	// non-virtual functions in this class
 public:
 	/** Check whether the index is covariant. */
-	bool is_covariant(void) const {return covariant;}
+	bool is_covariant() const {return covariant;}
 
 	/** Check whether the index is contravariant (not covariant). */
-	bool is_contravariant(void) const {return !covariant;}
+	bool is_contravariant() const {return !covariant;}
 
 	/** Make a new index with the same value but the opposite variance. */
-	ex toggle_variance(void) const;
+	ex toggle_variance() const;
+
+protected:
+	void do_print(const print_context & c, unsigned level) const;
+	void do_print_tree(const print_tree & c, unsigned level) const;
 
 	// member variables
 protected:
@@ -161,7 +171,6 @@ public:
 
 	// functions overriding virtual functions from base classes
 public:
-	void print(const print_context & c, unsigned level = 0) const;
 	bool is_dummy_pair_same_type(const basic & other) const;
 
 protected:
@@ -170,18 +179,23 @@ protected:
 	// non-virtual functions in this class
 public:
 	/** Check whether the index is dotted. */
-	bool is_dotted(void) const {return dotted;}
+	bool is_dotted() const {return dotted;}
 
 	/** Check whether the index is not dotted. */
-	bool is_undotted(void) const {return !dotted;}
+	bool is_undotted() const {return !dotted;}
 
 	/** Make a new index with the same value and variance but the opposite
 	 *  dottedness. */
-	ex toggle_dot(void) const;
+	ex toggle_dot() const;
 
 	/** Make a new index with the same value but opposite variance and
 	 *  dottedness. */
-	ex toggle_variance_dot(void) const;
+	ex toggle_variance_dot() const;
+
+protected:
+	void do_print(const print_context & c, unsigned level) const;
+	void do_print_latex(const print_latex & c, unsigned level) const;
+	void do_print_tree(const print_tree & c, unsigned level) const;
 
 	// member variables
 protected:
@@ -248,7 +262,7 @@ inline void find_dummy_indices(const exvector & v, exvector & out_dummy)
 }
 
 /** Count the number of dummy index pairs in an index vector. */
-inline unsigned count_dummy_indices(const exvector & v)
+inline size_t count_dummy_indices(const exvector & v)
 {
 	exvector free_indices, dummy_indices;
 	find_free_and_dummy(v.begin(), v.end(), free_indices, dummy_indices);
@@ -256,7 +270,7 @@ inline unsigned count_dummy_indices(const exvector & v)
 }
 
 /** Count the number of dummy index pairs in an index vector. */
-inline unsigned count_free_indices(const exvector & v)
+inline size_t count_free_indices(const exvector & v)
 {
 	exvector free_indices, dummy_indices;
 	find_free_and_dummy(v.begin(), v.end(), free_indices, dummy_indices);