X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fmatrix.h;h=b1ee32814b926f15d4a90b6387770394d01214ae;hp=759e825ab4ca06c7dedf446a25d325b00e32402e;hb=8cffcdf13d817a47f217f1a1043317d95969e070;hpb=cd0f12f5ce6023812f76d0f6eb40ee83078c2775 diff --git a/ginac/matrix.h b/ginac/matrix.h index 759e825a..b1ee3281 100644 --- a/ginac/matrix.h +++ b/ginac/matrix.h @@ -3,7 +3,7 @@ * Interface to symbolic matrices */ /* - * GiNaC Copyright (C) 1999-2015 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2019 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 @@ -26,6 +26,7 @@ #include "basic.h" #include "ex.h" #include "archive.h" +#include "compiler.h" #include #include @@ -98,40 +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); - // First step of initialization of matrix with a comma-separated sequence - // of expressions. Subsequent steps are handled by matrix_init<>::operator,(). - matrix_init operator=(const ex & x) - { - m[0] = x; - return matrix_init(++m.begin()); - } - + matrix_init operator=(const ex & x) attribute_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; - ex conjugate() const; - ex real_part() const; - ex imag_part() 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; + void archive(archive_node& n) const override; /** Read (a.k.a. deserialize) object from archive. */ - void read_archive(const archive_node& n, lst& syms); + 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: @@ -153,15 +149,19 @@ public: ex trace() 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; @@ -177,6 +177,13 @@ protected: }; 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 @@ -186,11 +193,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(); } @@ -211,10 +215,14 @@ 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); } inline unsigned rank(const matrix & m) { return m.rank(); } +inline unsigned rank(const matrix & m, unsigned solve_algo) +{ return m.rank(solve_algo); } // utility functions @@ -223,6 +231,7 @@ 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);