X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fmatrix.cpp;h=db5916178ff3617d0513af5e74e7426f99069d5b;hb=b38e42e8ed1d985129d88dd53792e643796fc4d8;hp=cdb875d3aa2c483d6ea00b8acbbd13161a98a4db;hpb=5ef801553eb39aed7bd2df9dd1aff9d752c3ea9d;p=ginac.git

diff --git a/ginac/matrix.cpp b/ginac/matrix.cpp
index cdb875d3..db591617 100644
--- a/ginac/matrix.cpp
+++ b/ginac/matrix.cpp
@@ -37,13 +37,16 @@
 #include "symbol.h"
 #include "operators.h"
 #include "normal.h"
-#include "print.h"
 #include "archive.h"
 #include "utils.h"
 
 namespace GiNaC {
 
-GINAC_IMPLEMENT_REGISTERED_CLASS(matrix, basic)
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(matrix, basic,
+  print_func<print_context>(&matrix::do_print).
+  print_func<print_latex>(&matrix::do_print_latex).
+  print_func<print_tree>(&basic::do_print_tree).
+  print_func<print_python_repr>(&matrix::do_print_python_repr))
 
 //////////
 // default constructor
@@ -134,54 +137,41 @@ DEFAULT_UNARCHIVE(matrix)
 
 // public
 
-void matrix::print(const print_context & c, unsigned level) const
+void matrix::print_elements(const print_context & c, const char *row_start, const char *row_end, const char *row_sep, const char *col_sep) const
 {
-	if (is_a<print_tree>(c)) {
-
-		inherited::print(c, level);
-
-	} else {
-
-		if (is_a<print_python_repr>(c))
-			c.s << class_name() << '(';
-
-		if (is_a<print_latex>(c))
-			c.s << "\\left(\\begin{array}{" << std::string(col,'c') << "}";
-		else
-			c.s << "[";
-
-		for (unsigned ro=0; ro<row; ++ro) {
-			if (!is_a<print_latex>(c))
-				c.s << "[";
-			for (unsigned co=0; co<col; ++co) {
-				m[ro*col+co].print(c);
-				if (co<col-1) {
-					if (is_a<print_latex>(c))
-						c.s << "&";
-					else
-						c.s << ",";
-				} else {
-					if (!is_a<print_latex>(c))
-						c.s << "]";
-				}
-			}
-			if (ro<row-1) {
-				if (is_a<print_latex>(c))
-					c.s << "\\\\";
-				else
-					c.s << ",";
-			}
+	for (unsigned ro=0; ro<row; ++ro) {
+		c.s << row_start;
+		for (unsigned co=0; co<col; ++co) {
+			m[ro*col+co].print(c);
+			if (co < col-1)
+				c.s << col_sep;
+			else
+				c.s << row_end;
 		}
+		if (ro < row-1)
+			c.s << row_sep;
+	}
+}
 
-		if (is_a<print_latex>(c))
-			c.s << "\\end{array}\\right)";
-		else
-			c.s << "]";
+void matrix::do_print(const print_context & c, unsigned level) const
+{
+	c.s << "[";
+	print_elements(c, "[", "]", ",", ",");
+	c.s << "]";
+}
 
-		if (is_a<print_python_repr>(c))
-			c.s << ')';
+void matrix::do_print_latex(const print_latex & c, unsigned level) const
+{
+	c.s << "\\left(\\begin{array}{" << std::string(col,'c') << "}";
+	print_elements(c, "", "", "\\\\", "&");
+	c.s << "\\end{array}\\right)";
+}
 
-	}
+void matrix::do_print_python_repr(const print_python_repr & c, unsigned level) const
+{
+	c.s << class_name() << '(';
+	print_elements(c, "[", "]", ",", ",");
+	c.s << ')';
 }
 
 /** nops is defined to be rows x columns. */
@@ -1388,7 +1378,7 @@ int matrix::fraction_free_elimination(const bool det)
 	tmp_n_it = tmp_n.m.begin();
 	tmp_d_it = tmp_d.m.begin();
 	while (it != itend)
-		*it++ = ((*tmp_n_it++)/(*tmp_d_it++)).subs(srl);
+		*it++ = ((*tmp_n_it++)/(*tmp_d_it++)).subs(srl, subs_options::no_pattern);
 	
 	return sign;
 }