Consider solve_algo::markowitz in automatic elimination algorithm selection.

[ginac.git] / ginac / matrix.h

diff --git a/ginac/matrix.h b/ginac/matrix.h
index 02748413837452a84a50fd42da9162e4791514d9..44351d65885f6f11b755fa08b4476302c05fc087 100644 (file)
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -148,17 +148,20 @@ public:
        ex determinant(unsigned algo = determinant_algo::automatic) const;
        ex trace() const;
        ex charpoly(const ex & lambda) const;
-       matrix inverse() const { return inverse(solve_algo::automatic); }
+       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;
@@ -218,6 +221,8 @@ inline matrix inverse(const matrix & m, unsigned 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