X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=check%2Ftime_vandermonde.cpp;h=fccc1392ab6ee74504344a3dc0f775ea33f1c4d3;hb=e9ae06f2ddceabb66ff93bacc059d6fa0348beee;hp=f878b0b886ddc398355b836d97e694852838e61e;hpb=383d5eb3b0f0506810d9105a268f939125bfc347;p=ginac.git

diff --git a/check/time_vandermonde.cpp b/check/time_vandermonde.cpp
index f878b0b8..fccc1392 100644
--- a/check/time_vandermonde.cpp
+++ b/check/time_vandermonde.cpp
@@ -7,7 +7,7 @@
  */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2007 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
@@ -21,7 +21,7 @@
  *
  *  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 "times.h"
@@ -29,34 +29,39 @@
 static unsigned vandermonde_det(unsigned size)
 {
 	unsigned result = 0;
-	symbol a("a");
-	
+	const symbol a("a");
+
 	// construct Vandermonde matrix:
 	matrix M(size,size);
 	for (unsigned ro=0; ro<size; ++ro) {
 		for (unsigned co=0; co<size; ++co) {
 			if (ro%2)
-				M.set(ro,co,pow(-pow(a,1+ro/2),co));
+				M(ro,co) = pow(-pow(a,1+ro/2),co);
 			else
-				M.set(ro,co,pow(pow(a,1+ro/2),co));
+				M(ro,co) = pow(pow(a,1+ro/2),co);
 		}
 	}
-	
+
 	// compute determinant:
-	ex vdet = M.determinant();
-	
-	// dirty consistency check of result:
-	if (!vdet.subs(a==1).is_zero()) {
+	ex det = M.determinant();
+
+	// check the result:
+	ex vanddet = 1;
+	for (unsigned i=0; i<size; ++i)
+		for (unsigned j=0; j<i; ++j)
+			vanddet *= M(i,1) - M(j,1);
+
+	if (expand(det - vanddet) != 0) {
 		clog << "Determaint of Vandermonde matrix " << endl
 		     << "M==" << M << endl
-		     << "was miscalculated: det(M)==" << vdet << endl;
+		     << "was miscalculated: det(M)==" << det << endl;
 		++result;
 	}
-	
+
 	return result;
 }
 
-unsigned time_vandermonde(void)
+unsigned time_vandermonde()
 {
 	unsigned result = 0;
 	
@@ -67,10 +72,10 @@ unsigned time_vandermonde(void)
 	vector<double> times;
 	timer swatch;
 	
-	sizes.push_back(4);
-	sizes.push_back(6);
 	sizes.push_back(8);
 	sizes.push_back(10);
+	sizes.push_back(12);
+	sizes.push_back(14);
 	
 	for (vector<unsigned>::iterator i=sizes.begin(); i!=sizes.end(); ++i) {
 		int count = 1;
@@ -97,7 +102,7 @@ unsigned time_vandermonde(void)
 		cout << '\t' << *i << 'x' << *i;
 	cout << endl << "	time/s:";
 	for (vector<double>::iterator i=times.begin(); i!=times.end(); ++i)
-		cout << '\t' << int(1000*(*i))*0.001;
+		cout << '\t' << *i;
 	cout << endl;
 	
 	return result;