- inserted a couple of missing namepace std:: resolutions.

[ginac.git] / ginac / matrix.h

diff --git a/ginac/matrix.h b/ginac/matrix.h
index 5642887150b05b45cea96385f4df8ebb8e93de53..4a267885a8ef0bc85721661328e2ace1deb257ee 100644 (file)
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -49,6 +49,7 @@ public:
        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;
@@ -69,6 +70,8 @@ public:
        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;
@@ -101,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); }