X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fmatrix.h;h=99c9abc4e4ada9abfa8f3e7f3309010be32d12dc;hp=592137423bf5b0b043c73f70052bc7f10d640a3a;hb=b598ffb2f5826258de9034a9ba29feea6f706d95;hpb=aa6281216091efd92dc5fcc3f96c7189114e80f1

diff --git a/ginac/matrix.h b/ginac/matrix.h
index 59213742..99c9abc4 100644
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -3,7 +3,7 @@
  *  Interface to symbolic matrices */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2003 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
@@ -24,6 +24,7 @@
 #define __GINAC_MATRIX_H__
 
 #include <vector>
+#include <string>
 #include "basic.h"
 #include "ex.h"
 
@@ -34,7 +35,7 @@ class matrix : public basic
 {
 	GINAC_DECLARE_REGISTERED_CLASS(matrix, basic)
 	
-	// other ctors
+	// other constructors
 public:
 	matrix(unsigned r, unsigned c);
 	matrix(unsigned r, unsigned c, const exvector & m2);
@@ -42,13 +43,12 @@ public:
 	
 	// functions overriding virtual functions from base classes
 public:
-	void print(const print_context & c, unsigned level = 0) const;
-	unsigned nops() const;
-	ex op(int i) const;
-	ex & let_op(int i);
+	size_t nops() const;
+	ex op(size_t i) const;
+	ex & let_op(size_t i);
 	ex eval(int level=0) const;
-	ex evalm(void) const {return *this;}
-	ex subs(const lst & ls, const lst & lr, bool no_pattern = false) 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;
@@ -56,13 +56,13 @@ public:
 
 protected:
 	bool match_same_type(const basic & other) const;
-	unsigned return_type(void) const { return return_types::noncommutative; };
+	unsigned return_type() const { return return_types::noncommutative; };
 	
 	// non-virtual functions in this class
 public:
-	unsigned rows(void) const        /// Get number of rows.
+	unsigned rows() const        /// Get number of rows.
 		{ return row; }
-	unsigned cols(void) const        /// Get number of columns.
+	unsigned cols() const        /// Get number of columns.
 		{ return col; }
 	matrix add(const matrix & other) const;
 	matrix sub(const matrix & other) const;
@@ -73,19 +73,24 @@ public:
 	const ex & operator() (unsigned ro, unsigned co) const;
 	ex & operator() (unsigned ro, unsigned co);
 	matrix & set(unsigned ro, unsigned co, const ex & value) { (*this)(ro, co) = value; return *this; }
-	matrix transpose(void) const;
+	matrix transpose() const;
 	ex determinant(unsigned algo = determinant_algo::automatic) const;
-	ex trace(void) const;
+	ex trace() const;
 	ex charpoly(const symbol & lambda) const;
-	matrix inverse(void) const;
+	matrix inverse() const;
 	matrix solve(const matrix & vars, const matrix & rhs,
 	             unsigned algo = solve_algo::automatic) const;
 protected:
-	ex determinant_minor(void) const;
+	ex determinant_minor() const;
 	int gauss_elimination(const bool det = false);
 	int division_free_elimination(const bool det = false);
 	int fraction_free_elimination(const bool det = false);
 	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;
+	void do_print(const print_context & c, unsigned level) const;
+	void do_print_latex(const print_latex & c, unsigned level) const;
+	void do_print_python_repr(const print_python_repr & c, unsigned level) const;
 	
 // member variables
 protected:
@@ -97,7 +102,7 @@ protected:
 
 // wrapper functions around member functions
 
-inline unsigned nops(const matrix & m)
+inline size_t nops(const matrix & m)
 { return m.nops(); }
 
 inline ex expand(const matrix & m, unsigned options = 0)
@@ -132,13 +137,6 @@ inline matrix inverse(const matrix & m)
 
 // utility functions
 
-/** Return the matrix object handled by an ex.  Deprecated: use ex_to<matrix>().
- *  This is unsafe: you need to check the type first. */
-inline const matrix &ex_to_matrix(const ex &e)
-{
-	return static_cast<const matrix &>(*e.bp);
-}
-
 /** Specialization of is_exactly_a<matrix>(obj) for matrix objects. */
 template<> inline bool is_exactly_a<matrix>(const basic & obj)
 {
@@ -151,6 +149,23 @@ extern ex lst_to_matrix(const lst & l);
 /** Convert list of diagonal elements to matrix. */
 extern ex diag_matrix(const lst & l);
 
+/** Create an r times c unit matrix. */
+extern ex unit_matrix(unsigned r, unsigned c);
+
+/** Create a x times x unit matrix. */
+inline ex unit_matrix(unsigned x)
+{ return unit_matrix(x, x); }
+
+/** Create an r times c matrix of newly generated symbols consisting of the
+ *  given base name plus the numeric row/column position of each element.
+ *  The base name for LaTeX output is specified separately. */
+extern ex symbolic_matrix(unsigned r, unsigned c, const std::string & base_name, const std::string & tex_base_name);
+
+/** Create an r times c matrix of newly generated symbols consisting of the
+ *  given base name plus the numeric row/column position of each element. */
+inline ex symbolic_matrix(unsigned r, unsigned c, const std::string & base_name)
+{ return symbolic_matrix(r, c, base_name, base_name); }
+
 } // namespace GiNaC
 
 #endif // ndef __GINAC_MATRIX_H__