X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fmatrix.h;h=0e7660b969fcc28d0d905725ac99bf55fad4162a;hp=769647cacdeede3685ec276e804e774c814783b0;hb=0117bd6ef4af029934703940d59e1c70866937b0;hpb=9eab44408b9213d8909b7a9e525f404ad06064dd diff --git a/ginac/matrix.h b/ginac/matrix.h index 769647ca..0e7660b9 100644 --- a/ginac/matrix.h +++ b/ginac/matrix.h @@ -3,7 +3,7 @@ * Interface to symbolic matrices */ /* - * GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,126 +24,108 @@ #define __GINAC_MATRIX_H__ #include -#include -#include +#include "basic.h" +#include "ex.h" namespace GiNaC { /** Symbolic matrices. */ class matrix : public basic { -// friends - friend ex determinant_numeric(const matrix & m); - friend ex determinant_symbolic_perm(const matrix & m); - friend ex determinant_symbolic_minor(const matrix & m); -// member functions - - // default constructor, destructor, copy constructor, assignment operator - // and helpers: + GINAC_DECLARE_REGISTERED_CLASS(matrix, basic) + + // other ctors public: - matrix(); - ~matrix(); - matrix(matrix const & other); - matrix const & operator=(matrix const & other); -protected: - void copy(matrix const & other); - void destroy(bool call_parent); - - // other constructors -public: - matrix(int r, int c); - matrix(int r, int c, vector const & m2); - - // functions overriding virtual functions from bases classes + 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: - basic * duplicate() const; - void printraw(ostream & os) const; - void print(ostream & os, unsigned upper_precedence=0) const; - int nops() const; - ex & let_op(int const i); - ex expand(unsigned options=0) const; - bool has(ex const & other) const; - ex eval(int level=0) const; - ex evalf(int level=0) const; - // ex subs(lst const & ls, lst const & lr) 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; + ex eval(int level=0) const; + ex evalf(int level=0) const; + 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: - int compare_same_type(basic const & 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 + 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: - int rows() const //! get number of rows. - { return row; } - int cols() const //! get number of columns. - { return col; } - matrix add(matrix const & other) const; - matrix sub(matrix const & other) const; - matrix mul(matrix const & other) const; - ex const & operator() (int ro, int co) const; - matrix & set(int ro, int co, ex value); - matrix transpose(void) const; - ex determinant(bool normalized=true) const; - ex trace(void) const; - ex charpoly(ex const & lambda) const; - matrix inverse(void) const; - matrix fraction_free_elim(matrix const & vars, matrix const & v) const; - matrix solve(matrix const & v) const; + unsigned rows(void) const /// Get number of rows. + { return row; } + 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; + const ex & operator() (unsigned ro, unsigned co) const; + matrix & set(unsigned ro, unsigned co, ex value); + matrix transpose(void) const; + ex determinant(unsigned algo = determinant_algo::automatic) const; + ex trace(void) const; + ex charpoly(const symbol & lambda) const; + matrix inverse(void) const; + matrix solve(const matrix & vars, const matrix & rhs, + unsigned algo = solve_algo::automatic) const; protected: - int pivot(int ro); - void ffe_swap(int r1, int c1, int r2 ,int c2); - void ffe_set(int r, int c, ex e); - ex ffe_get(int r, int c) const; - + ex determinant_minor(void) 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); + // member variables protected: - int row; /**< number of rows */ - int col; /**< number of columns */ - vector m; /**< representation (cols indexed first) */ - static unsigned precedence; + unsigned row; ///< number of rows + unsigned col; ///< number of columns + exvector m; ///< representation (cols indexed first) }; -// global constants -extern const matrix some_matrix; -extern type_info const & typeid_matrix; // wrapper functions around member functions -inline int nops(matrix const & m) +inline unsigned nops(const matrix & m) { return m.nops(); } -inline ex expand(matrix const & m, unsigned options=0) +inline ex expand(const matrix & m, unsigned options = 0) { return m.expand(options); } -inline bool has(matrix const & m, ex const & other) -{ return m.has(other); } - -inline ex eval(matrix const & m, int level=0) +inline ex eval(const matrix & m, int level = 0) { return m.eval(level); } -inline ex evalf(matrix const & m, int level=0) +inline ex evalf(const matrix & m, int level = 0) { return m.evalf(level); } -inline int rows(matrix const & m) +inline unsigned rows(const matrix & m) { return m.rows(); } -inline int cols(matrix const & m) +inline unsigned cols(const matrix & m) { return m.cols(); } -inline matrix transpose(matrix const & m) +inline matrix transpose(const matrix & m) { return m.transpose(); } -inline ex determinant(matrix const & m, bool normalized=true) -{ return m.determinant(normalized); } +inline ex determinant(const matrix & m, unsigned options = determinant_algo::automatic) +{ return m.determinant(options); } -inline ex trace(matrix const & m) +inline ex trace(const matrix & m) { return m.trace(); } -inline ex charpoly(matrix const & m, ex const & lambda) +inline ex charpoly(const matrix & m, const symbol & lambda) { return m.charpoly(lambda); } -inline matrix inverse(matrix const & m) +inline matrix inverse(const matrix & m) { return m.inverse(); } // utility functions @@ -152,6 +134,12 @@ inline const matrix &ex_to_matrix(const ex &e) return static_cast(*e.bp); } +/** 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 #endif // ndef __GINAC_MATRIX_H__