X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Fexam_matrices.cpp;h=3daee77ea66d7d34c8b3dc7305227b0d0434f1b2;hp=cf7649266598e94d2e43713076d4ec8e723dbe4d;hb=270969d036bd27a8454442501f8eb241fa66c9b2;hpb=e39e83acafe16854ac052f3e3dca25943a4083a8

diff --git a/check/exam_matrices.cpp b/check/exam_matrices.cpp
index cf764926..3daee77e 100644
--- a/check/exam_matrices.cpp
+++ b/check/exam_matrices.cpp
@@ -3,7 +3,7 @@
  *  Here we examine manipulations on GiNaC's symbolic matrices. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2005 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
@@ -17,13 +17,13 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <stdexcept>
 #include "exams.h"
 
-static unsigned matrix_determinants(void)
+static unsigned matrix_determinants()
 {
 	unsigned result = 0;
 	ex det;
@@ -110,7 +110,7 @@ static unsigned matrix_determinants(void)
 	return result;
 }
 
-static unsigned matrix_invert1(void)
+static unsigned matrix_invert1()
 {
 	unsigned result = 0;
 	matrix m(1,1);
@@ -128,7 +128,7 @@ static unsigned matrix_invert1(void)
 	return result;
 }
 
-static unsigned matrix_invert2(void)
+static unsigned matrix_invert2()
 {
 	unsigned result = 0;
 	matrix m(2,2);
@@ -150,7 +150,7 @@ static unsigned matrix_invert2(void)
 	return result;
 }
 
-static unsigned matrix_invert3(void)
+static unsigned matrix_invert3()
 {
 	unsigned result = 0;
 	matrix m(3,3);
@@ -180,7 +180,7 @@ static unsigned matrix_invert3(void)
 	return result;
 }
 
-static unsigned matrix_solve2(void)
+static unsigned matrix_solve2()
 {
 	// check the solution of the multiple system A*X = B:
 	//	 [ 1  2 -1 ] [ x0 y0 ]   [ 4 0 ]
@@ -216,7 +216,7 @@ static unsigned matrix_solve2(void)
 	return result;
 }
 
-static unsigned matrix_evalm(void)
+static unsigned matrix_evalm()
 {
 	unsigned result = 0;
 
@@ -241,7 +241,47 @@ static unsigned matrix_evalm(void)
 	return result;
 }
 
-static unsigned matrix_misc(void)
+static unsigned matrix_rank()
+{
+	unsigned result = 0;
+	symbol x("x"), y("y");
+	matrix m(3,3);
+
+	// the zero matrix always has rank 0
+	if (m.rank() != 0) {
+		clog << "The rank of " << m << " was not computed correctly." << endl;
+		++result;
+	}
+
+	// a trivial rank one example
+	m = 1, 0, 0,
+	    2, 0, 0,
+	    3, 0, 0;
+	if (m.rank() != 1) {
+		clog << "The rank of " << m << " was not computed correctly." << endl;
+		++result;
+	}
+
+	// an example from Maple's help with rank two
+	m = x,  1,  0,
+	    0,  0,  1,
+	   x*y, y,  1;
+	if (m.rank() != 2) {
+		clog << "The rank of " << m << " was not computed correctly." << endl;
+		++result;
+	}
+
+	// the 3x3 unit matrix has rank 3
+	m = ex_to<matrix>(unit_matrix(3,3));
+	if (m.rank() != 3) {
+		clog << "The rank of " << m << " was not computed correctly." << endl;
+		++result;
+	}
+
+	return result;	
+}
+
+static unsigned matrix_misc()
 {
 	unsigned result = 0;
 	matrix m1(2,2);
@@ -292,7 +332,7 @@ static unsigned matrix_misc(void)
 	return result;
 }
 
-unsigned exam_matrices(void)
+unsigned exam_matrices()
 {
 	unsigned result = 0;
 	
@@ -305,6 +345,7 @@ unsigned exam_matrices(void)
 	result += matrix_invert3();  cout << '.' << flush;
 	result += matrix_solve2();  cout << '.' << flush;
 	result += matrix_evalm();  cout << "." << flush;
+	result += matrix_rank();  cout << "." << flush;
 	result += matrix_misc();  cout << '.' << flush;
 	
 	if (!result) {