fixed a bug where quo() would call vector::reserve() with a negative argument

[ginac.git] / ginac / matrix.h

diff --git a/ginac/matrix.h b/ginac/matrix.h
index 02203e0507ceec5f3f842230f71dacc2b3dd37bf..acc525449dacdb355707f617a982928e4ea443b8 100644 (file)
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -38,23 +38,25 @@ 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
+       // functions overriding virtual functions from base 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:
+       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:
@@ -65,8 +67,12 @@ 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;
+       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;
@@ -86,7 +92,6 @@ protected:
        unsigned row;             ///< number of rows
        unsigned col;             ///< number of columns
        exvector m;               ///< representation (cols indexed first)
-       static unsigned precedence;
 };
 
 
@@ -98,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); }
 
@@ -129,12 +131,18 @@ 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);
 
 } // namespace GiNaC