G_numeric: put convergence/acceleration transofrmations into helper functions.

[ginac.git] / check / timer.cpp

diff --git a/check/timer.cpp b/check/timer.cpp
index 3400325e11641d9aa053b15c1be9b0cf6b19e058..140df2fee34d9a73c0488ad369111350da42b88e 100644 (file)
--- a/check/timer.cpp
+++ b/check/timer.cpp
@@ -3,7 +3,7 @@
  *  A simple stop watch class. */
 
 /*
- *  GiNaC Copyright (C) 1999-2004 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,51 +17,84 @@
  *
  *  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 <sys/time.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#ifdef HAVE_RUSAGE
 #include <sys/resource.h>
 #include <unistd.h>
+#include <sys/time.h>
+#else
+#include <ctime>
+#endif
 
 #include "timer.h"
 
 timer::timer() : on(false)
 {
+#ifdef HAVE_RUSAGE
        getrusage(RUSAGE_SELF, &used1);
-       getrusage(RUSAGE_SELF, &used2);
+       used2.ru_utime = used1.ru_utime;
+       used2.ru_stime = used1.ru_stime;
+#else
+       used1 = clock();
+       used2 = used1;
+#endif
 }
 
 void timer::start()
 {
        on = true;
+#ifdef HAVE_RUSAGE
        getrusage(RUSAGE_SELF, &used1);
-       getrusage(RUSAGE_SELF, &used2);
+       used2.ru_utime = used1.ru_utime;
+       used2.ru_stime = used1.ru_stime;
+#else
+       used1 = clock();
+       used2 = used1;
+#endif
 }
 
 void timer::stop()
 {
        on = false;
+#ifdef HAVE_RUSAGE
        getrusage(RUSAGE_SELF, &used2);
+#else
+       used2 = clock();
+#endif
 }
 
 void timer::reset()
 {
+#ifdef HAVE_RUSAGE
        getrusage(RUSAGE_SELF, &used1);
-       getrusage(RUSAGE_SELF, &used2);
+       used2.ru_utime = used1.ru_utime;
+       used2.ru_stime = used1.ru_stime;
+#else
+       used1 = clock();
+       used2 = used1;
+#endif
 }
 
 double timer::read()
 {
        double elapsed;
-       if (this->running())
+#ifdef HAVE_RUSAGE
+       if (running())
                getrusage(RUSAGE_SELF, &used2);
-       elapsed = ((used2.ru_utime.tv_sec - used1.ru_utime.tv_sec) +
-                          (used2.ru_stime.tv_sec - used1.ru_stime.tv_sec) +
-                          (used2.ru_utime.tv_usec - used1.ru_utime.tv_usec) / 1e6 +
-                          (used2.ru_stime.tv_usec - used1.ru_stime.tv_usec) / 1e6);
-       // round to 10ms for safety:
-       return 0.01*int(elapsed*100+0.5);
+       return ((used2.ru_utime.tv_sec - used1.ru_utime.tv_sec) +
+               (used2.ru_stime.tv_sec - used1.ru_stime.tv_sec) +
+               (used2.ru_utime.tv_usec - used1.ru_utime.tv_usec) * 1e-6 +
+               (used2.ru_stime.tv_usec - used1.ru_stime.tv_usec) * 1e-6);
+#else
+       if (running())
+               used2 = clock();
+       return double(used2 - used1)/CLOCKS_PER_SEC;
+#endif
 }
 
 bool timer::running()