X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=check%2Ftime_vandermonde.cpp;h=96de2dea760d1c323316ce122079bc6af5f7355f;hb=55a08d9cb9005bb10def92d5e8f5a816003da16b;hp=33ffd65f3b3ef6962c98de156f5610cef26b552f;hpb=559c3bfd89b822b16708b23af1b0d9af17ededfe;p=ginac.git

diff --git a/check/time_vandermonde.cpp b/check/time_vandermonde.cpp
index 33ffd65f..96de2dea 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-2014 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,10 +21,16 @@
  *
  *  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"
+#include "ginac.h"
+#include "timer.h"
+using namespace GiNaC;
+
+#include <iostream>
+#include <vector>
+using namespace std;
 
 static unsigned vandermonde_det(unsigned size)
 {
@@ -61,21 +67,20 @@ static unsigned vandermonde_det(unsigned size)
 	return result;
 }
 
-unsigned time_vandermonde(void)
+unsigned time_vandermonde()
 {
 	unsigned result = 0;
 	
 	cout << "timing determinant of univariate symbolic Vandermonde matrices" << flush;
-	clog << "-------determinant of univariate symbolic Vandermonde matrices:" << endl;
 	
 	vector<unsigned> sizes;
 	vector<double> times;
 	timer swatch;
 	
-	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;
@@ -90,20 +95,23 @@ unsigned time_vandermonde(void)
 		cout << '.' << flush;
 	}
 	
-	if (!result) {
-		cout << " passed ";
-		clog << "(no output)" << endl;
-	} else {
-		cout << " failed ";
-	}
 	// print the report:
 	cout << endl << "	dim:   ";
 	for (vector<unsigned>::iterator i=sizes.begin(); i!=sizes.end(); ++i)
 		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;
 }
+
+extern void randomify_symbol_serials();
+
+int main(int argc, char** argv)
+{
+	randomify_symbol_serials();
+	cout << setprecision(2) << showpoint;
+	return time_vandermonde();
+}