X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fmatrix.h;h=4dc2ee0584e1cad9c78fcf3752700093da75e305;hp=e3916e2a66899ff44fd5bfa9905af5f91322185a;hb=166001a94d339fd82e4fa02a2ba6775efe76418b;hpb=9e2d60e206395fc9908e1f9025e50c76b3d7c182 diff --git a/ginac/matrix.h b/ginac/matrix.h index e3916e2a..4dc2ee05 100644 --- a/ginac/matrix.h +++ b/ginac/matrix.h @@ -3,7 +3,7 @@ * Interface to symbolic matrices */ /* - * GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2003 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,68 +24,56 @@ #define __GINAC_MATRIX_H__ #include +#include #include "basic.h" #include "ex.h" -#ifndef NO_NAMESPACE_GINAC namespace GiNaC { -#endif // ndef NO_NAMESPACE_GINAC /** Symbolic matrices. */ class matrix : public basic { GINAC_DECLARE_REGISTERED_CLASS(matrix, basic) - -// friends -// (none) -// member functions - - // default constructor, destructor, copy constructor, assignment operator - // and helpers: -public: - matrix(); - ~matrix(); - matrix(const matrix & other); - const matrix & operator=(const matrix & other); -protected: - void copy(const matrix & other); - void destroy(bool call_parent); - - // other constructors + + // other ctors public: matrix(unsigned r, unsigned c); matrix(unsigned r, unsigned c, const exvector & m2); - - // functions overriding virtual functions from bases classes + matrix(unsigned r, unsigned c, const lst & l); + + // functions overriding virtual functions from base classes public: - basic * duplicate() const; - 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: - int compare_same_type(const basic & other) const; + 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: - unsigned rows(void) const //! Get number of rows. + unsigned rows(void) const /// Get number of rows. { return row; } - unsigned cols(void) const //! Get number of columns. + 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; + 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; @@ -102,18 +90,12 @@ protected: // member variables protected: - unsigned row; /**< number of rows */ - unsigned col; /**< number of columns */ - exvector 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 const std::type_info & typeid_matrix; - - // wrapper functions around member functions inline unsigned nops(const matrix & m) @@ -122,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); } @@ -153,15 +132,36 @@ 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(obj) for matrix objects. */ +template<> inline bool is_exactly_a(const basic & obj) { - return static_cast(*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); + +/** Create an r times c unit matrix. */ +extern ex unit_matrix(unsigned r, unsigned c); + +/** Create a x times x unit matrix. */ +inline ex unit_matrix(unsigned x) +{ return unit_matrix(x, x); } + +/** Create an r times c matrix of newly generated symbols consisting of the + * given base name plus the numeric row/column position of each element. + * The base name for LaTeX output is specified separately. */ +extern ex symbolic_matrix(unsigned r, unsigned c, const std::string & base_name, const std::string & tex_base_name); + +/** Create an r times c matrix of newly generated symbols consisting of the + * given base name plus the numeric row/column position of each element. */ +inline ex symbolic_matrix(unsigned r, unsigned c, const std::string & base_name) +{ return symbolic_matrix(r, c, base_name, base_name); } -#ifndef NO_NAMESPACE_GINAC } // namespace GiNaC -#endif // ndef NO_NAMESPACE_GINAC #endif // ndef __GINAC_MATRIX_H__