X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fmatrix.h;h=0e7660b969fcc28d0d905725ac99bf55fad4162a;hp=02203e0507ceec5f3f842230f71dacc2b3dd37bf;hb=71e787d41185b5def2c4dde6809c8420843fca9f;hpb=4e3a4ac2bcb0837611ea31bc8fc05d84a20c33ac

diff --git a/ginac/matrix.h b/ginac/matrix.h
index 02203e05..0e7660b9 100644
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -38,19 +38,22 @@ class matrix : public basic
 public:
 	matrix(unsigned r, unsigned c);
 	matrix(unsigned r, unsigned c, const exvector & m2);
+	matrix(unsigned r, unsigned c, const lst & l);
 	
 	// functions overriding virtual functions from bases classes
 public:
-	void print(std::ostream & os, unsigned upper_precedence=0) const;
-	void printraw(std::ostream & os) const;
+	void print(const print_context & c, unsigned level = 0) const;
 	unsigned nops() const;
 	ex op(int i) const;
 	ex & let_op(int i);
 	ex expand(unsigned options=0) const;
-	bool has(const ex & other) const;
 	ex eval(int level=0) const;
 	ex evalf(int level=0) const;
-	// ex subs(const lst & ls, const lst & lr) const;
+	ex subs(const lst & ls, const lst & lr, bool no_pattern = false) const;
+	ex eval_indexed(const basic & i) const;
+	ex add_indexed(const ex & self, const ex & other) const;
+	ex scalar_mul_indexed(const ex & self, const numeric & other) const;
+	bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const;
 protected:
 	unsigned return_type(void) const { return return_types::noncommutative; };
 	// new virtual functions which can be overridden by derived classes
@@ -65,6 +68,7 @@ public:
 	matrix add(const matrix & other) const;
 	matrix sub(const matrix & other) const;
 	matrix mul(const matrix & other) const;
+	matrix mul(const numeric & other) const;
 	const ex & operator() (unsigned ro, unsigned co) const;
 	matrix & set(unsigned ro, unsigned co, ex value);
 	matrix transpose(void) const;
@@ -86,7 +90,6 @@ protected:
 	unsigned row;             ///< number of rows
 	unsigned col;             ///< number of columns
 	exvector m;               ///< representation (cols indexed first)
-	static unsigned precedence;
 };
 
 
@@ -98,9 +101,6 @@ inline unsigned nops(const matrix & m)
 inline ex expand(const matrix & m, unsigned options = 0)
 { return m.expand(options); }
 
-inline bool has(const matrix & m, const ex & other)
-{ return m.has(other); }
-
 inline ex eval(const matrix & m, int level = 0)
 { return m.eval(level); }
 
@@ -134,7 +134,11 @@ inline const matrix &ex_to_matrix(const ex &e)
 	return static_cast<const matrix &>(*e.bp);
 }
 
-extern ex lst_to_matrix(const ex &l);
+/** Convert list of lists to matrix. */
+extern ex lst_to_matrix(const lst & l);
+
+/** Convert list of diagonal elements to matrix. */
+extern ex diag_matrix(const lst & l);
 
 } // namespace GiNaC