lst(0) now works as expected

[ginac.git] / check / times.cpp

diff --git a/check/times.cpp b/check/times.cpp
index 65ca3baffc4467411841bd5ab74c3371cd1656cd..e405403e9a4afea2ff375d8254de2a8b30738a91 100644 (file)
--- a/check/times.cpp
+++ b/check/times.cpp
@@ -3,7 +3,7 @@
  *  Main program that calls the individual timings. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2003 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,136 +21,54 @@
  */
 
 #include <stdexcept>
-#include <iostream>
-
 #include "times.h"
 
 int main()
 {
-    unsigned result = 0;
-    
-    try {
-        for (int i=0; i<1; ++i)
-            result += time_dennyfliegner();
-    } catch (const exception &e) {
-        cout << "Error: caught exception " << e.what() << endl;
-        ++result;
-    }
-    
-    try {
-        for (int i=0; i<1; ++i)
-            result += time_gammaseries();
-    } catch (const exception &e) {
-        cout << "Error: caught exception " << e.what() << endl;
-        ++result;
-    }
-    
-    try {
-        for (int i=0; i<1; ++i)
-            result += time_vandermonde();
-    } catch (const exception &e) {
-        cout << "Error: caught exception " << e.what() << endl;
-        ++result;
-    }
-    
-    try {
-        for (int i=0; i<1; ++i)
-            result += time_toeplitz();
-    } catch (const exception &e) {
-        cout << "Error: caught exception " << e.what() << endl;
-        ++result;
-    }
-    
-    try {
-        for (int i=0; i<1; ++i)
-            result += time_lw_A();
-    } catch (const exception &e) {
-        cout << "Error: caught exception " << e.what() << endl;
-        ++result;
-    }
-    
-    try {
-        for (int i=0; i<1; ++i)
-            result += time_lw_B();
-    } catch (const exception &e) {
-        cout << "Error: caught exception " << e.what() << endl;
-        ++result;
-    }
-    
-    try {
-        for (int i=0; i<1; ++i)
-            result += time_lw_C();
-    } catch (const exception &e) {
-        cout << "Error: caught exception " << e.what() << endl;
-        ++result;
-    }
-    
-    try {
-        for (int i=0; i<1; ++i)
-            result += time_lw_D();
-    } catch (const exception &e) {
-        cout << "Error: caught exception " << e.what() << endl;
-        ++result;
-    }
-    
-    try {
-        for (int i=0; i<1; ++i)
-            result += time_lw_E();
-    } catch (const exception &e) {
-        cout << "Error: caught exception " << e.what() << endl;
-        ++result;
-    }
-    
-    try {
-        for (int i=0; i<1; ++i)
-            result += time_lw_F();
-    } catch (const exception &e) {
-        cout << "Error: caught exception " << e.what() << endl;
-        ++result;
-    }
-    
-    try {
-        for (int i=0; i<1; ++i)
-            result += time_lw_G();
-    } catch (const exception &e) {
-        cout << "Error: caught exception " << e.what() << endl;
-        ++result;
-    }
-    
-    try {
-        for (int i=0; i<1; ++i)
-            result += time_lw_H();
-    } catch (const exception &e) {
-        cout << "Error: caught exception " << e.what() << endl;
-        ++result;
-    }
-    
-    try {
-        for (int i=0; i<1; ++i)
-            result += time_lw_P();
-    } catch (const exception &e) {
-        cout << "Error: caught exception " << e.what() << endl;
-        ++result;
-    }
-    
-    try {
-        for (int i=0; i<1; ++i)
-            result += time_lw_Pprime();
-    } catch (const exception &e) {
-        cout << "Error: caught exception " << e.what() << endl;
-        ++result;
-    }
-    
-    if (result) {
-        cout << "Error: something went wrong. ";
-        if (result == 1) {
-            cout << "(one failure)" << endl;
-        } else {
-            cout << "(" << result << " individual failures)" << endl;
-        }
-        cout << "please check times.out against times.ref for more details."
-             << endl << "happy debugging!" << endl;
-    }
-    
-    return result;
+       unsigned result = 0;
+       
+#define TIME(which) \
+try { \
+       result += time_ ## which (); \
+} catch (const exception &e) { \
+       cout << "Error: caught exception " << e.what() << endl; \
+       ++result; \
+}
+
+       TIME(dennyfliegner)
+       TIME(gammaseries)
+       TIME(vandermonde)
+       TIME(toeplitz)
+       TIME(lw_A)
+       TIME(lw_B)
+       TIME(lw_C)
+       TIME(lw_D)
+       TIME(lw_E)
+       TIME(lw_F)
+       TIME(lw_G)
+       TIME(lw_H)
+       TIME(lw_IJKL)
+       TIME(lw_M1)
+       TIME(lw_M2)
+       TIME(lw_N)
+       TIME(lw_O)
+       TIME(lw_P)
+       TIME(lw_Pprime)
+       TIME(lw_Q)
+       TIME(lw_Qprime)
+       TIME(antipode)
+       TIME(fateman_expand)
+       
+       if (result) {
+               cout << "Error: something went wrong. ";
+               if (result == 1) {
+                       cout << "(one failure)" << endl;
+               } else {
+                       cout << "(" << result << " individual failures)" << endl;
+               }
+               cout << "please check times.out against times.ref for more details."
+                    << endl << "happy debugging!" << endl;
+       }
+       
+       return result;
 }