X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fmatrix.h;h=eb3c40c674043fb3331b3ee328e91eaea3d20250;hp=f951850c29d30e54db81baa7c0dc759fef090618;hb=74bc832973cda4204e349396c9f4f7d056f16366;hpb=5ef801553eb39aed7bd2df9dd1aff9d752c3ea9d diff --git a/ginac/matrix.h b/ginac/matrix.h index f951850c..eb3c40c6 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-2020 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,16 +17,19 @@ * * 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 { @@ -38,26 +41,34 @@ 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); + +protected: + matrix(unsigned r, unsigned c, const exvector & m2); + matrix(unsigned r, unsigned c, exvector && m2); // functions overriding virtual functions from base classes public: - void print(const print_context & c, unsigned level = 0) const; - 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: @@ -77,16 +88,27 @@ public: matrix transpose() const; ex determinant(unsigned algo = determinant_algo::automatic) const; ex trace() const; - ex charpoly(const symbol & lambda) const; + ex charpoly(const ex & lambda) const; matrix inverse() const; + matrix inverse(unsigned algo) const; matrix solve(const matrix & vars, const matrix & rhs, unsigned algo = solve_algo::automatic) const; + unsigned rank() const; + unsigned rank(unsigned solve_algo) const; + bool is_zero_matrix() const; protected: ex determinant_minor() const; + std::vector echelon_form(unsigned algo, int n); int gauss_elimination(const bool det = false); int division_free_elimination(const bool det = false); int fraction_free_elimination(const bool det = false); + std::vector markowitz_elimination(unsigned n); 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: @@ -94,7 +116,7 @@ protected: unsigned col; ///< number of columns exvector m; ///< representation (cols indexed first) }; - +GINAC_DECLARE_UNARCHIVER(matrix); // wrapper functions around member functions @@ -104,11 +126,8 @@ 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); } +inline ex evalf(const matrix & m) +{ return m.evalf(); } inline unsigned rows(const matrix & m) { return m.rows(); } @@ -125,25 +144,27 @@ 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) -{ return m.inverse(); } +{ return m.inverse(solve_algo::automatic); } +inline matrix inverse(const matrix & m, unsigned algo) +{ return m.inverse(algo); } -// utility functions +inline unsigned rank(const matrix & m) +{ return m.rank(); } +inline unsigned rank(const matrix & m, unsigned solve_algo) +{ return m.rank(solve_algo); } -/** 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); @@ -157,6 +178,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) @@ -164,4 +192,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