X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Fcheck_matrices.cpp;h=1ffcb74fea155138cba2c9ff42aa7001bd894e31;hp=deb00471a8a0367867f1deb0eabcb56bf2063251;hb=e9350141809e90921b793ef0e5ee2ece71c96fad;hpb=1f5afe37b4c079821de9810435fa9fa11e4ea17b

diff --git a/check/check_matrices.cpp b/check/check_matrices.cpp
index deb00471..1ffcb74f 100644
--- a/check/check_matrices.cpp
+++ b/check/check_matrices.cpp
@@ -1,9 +1,11 @@
 /** @file check_matrices.cpp
  *
- *  Here we test manipulations on GiNaC's symbolic matrices. */
+ *  Here we test manipulations on GiNaC's symbolic matrices.  They are a
+ *  well-tried resource for cross-checking the underlying symbolic
+ *  manipulations. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2015 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,19 +19,31 @@
  *
  *  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 "checks.h"
+#include "ginac.h"
+using namespace GiNaC;
+
+#include <cstdlib> // for rand(), RAND_MAX
+#include <iostream>
+using namespace std;
+
+extern const ex 
+sparse_tree(const symbol & x, const symbol & y, const symbol & z,
+	    int level, bool trig = false, bool rational = true,
+	    bool complex = false);
+extern const ex 
+dense_univariate_poly(const symbol & x, unsigned degree);
 
 /* determinants of some sparse symbolic matrices with coefficients in
  * an integral domain. */
-static unsigned integdom_matrix_determinants(void)
+static unsigned integdom_matrix_determinants()
 {
 	unsigned result = 0;
 	symbol a("a");
 	
-	for (unsigned size=3; size<20; ++size) {
+	for (unsigned size=3; size<22; ++size) {
 		matrix A(size,size);
 		// populate one element in each row:
 		for (unsigned r=0; r<size-1; ++r)
@@ -51,12 +65,12 @@ static unsigned integdom_matrix_determinants(void)
 
 /* determinants of some symbolic matrices with multivariate rational function
  * coefficients. */
-static unsigned rational_matrix_determinants(void)
+static unsigned rational_matrix_determinants()
 {
 	unsigned result = 0;
 	symbol a("a"), b("b"), c("c");
 	
-	for (unsigned size=3; size<8; ++size) {
+	for (unsigned size=3; size<9; ++size) {
 		matrix A(size,size);
 		for (unsigned r=0; r<size-1; ++r) {
 			// populate one or two elements in each row:
@@ -85,12 +99,12 @@ static unsigned rational_matrix_determinants(void)
 }
 
 /* Some quite funny determinants with functions and stuff like that inside. */
-static unsigned funny_matrix_determinants(void)
+static unsigned funny_matrix_determinants()
 {
 	unsigned result = 0;
 	symbol a("a"), b("b"), c("c");
 	
-	for (unsigned size=3; size<7; ++size) {
+	for (unsigned size=3; size<8; ++size) {
 		matrix A(size,size);
 		for (unsigned co=0; co<size-1; ++co) {
 			// populate one or two elements in each row:
@@ -119,12 +133,12 @@ static unsigned funny_matrix_determinants(void)
 }
 
 /* compare results from different determinant algorithms.*/
-static unsigned compare_matrix_determinants(void)
+static unsigned compare_matrix_determinants()
 {
 	unsigned result = 0;
 	symbol a("a");
 	
-	for (unsigned size=2; size<7; ++size) {
+	for (unsigned size=2; size<8; ++size) {
 		matrix A(size,size);
 		for (unsigned co=0; co<size; ++co) {
 			for (unsigned ro=0; ro<size; ++ro) {
@@ -156,12 +170,12 @@ static unsigned compare_matrix_determinants(void)
 	return result;
 }
 
-static unsigned symbolic_matrix_inverse(void)
+static unsigned symbolic_matrix_inverse()
 {
 	unsigned result = 0;
 	symbol a("a"), b("b"), c("c");
 	
-	for (unsigned size=2; size<5; ++size) {
+	for (unsigned size=2; size<6; ++size) {
 		matrix A(size,size);
 		do {
 			for (unsigned co=0; co<size; ++co) {
@@ -193,12 +207,11 @@ static unsigned symbolic_matrix_inverse(void)
 	return result;
 }
 
-unsigned check_matrices(void)
+unsigned check_matrices()
 {
 	unsigned result = 0;
 	
 	cout << "checking symbolic matrix manipulations" << flush;
-	clog << "---------symbolic matrix manipulations:" << endl;
 	
 	result += integdom_matrix_determinants();  cout << '.' << flush;
 	result += rational_matrix_determinants();  cout << '.' << flush;
@@ -206,12 +219,10 @@ unsigned check_matrices(void)
 	result += compare_matrix_determinants();  cout << '.' << flush;
 	result += symbolic_matrix_inverse();  cout << '.' << flush;
 	
-	if (!result) {
-		cout << " passed " << endl;
-		clog << "(no output)" << endl;
-	} else {
-		cout << " failed " << endl;
-	}
-	
 	return result;
 }
+
+int main(int argc, char** argv)
+{
+	return check_matrices();
+}