X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Fcheck_lsolve.cpp;h=d09b6e9dda94fe7b30703256480bb9f1ad8dd753;hp=a964c4b305352012393dad56dbe6b9bead9e752b;hb=HEAD;hpb=0c8c12f5393a7ca5f78233af5ee81593184c35fb

diff --git a/check/check_lsolve.cpp b/check/check_lsolve.cpp
index a964c4b3..8496b45c 100644
--- a/check/check_lsolve.cpp
+++ b/check/check_lsolve.cpp
@@ -1,10 +1,11 @@
 /** @file check_lsolve.cpp
  *
  *  These test routines do some simple checks on solving linear systems of
- *  symbolic equations. */
+ *  symbolic equations.  They are a well-tried resource for cross-checking
+ *  the underlying symbolic manipulations. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2024 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
@@ -18,11 +19,19 @@
  *
  *  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()
+#include <iostream>
 #include <sstream>
+using namespace std;
+
+extern const ex 
+dense_univariate_poly(const symbol & x, unsigned degree);
 
 static unsigned check_matrix_solve(unsigned m, unsigned n, unsigned p,
 								   unsigned degree)
@@ -96,7 +105,7 @@ static unsigned check_inifcns_lsolve(unsigned n)
 {
 	unsigned result = 0;
 	
-	for (int repetition=0; repetition<100; ++repetition) {
+	for (int repetition=0; repetition<200; ++repetition) {
 		// create two size n vectors of symbols, one for the coefficients
 		// a[0],..,a[n], one for indeterminates x[0]..x[n]:
 		vector<symbol> a;
@@ -109,7 +118,6 @@ static unsigned check_inifcns_lsolve(unsigned n)
 		}
 		lst eqns;  // equation list
 		lst vars;  // variable list
-		ex sol;	// solution
 		// Create a random linear system...
 		for (unsigned i=0; i<n; ++i) {
 			ex lhs = rand()%201-100;
@@ -122,32 +130,34 @@ static unsigned check_inifcns_lsolve(unsigned n)
 			eqns.append(lhs==rhs);
 			vars.append(x[i]);
 		}
-		// ...solve it...
-		sol = lsolve(eqns, vars);
-		
-		// ...and check the solution:
-		if (sol.nops() == 0) {
-			// no solution was found
-			// is the coefficient matrix really, really, really degenerate?
-			matrix coeffmat(n,n);
-			for (unsigned ro=0; ro<n; ++ro)
-				for (unsigned co=0; co<n; ++co)
-					coeffmat.set(ro,co,eqns.op(co).rhs().coeff(a[co],1));
-			if (!coeffmat.determinant().is_zero()) {
-				++result;
-				clog << "solution of the system " << eqns << " for " << vars
-					 << " was not found" << endl;
-			}
-		} else {
-			// insert the solution into rhs of out equations
-			bool errorflag = false;
-			for (unsigned i=0; i<n; ++i)
-				if (eqns.op(i).rhs().subs(sol) != eqns.op(i).lhs())
-					errorflag = true;
-			if (errorflag) {
-				++result;
-				clog << "solution of the system " << eqns << " for " << vars
-				     << " erroneously returned " << sol << endl;
+		// ...solve it with each algorithm...
+		for (int algo = solve_algo::automatic; algo <= solve_algo::markowitz; algo++) {
+			ex sol = lsolve(eqns, vars, algo);
+			// ...and check the solution:
+			if (sol.nops() == 0) {
+				// no solution was found
+				// is the coefficient matrix really, really, really degenerate?
+				matrix coeffmat(n,n);
+				for (unsigned ro=0; ro<n; ++ro)
+					for (unsigned co=0; co<n; ++co)
+						coeffmat.set(ro,co,eqns.op(co).rhs().coeff(a[co],1));
+				if (!coeffmat.determinant().is_zero()) {
+					++result;
+					clog << "solution of the system " << eqns << " for " << vars
+					     << " was not found using algorithm " << algo << endl;
+				}
+			} else {
+				// insert the solution into rhs of out equations
+				bool errorflag = false;
+				for (unsigned i=0; i<n; ++i)
+					if (eqns.op(i).rhs().subs(sol) != eqns.op(i).lhs())
+						errorflag = true;
+				if (errorflag) {
+					++result;
+					clog << "solution of the system " << eqns << " for " << vars
+					     << " erroneously returned " << sol << " using algorithm "
+					     << algo << endl;
+				}
 			}
 		}
 	}
@@ -155,31 +165,30 @@ static unsigned check_inifcns_lsolve(unsigned n)
 	return result;
 }
 
-unsigned check_lsolve(void)
+unsigned check_lsolve()
 {
 	unsigned result = 0;
 	
 	cout << "checking linear solve" << flush;
-	clog << "---------linear solve:" << endl;
 	
 	// solve some numeric linear systems
-	for (unsigned n=1; n<12; ++n)
+	for (unsigned n=1; n<14; ++n)
 		result += check_matrix_solve(n, n, 1, 0);
 	cout << '.' << flush;
 	// solve some underdetermined numeric systems
-	for (unsigned n=1; n<12; ++n)
+	for (unsigned n=1; n<14; ++n)
 		result += check_matrix_solve(n+1, n, 1, 0);
 	cout << '.' << flush;
 	// solve some overdetermined numeric systems
-	for (unsigned n=1; n<12; ++n)
+	for (unsigned n=1; n<14; ++n)
 		result += check_matrix_solve(n, n+1, 1, 0);
 	cout << '.' << flush;
 	// solve some multiple numeric systems
-	for (unsigned n=1; n<12; ++n)
+	for (unsigned n=1; n<14; ++n)
 		result += check_matrix_solve(n, n, n/3+1, 0);
 	cout << '.' << flush;
 	// solve some symbolic linear systems
-	for (unsigned n=1; n<7; ++n)
+	for (unsigned n=1; n<8; ++n)
 		result += check_matrix_solve(n, n, 1, 2);
 	cout << '.' << flush;
 	
@@ -190,12 +199,10 @@ unsigned check_lsolve(void)
 	result += check_inifcns_lsolve(5);  cout << '.' << flush;
 	result += check_inifcns_lsolve(6);  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_lsolve();
+}