*
* Interface to symbolic matrices */
-#ifndef _MATRIX_H_
-#define _MATRIX_H_
+/*
+ * GiNaC Copyright (C) 1999-2000 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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
+ */
+#ifndef __GINAC_MATRIX_H__
+#define __GINAC_MATRIX_H__
+
+#include <vector>
#include "basic.h"
#include "ex.h"
-#include <vector>
+
+#ifndef NO_NAMESPACE_GINAC
+namespace GiNaC {
+#endif // ndef NO_NAMESPACE_GINAC
/** Symbolic matrices. */
class matrix : public basic
{
+ GINAC_DECLARE_REGISTERED_CLASS(matrix, basic)
+
// friends
- friend ex determinant_numeric(const matrix & m);
- friend ex determinant_symbolic_perm(const matrix & m);
- friend ex determinant_symbolic_minor(const matrix & m);
+// (none)
// member functions
// default constructor, destructor, copy constructor, assignment operator
public:
matrix();
~matrix();
- matrix(matrix const & other);
- matrix const & operator=(matrix const & other);
+ matrix(const matrix & other);
+ const matrix & operator=(const matrix & other);
protected:
- void copy(matrix const & other);
+ void copy(const matrix & other);
void destroy(bool call_parent);
// other constructors
public:
- matrix(int r, int c);
- matrix(int r, int c, vector<ex> const & m2);
+ matrix(unsigned r, unsigned c);
+ matrix(unsigned r, unsigned c, const exvector & m2);
// functions overriding virtual functions from bases classes
public:
basic * duplicate() const;
- void printraw(ostream & os) const;
void print(ostream & os, unsigned upper_precedence=0) const;
- int nops() const;
- ex & let_op(int const i);
+ void printraw(ostream & os) const;
+ unsigned nops() const;
+ ex op(int i) const;
+ ex & let_op(int i);
ex expand(unsigned options=0) const;
- bool has(ex const & other) const;
+ bool has(const ex & other) const;
ex eval(int level=0) const;
ex evalf(int level=0) const;
- // ex subs(lst const & ls, lst const & lr) const;
+ // ex subs(const lst & ls, const lst & lr) const;
protected:
- int compare_same_type(basic const & other) const;
+ int compare_same_type(const basic & other) const;
unsigned return_type(void) const { return return_types::noncommutative; };
// new virtual functions which can be overridden by derived classes
// (none)
// non-virtual functions in this class
public:
- int rows() const //! get number of rows.
+ unsigned rows(void) const //! get number of rows.
{ return row; }
- int cols() const //! get number of columns.
+ unsigned cols(void) const //! get number of columns.
{ return col; }
- matrix add(matrix const & other) const;
- matrix sub(matrix const & other) const;
- matrix mul(matrix const & other) const;
- ex const & operator() (int ro, int co) const;
- matrix & set(int ro, int co, ex value);
+ matrix add(const matrix & other) const;
+ matrix sub(const matrix & other) const;
+ matrix mul(const matrix & other) const;
+ const ex & operator() (unsigned ro, unsigned co) const;
+ matrix & set(unsigned ro, unsigned co, ex value);
matrix transpose(void) const;
- ex determinant(bool normalized=true) const;
+ ex determinant(void) const;
ex trace(void) const;
- ex charpoly(ex const & lambda) const;
+ ex charpoly(const ex & lambda) const;
matrix inverse(void) const;
- matrix fraction_free_elim(matrix const & vars, matrix const & v) const;
- matrix solve(matrix const & v) const;
+ matrix fraction_free_elim(const matrix & vars, const matrix & v) const;
+ matrix solve(const matrix & vars, const matrix & rhs) const;
+ matrix old_solve(const matrix & v) const; // FIXME: may be removed
protected:
- int pivot(int ro);
- void ffe_swap(int r1, int c1, int r2 ,int c2);
- void ffe_set(int r, int c, ex e);
- ex ffe_get(int r, int c) const;
+ ex determinant_numeric(void) const;
+ ex determinant_minor(void) const;
+ ex determinant_perm(void) const;
+ int gauss_elimination(void);
+ int fraction_free_elimination(void);
+ int pivot(unsigned ro, bool symbolic=true);
+private: // FIXME: these should be obsoleted
+ void ffe_swap(unsigned r1, unsigned c1, unsigned r2 ,unsigned c2);
+ void ffe_set(unsigned r, unsigned c, ex e);
+ ex ffe_get(unsigned r, unsigned c) const;
// member variables
protected:
- int row; /**< number of rows */
- int col; /**< number of columns */
- vector<ex> m; /**< representation (cols indexed first) */
+ unsigned row; /**< number of rows */
+ unsigned col; /**< number of columns */
+ exvector m; /**< representation (cols indexed first) */
static unsigned precedence;
};
// global constants
extern const matrix some_matrix;
-extern type_info const & typeid_matrix;
+extern const type_info & typeid_matrix;
// wrapper functions around member functions
-inline int nops(matrix const & m)
+inline unsigned nops(const matrix & m)
{ return m.nops(); }
-inline ex expand(matrix const & m, unsigned options=0)
+inline ex expand(const matrix & m, unsigned options=0)
{ return m.expand(options); }
-inline bool has(matrix const & m, ex const & other)
+inline bool has(const matrix & m, const ex & other)
{ return m.has(other); }
-inline ex eval(matrix const & m, int level=0)
+inline ex eval(const matrix & m, int level=0)
{ return m.eval(level); }
-inline ex evalf(matrix const & m, int level=0)
+inline ex evalf(const matrix & m, int level=0)
{ return m.evalf(level); }
-inline int rows(matrix const & m)
+inline unsigned rows(const matrix & m)
{ return m.rows(); }
-inline int cols(matrix const & m)
+inline unsigned cols(const matrix & m)
{ return m.cols(); }
-inline matrix transpose(matrix const & m)
+inline matrix transpose(const matrix & m)
{ return m.transpose(); }
-inline ex determinant(matrix const & m, bool normalized=true)
-{ return m.determinant(normalized); }
+inline ex determinant(const matrix & m)
+{ return m.determinant(); }
-inline ex trace(matrix const & m)
+inline ex trace(const matrix & m)
{ return m.trace(); }
-inline ex charpoly(matrix const & m, ex const & lambda)
+inline ex charpoly(const matrix & m, const ex & lambda)
{ return m.charpoly(lambda); }
-inline matrix inverse(matrix const & m)
+inline matrix inverse(const matrix & m)
{ return m.inverse(); }
-// macros
+// utility functions
+inline const matrix &ex_to_matrix(const ex &e)
+{
+ return static_cast<const matrix &>(*e.bp);
+}
-#define ex_to_matrix(X) (static_cast<matrix const &>(*(X).bp))
+#ifndef NO_NAMESPACE_GINAC
+} // namespace GiNaC
+#endif // ndef NO_NAMESPACE_GINAC
-#endif // ndef _MATRIX_H_
+#endif // ndef __GINAC_MATRIX_H__