X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginac%2Fmatrix.h;h=acc525449dacdb355707f617a982928e4ea443b8;hb=8d21b348c9a5ab3445d00c3e797dd7f67153ef45;hp=7c2b9c0178a6627e7d482167c6afbc35e9a48354;hpb=e5362a33f72613b324b3714524a8c2e5f7b7f46f;p=ginac.git

diff --git a/ginac/matrix.h b/ginac/matrix.h
index 7c2b9c01..acc52544 100644
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -27,50 +27,52 @@
 #include "basic.h"
 #include "ex.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 /** Symbolic matrices. */
 class matrix : public basic
 {
 	GINAC_DECLARE_REGISTERED_CLASS(matrix, basic)
-
-	// other constructors
+	
+	// other ctors
 public:
 	matrix(unsigned r, unsigned c);
 	matrix(unsigned r, unsigned c, const exvector & m2);
-   
-	// functions overriding virtual functions from bases classes
+	matrix(unsigned r, unsigned c, const lst & l);
+	
+	// functions overriding virtual functions from base classes
 public:
-	basic * duplicate() const;
-	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 evalm(void) const {return *this;}
+	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:
-	int compare_same_type(const basic & other) const;
+	bool match_same_type(const basic & other) const;
 	unsigned return_type(void) const { return return_types::noncommutative; };
-	// new virtual functions which can be overridden by derived classes
-	// (none)
 	
 	// non-virtual functions in this class
 public:
-	unsigned rows(void) const        //! Get number of rows.
+	unsigned rows(void) const        /// Get number of rows.
 		{ return row; }
-	unsigned cols(void) const        //! Get number of columns.
+	unsigned cols(void) const        /// Get number of columns.
 		{ return col; }
 	matrix add(const matrix & other) const;
 	matrix sub(const matrix & other) const;
 	matrix mul(const matrix & other) const;
+	matrix mul(const numeric & other) const;
+	matrix mul_scalar(const ex & other) const;
+	matrix pow(const ex & expn) const;
 	const ex & operator() (unsigned ro, unsigned co) const;
-	matrix & set(unsigned ro, unsigned co, ex value);
+	ex & operator() (unsigned ro, unsigned co);
+	matrix & set(unsigned ro, unsigned co, const ex & value) { (*this)(ro, co) = value; return *this; }
 	matrix transpose(void) const;
 	ex determinant(unsigned algo = determinant_algo::automatic) const;
 	ex trace(void) const;
@@ -87,10 +89,9 @@ protected:
 	
 // member variables
 protected:
-	unsigned row;             /**< number of rows      */
-	unsigned col;             /**< number of columns   */
-	exvector m;               /**< representation (cols indexed first) */
-	static unsigned precedence;
+	unsigned row;             ///< number of rows
+	unsigned col;             ///< number of columns
+	exvector m;               ///< representation (cols indexed first)
 };
 
 
@@ -102,9 +103,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); }
 
@@ -133,15 +131,19 @@ inline matrix inverse(const matrix & m)
 { return m.inverse(); }
 
 // utility functions
-inline const matrix &ex_to_matrix(const ex &e)
+
+/** Specialization of is_exactly_a<matrix>(obj) for matrix objects. */
+template<> inline bool is_exactly_a<matrix>(const basic & obj)
 {
-	return static_cast<const matrix &>(*e.bp);
+	return obj.tinfo()==TINFO_matrix;
 }
 
-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);
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_MATRIX_H__