* Oops, forgot to cvs add the two new files in last commit.

[ginac.git] / ginac / matrix.h

diff --git a/ginac/matrix.h b/ginac/matrix.h
index 4dc2ee0584e1cad9c78fcf3752700093da75e305..36e7284650986db7cc58052806a1733cc771aed2 100644 (file)
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -35,7 +35,7 @@ class matrix : public basic
 {
        GINAC_DECLARE_REGISTERED_CLASS(matrix, basic)
        
-       // other ctors
+       // other constructors
 public:
        matrix(unsigned r, unsigned c);
        matrix(unsigned r, unsigned c, const exvector & m2);
@@ -43,13 +43,12 @@ public:
        
        // 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);
+       size_t nops() const;
+       ex op(size_t i) const;
+       ex & let_op(size_t i);
        ex eval(int level=0) const;
-       ex evalm(void) const {return *this;}
-       ex subs(const lst & ls, const lst & lr, bool no_pattern = false) const;
+       ex evalm() const {return *this;}
+       ex subs(const exmap & m, unsigned options = 0) 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;
@@ -57,13 +56,13 @@ public:
 
 protected:
        bool match_same_type(const basic & other) const;
-       unsigned return_type(void) const { return return_types::noncommutative; };
+       unsigned return_type() const { return return_types::noncommutative; };
        
        // non-virtual functions in this class
 public:
-       unsigned rows(void) const        /// Get number of rows.
+       unsigned rows() const        /// Get number of rows.
                { return row; }
-       unsigned cols(void) const        /// Get number of columns.
+       unsigned cols() const        /// Get number of columns.
                { return col; }
        matrix add(const matrix & other) const;
        matrix sub(const matrix & other) const;
@@ -74,19 +73,24 @@ public:
        const ex & operator() (unsigned ro, unsigned co) const;
        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;
+       matrix transpose() const;
        ex determinant(unsigned algo = determinant_algo::automatic) const;
-       ex trace(void) const;
-       ex charpoly(const symbol & lambda) const;
-       matrix inverse(void) const;
+       ex trace() const;
+       ex charpoly(const ex & lambda) const;
+       matrix inverse() const;
        matrix solve(const matrix & vars, const matrix & rhs,
                     unsigned algo = solve_algo::automatic) const;
 protected:
-       ex determinant_minor(void) const;
+       ex determinant_minor() const;
        int gauss_elimination(const bool det = false);
        int division_free_elimination(const bool det = false);
        int fraction_free_elimination(const bool det = false);
        int pivot(unsigned ro, unsigned co, bool symbolic = true);
+
+       void print_elements(const print_context & c, const char *row_start, const char *row_end, const char *row_sep, const char *col_sep) const;
+       void do_print(const print_context & c, unsigned level) const;
+       void do_print_latex(const print_latex & c, unsigned level) const;
+       void do_print_python_repr(const print_python_repr & c, unsigned level) const;
        
 // member variables
 protected:
@@ -98,7 +102,7 @@ protected:
 
 // wrapper functions around member functions
 
-inline unsigned nops(const matrix & m)
+inline size_t nops(const matrix & m)
 { return m.nops(); }
 
 inline ex expand(const matrix & m, unsigned options = 0)
@@ -125,7 +129,7 @@ inline ex determinant(const matrix & m, unsigned options = determinant_algo::aut
 inline ex trace(const matrix & m)
 { return m.trace(); }
 
-inline ex charpoly(const matrix & m, const symbol & lambda)
+inline ex charpoly(const matrix & m, const ex & lambda)
 { return m.charpoly(lambda); }
 
 inline matrix inverse(const matrix & m)