- ++version_major.

[ginac.git] / ginac / matrix.h

diff --git a/ginac/matrix.h b/ginac/matrix.h
index c04a592e3aa8a204debb5476da58d2485d75de48..4a267885a8ef0bc85721661328e2ace1deb257ee 100644 (file)
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -27,32 +27,34 @@
 #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);
-   
+       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 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:
        unsigned return_type(void) const { return return_types::noncommutative; };
        // new virtual functions which can be overridden by derived classes
@@ -60,13 +62,16 @@ protected:
        
        // 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);
        matrix transpose(void) const;
@@ -85,10 +90,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)
 };
 
 
@@ -100,9 +104,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); }
 
@@ -136,10 +137,12 @@ 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);
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_MATRIX_H__