X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fmatrix.h;h=edb4adb78ec6214d36f4852dd775d502b8ce9e07;hp=e611aa5b022e30b3a93d48a27042fbb694303033;hb=21393e73f6efc47b6a66a516bb94285625059c3a;hpb=9413cd14faaf2980de3884915e22a5beda068ecc

diff --git a/ginac/matrix.h b/ginac/matrix.h
index e611aa5b..edb4adb7 100644
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -3,7 +3,7 @@
  *  Interface to symbolic matrices */
 
 /*
- *  GiNaC Copyright (C) 1999-2016 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
@@ -102,7 +102,7 @@ public:
 	matrix(unsigned r, unsigned c, const lst & l);
 	matrix(std::initializer_list<std::initializer_list<ex>> l);
 
-	matrix_init<ex, exvector::iterator> operator=(const ex & x) deprecated;
+	matrix_init<ex, exvector::iterator> operator=(const ex & x) attribute_deprecated;
 protected:
 	matrix(unsigned r, unsigned c, const exvector & m2);
 	matrix(unsigned r, unsigned c, exvector && m2);
@@ -149,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<unsigned> 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<unsigned> 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;
@@ -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