X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Ftime_gammaseries.cpp;h=e6ffa8736abe814ab4d963c37893c1326df7576b;hp=e5643d9c36391c0254d03fad8cf417361cc85719;hb=f152bcaada41397cdf12d21fc2c4172d77ab7cb2;hpb=e7cc6a764ff67b5885d6633385fac23ccc1dc9a7

diff --git a/check/time_gammaseries.cpp b/check/time_gammaseries.cpp
index e5643d9c..e6ffa873 100644
--- a/check/time_gammaseries.cpp
+++ b/check/time_gammaseries.cpp
@@ -3,7 +3,7 @@
  *  Some timings on series expansion of the Gamma function around a pole. */
 
 /*
- *  GiNaC Copyright (C) 1999-2002 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2008 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,10 +17,15 @@
  *
  *  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 <iostream>
+#include <vector>
+#include "ginac.h"
+#include "timer.h"
+using namespace std;
+using namespace GiNaC;
 
 unsigned tgammaseries(unsigned order)
 {
@@ -43,21 +48,20 @@ unsigned tgammaseries(unsigned order)
 	return result;
 }
 
-unsigned time_gammaseries(void)
+unsigned time_gammaseries()
 {
 	unsigned result = 0;
 
 	cout << "timing Laurent series expansion of Gamma function" << flush;
-	clog << "-------Laurent series expansion of Gamma function:" << endl;
 
 	vector<unsigned> sizes;
 	vector<double> times;
 	timer omega;
 
-	sizes.push_back(10);
-	sizes.push_back(15);
 	sizes.push_back(20);
 	sizes.push_back(25);
+	sizes.push_back(30);
+	sizes.push_back(35);
 
 	for (vector<unsigned>::iterator i=sizes.begin(); i!=sizes.end(); ++i) {
 		omega.start();
@@ -66,20 +70,23 @@ unsigned time_gammaseries(void)
 		cout << '.' << flush;
 	}
 
-	if (!result) {
-		cout << " passed ";
-		clog << "(no output)" << endl;
-	} else {
-		cout << " failed ";
-	}
 	// print the report:
 	cout << endl << "	order: ";
 	for (vector<unsigned>::iterator i=sizes.begin(); i!=sizes.end(); ++i)
-		cout << '\t' << (*i);
+		cout << '\t' << *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_gammaseries();
+}