match() (find()): use exmap (exset) to store matched subexpressions.

[ginac.git] / check / time_lw_M2.cpp

diff --git a/check/time_lw_M2.cpp b/check/time_lw_M2.cpp
index fcd587fc02b7b3d369b364aeaa3657f3ad62dc4e..d6fea9088af3b623a572761e782679744681ee13 100644 (file)
--- a/check/time_lw_M2.cpp
+++ b/check/time_lw_M2.cpp
@@ -4,7 +4,7 @@
  *  Lewis and Michael Wester. */
 
 /*
  *  Lewis and Michael Wester. */
 
 /*

- *  GiNaC Copyright (C) 1999-2001 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
  *
  *  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


@@ -18,19 +18,23 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *
  *  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 "ginac.h"
+#include "timer.h"
+using namespace std;
+using namespace GiNaC;

 
 static const bool do_test = false;  // set to true in order to run this beast
 
 
 static const bool do_test = false;  // set to true in order to run this beast
 

-static unsigned test(void)
+static unsigned test()

 {
        // Determinant of a sparse matrix that comes up in graph theory:
        symbol x1("x1"), x2("x2"), x3("x3"), x4("x4"), x5("x5");
        symbol x6("x6"), x7("x7"), x8("x8"), x9("x9"), xA("xA");
 {
        // Determinant of a sparse matrix that comes up in graph theory:
        symbol x1("x1"), x2("x2"), x3("x3"), x4("x4"), x5("x5");
        symbol x6("x6"), x7("x7"), x8("x8"), x9("x9"), xA("xA");

-       static ex w[101][21] = {
+       ex w[101][21] = {

            { 1, 1, 1, 12, x9, 22, x8, 32, x7, 42, x6, 52, x5, 62, x4, 72, x3, 82, x2, 92, x1 },
            { 2, 2, 1, 13, x9, 23, x8, 33, x7, 43, x6, 53, x5, 63, x4, 73, x3, 83, x2, 93, x1 },
            { 3, 3, 1, 14, x9, 24, x8, 34, x7, 44, x6, 54, x5, 64, x4, 74, x3, 84, x2, 94, x1 },
            { 1, 1, 1, 12, x9, 22, x8, 32, x7, 42, x6, 52, x5, 62, x4, 72, x3, 82, x2, 92, x1 },
            { 2, 2, 1, 13, x9, 23, x8, 33, x7, 43, x6, 53, x5, 63, x4, 73, x3, 83, x2, 93, x1 },
            { 3, 3, 1, 14, x9, 24, x8, 34, x7, 44, x6, 54, x5, 64, x4, 74, x3, 84, x2, 94, x1 },


@@ -137,7 +141,7 @@ static unsigned test(void)
        for (unsigned r=0; r<101; ++r) {
                for (unsigned c=0; c<10; ++c) {
                        m.set(r,
        for (unsigned r=0; r<101; ++r) {
                for (unsigned c=0; c<10; ++c) {
                        m.set(r,

-                             unsigned(ex_to_numeric(w[r][2*c+1]).to_int()-1),
+                             unsigned(ex_to<numeric>(w[r][2*c+1]).to_int()-1),

                              w[r][2*c+2]);
                }
        }
                              w[r][2*c+2]);
                }
        }


@@ -149,7 +153,7 @@ static unsigned test(void)
        return 0;
 }
 
        return 0;
 }
 

-unsigned time_lw_M2(void)
+unsigned time_lw_M2()

 {
        unsigned result = 0;
        unsigned count = 0;
 {
        unsigned result = 0;
        unsigned count = 0;


@@ -157,7 +161,6 @@ unsigned time_lw_M2(void)
        double time = .0;
        
        cout << "timing Lewis-Wester test M2 (101x101 sparse, det)" << flush;
        double time = .0;
        
        cout << "timing Lewis-Wester test M2 (101x101 sparse, det)" << flush;

-       clog << "-------Lewis-Wester test M2 (101x101 sparse, det)" << endl;

        
        if (do_test) {
                piaget.start();
        
        if (do_test) {
                piaget.start();


@@ -167,18 +170,19 @@ unsigned time_lw_M2(void)
                        ++count;
                } while ((time=piaget.read())<0.1 && !result);
                cout << '.' << flush;
                        ++count;
                } while ((time=piaget.read())<0.1 && !result);
                cout << '.' << flush;

-               
-               if (!result) {
-                       cout << " passed ";
-                       clog << "(no output)" << endl;
-               } else {
-                       cout << " failed ";
-               }
-               cout << int(1000*(time/count))*0.001 << 's' << endl;
+               cout << time/count << 's' << endl;

        } else {
                cout << " disabled" << endl;
        } else {
                cout << " disabled" << endl;

-               clog << "(no output)" << endl;

        }
        
        return result;
 }
        }
        
        return result;
 }

+
+extern void randomify_symbol_serials();
+
+int main(int argc, char** argv)
+{
+       randomify_symbol_serials();
+       cout << setprecision(2) << showpoint;
+       return time_lw_M2();
+}