* Interface to symbolic matrices */
/*
- * GiNaC Copyright (C) 1999-2006 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
* 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 <vector>
-#include <string>
#include "basic.h"
#include "ex.h"
+#include "archive.h"
+#include "compiler.h"
-namespace GiNaC {
-
-
-/** Helper template to allow initialization of matrices via an overloaded
- * comma operator (idea stolen from Blitz++). */
-template <typename T, typename It>
-class matrix_init {
-public:
- matrix_init(It i) : iter(i) {}
-
- matrix_init<T, It> operator,(const T & x)
- {
- *iter = x;
- return matrix_init<T, It>(++iter);
- }
-
- // The following specializations produce much tighter code than the
- // general case above
-
- matrix_init<T, It> operator,(int x)
- {
- *iter = T(x);
- return matrix_init<T, It>(++iter);
- }
-
- matrix_init<T, It> operator,(unsigned int x)
- {
- *iter = T(x);
- return matrix_init<T, It>(++iter);
- }
-
- matrix_init<T, It> operator,(long x)
- {
- *iter = T(x);
- return matrix_init<T, It>(++iter);
- }
-
- matrix_init<T, It> operator,(unsigned long x)
- {
- *iter = T(x);
- return matrix_init<T, It>(++iter);
- }
-
- matrix_init<T, It> operator,(double x)
- {
- *iter = T(x);
- return matrix_init<T, It>(++iter);
- }
-
- matrix_init<T, It> operator,(const symbol & x)
- {
- *iter = T(x);
- return matrix_init<T, It>(++iter);
- }
-
-private:
- matrix_init();
- It iter;
-};
+#include <string>
+#include <vector>
+namespace GiNaC {
/** Symbolic matrices. */
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<std::initializer_list<ex>> l);
- // First step of initialization of matrix with a comma-separated seqeuence
- // of expressions. Subsequent steps are handled by matrix_init<>::operator,().
- matrix_init<ex, exvector::iterator> operator=(const ex & x)
- {
- m[0] = x;
- return matrix_init<ex, exvector::iterator>(++m.begin());
- }
-
+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 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:
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;
unsigned col; ///< number of columns
exvector m; ///< representation (cols indexed first)
};
-
+GINAC_DECLARE_UNARCHIVER(matrix);
// wrapper functions around member functions
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(); }
{ 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
/** Convert list of diagonal elements to matrix. */
extern ex diag_matrix(const lst & l);
+extern ex diag_matrix(std::initializer_list<ex> l);
/** Create an r times c unit matrix. */
extern ex unit_matrix(unsigned r, unsigned c);
} // namespace GiNaC
-#endif // ndef __GINAC_MATRIX_H__
+#endif // ndef GINAC_MATRIX_H
git://www.ginac.de / ginac.git / blobdiff