X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginac%2Fmatrix.h;h=5c665dd6fc8e7713a6e5cb49a9c90f12a489cc18;hb=2c8d5b298c5354c32514c4d5e52cfc80e8b32fbd;hp=36e7284650986db7cc58052806a1733cc771aed2;hpb=ff3d5ccc8add5bfe76502479768c89d768df8384;p=ginac.git diff --git a/ginac/matrix.h b/ginac/matrix.h index 36e72846..5c665dd6 100644 --- a/ginac/matrix.h +++ b/ginac/matrix.h @@ -3,7 +3,7 @@ * Interface to symbolic matrices */ /* - * GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2015 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 @@ -17,19 +17,80 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __GINAC_MATRIX_H__ -#define __GINAC_MATRIX_H__ +#ifndef GINAC_MATRIX_H +#define GINAC_MATRIX_H -#include -#include #include "basic.h" #include "ex.h" +#include "archive.h" +#include "compiler.h" + +#include +#include namespace GiNaC { +/** Helper template to allow initialization of matrices via an overloaded + * comma operator (idea stolen from Blitz++). */ +template +class matrix_init { +public: + matrix_init(It i) : iter(i) {} + + matrix_init operator,(const T & x) + { + *iter = x; + return matrix_init(++iter); + } + + // The following specializations produce much tighter code than the + // general case above + + matrix_init operator,(int x) + { + *iter = T(x); + return matrix_init(++iter); + } + + matrix_init operator,(unsigned int x) + { + *iter = T(x); + return matrix_init(++iter); + } + + matrix_init operator,(long x) + { + *iter = T(x); + return matrix_init(++iter); + } + + matrix_init operator,(unsigned long x) + { + *iter = T(x); + return matrix_init(++iter); + } + + matrix_init operator,(double x) + { + *iter = T(x); + return matrix_init(++iter); + } + + matrix_init operator,(const symbol & x) + { + *iter = T(x); + return matrix_init(++iter); + } + +private: + matrix_init(); + It iter; +}; + + /** Symbolic matrices. */ class matrix : public basic { @@ -38,25 +99,35 @@ class matrix : public basic // other constructors public: matrix(unsigned r, unsigned c); - matrix(unsigned r, unsigned c, const exvector & m2); matrix(unsigned r, unsigned c, const lst & l); - + matrix(std::initializer_list> l); + + matrix_init operator=(const ex & x) deprecated; +protected: + matrix(unsigned r, unsigned c, const exvector & m2); + matrix(unsigned r, unsigned c, exvector && m2); // functions overriding virtual functions from base classes public: - size_t nops() const; - ex op(size_t i) const; - ex & let_op(size_t i); - ex eval(int level=0) 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; - bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const; - + size_t nops() const override; + ex op(size_t i) const override; + ex & let_op(size_t i) override; + ex evalm() const override {return *this;} + ex subs(const exmap & m, unsigned options = 0) const override; + ex eval_indexed(const basic & i) const override; + ex add_indexed(const ex & self, const ex & other) const override; + ex scalar_mul_indexed(const ex & self, const numeric & other) const override; + bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const override; + ex conjugate() const override; + ex real_part() const override; + ex imag_part() const override; + + /** Save (a.k.a. serialize) object into archive. */ + void archive(archive_node& n) const override; + /** Read (a.k.a. deserialize) object from archive. */ + void read_archive(const archive_node& n, lst& syms) override; protected: - bool match_same_type(const basic & other) const; - unsigned return_type() const { return return_types::noncommutative; }; + bool match_same_type(const basic & other) const override; + unsigned return_type() const override { return return_types::noncommutative; }; // non-virtual functions in this class public: @@ -80,6 +151,8 @@ public: matrix inverse() const; matrix solve(const matrix & vars, const matrix & rhs, unsigned algo = solve_algo::automatic) const; + unsigned rank() const; + bool is_zero_matrix() const; protected: ex determinant_minor() const; int gauss_elimination(const bool det = false); @@ -98,7 +171,15 @@ protected: unsigned col; ///< number of columns exvector m; ///< representation (cols indexed first) }; +GINAC_DECLARE_UNARCHIVER(matrix); +// First step of initialization of matrix with a comma-separated sequence +// of expressions. Subsequent steps are handled by matrix_init<>::operator,(). +inline matrix_init matrix::operator=(const ex & x) +{ + m[0] = x; + return matrix_init(++m.begin()); +} // wrapper functions around member functions @@ -108,9 +189,6 @@ inline size_t nops(const matrix & m) inline ex expand(const matrix & m, unsigned options = 0) { return m.expand(options); } -inline ex eval(const matrix & m, int level = 0) -{ return m.eval(level); } - inline ex evalf(const matrix & m, int level = 0) { return m.evalf(level); } @@ -135,19 +213,17 @@ inline ex charpoly(const matrix & m, const ex & lambda) inline matrix inverse(const matrix & m) { return m.inverse(); } -// utility functions +inline unsigned rank(const matrix & m) +{ return m.rank(); } -/** Specialization of is_exactly_a(obj) for matrix objects. */ -template<> inline bool is_exactly_a(const basic & obj) -{ - return obj.tinfo()==TINFO_matrix; -} +// utility functions /** 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); +extern ex diag_matrix(std::initializer_list l); /** Create an r times c unit matrix. */ extern ex unit_matrix(unsigned r, unsigned c); @@ -161,6 +237,13 @@ inline ex unit_matrix(unsigned x) * 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); +/** Return the reduced matrix that is formed by deleting the rth row and cth + * column of matrix m. The determinant of the result is the Minor r, c. */ +extern ex reduced_matrix(const matrix& m, unsigned r, unsigned c); + +/** Return the nr times nc submatrix starting at position r, c of matrix m. */ +extern ex sub_matrix(const matrix&m, unsigned r, unsigned nr, unsigned c, unsigned nc); + /** 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) @@ -168,4 +251,4 @@ inline ex symbolic_matrix(unsigned r, unsigned c, const std::string & base_name) } // namespace GiNaC -#endif // ndef __GINAC_MATRIX_H__ +#endif // ndef GINAC_MATRIX_H