- epsilon*epsilon contractions work

[ginac.git] / ginac / matrix.h

diff --git a/ginac/matrix.h b/ginac/matrix.h
index 4a267885a8ef0bc85721661328e2ace1deb257ee..592137423bf5b0b043c73f70052bc7f10d640a3a 100644 (file)
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -40,25 +40,23 @@ public:
        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(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;
        ex eval(int level=0) const;
-       ex evalf(int level=0) 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:
@@ -73,7 +71,8 @@ public:
        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;
@@ -132,11 +131,20 @@ inline matrix inverse(const matrix & m)
 { return m.inverse(); }
 
 // utility functions
+
+/** Return the matrix object handled by an ex.  Deprecated: use ex_to<matrix>().
+ *  This is unsafe: you need to check the type first. */
 inline const matrix &ex_to_matrix(const ex &e)
 {
        return static_cast<const matrix &>(*e.bp);
 }
 
+/** Specialization of is_exactly_a<matrix>(obj) for matrix objects. */
+template<> inline bool is_exactly_a<matrix>(const basic & obj)
+{
+       return obj.tinfo()==TINFO_matrix;
+}
+
 /** Convert list of lists to matrix. */
 extern ex lst_to_matrix(const lst & l);