Added series expansion for functions (classical) Li and S around x==0.

[ginac.git] / check / time_lw_M1.cpp

diff --git a/check/time_lw_M1.cpp b/check/time_lw_M1.cpp
index 961fe2a5b2fd3c3639d88d8f84fb7267684a7012..597a4a72916583bcd67b7430afd992a8c34e4305 100644 (file)
--- a/check/time_lw_M1.cpp
+++ b/check/time_lw_M1.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-2005 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,16 +18,16 @@
  *
  *  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 "times.h"
 

-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");
 {
        // Determinant of a sparse matrix that comes up in graph theory:
        symbol x1("x1"), x2("x2"), x3("x3"), x4("x4"), x5("x5");

-       static ex w[26][11] = {
+       ex w[26][11] = {

                { 1,  1,  1,  7, x4, 12, x3, 17, x2, 22, x1},
                { 2,  2,  1,  8, x4, 13, x3, 18, x2, 23, x1},
                { 3,  3,  1,  9, x4, 14, x3, 19, x2, 24, x1},
                { 1,  1,  1,  7, x4, 12, x3, 17, x2, 22, x1},
                { 2,  2,  1,  8, x4, 13, x3, 18, x2, 23, x1},
                { 3,  3,  1,  9, x4, 14, x3, 19, x2, 24, x1},


@@ -59,7 +59,7 @@ static unsigned test(void)
        for (unsigned r=0; r<26; ++r) {
                for (unsigned c=0; c<5; ++c) {
                        m.set(r,
        for (unsigned r=0; r<26; ++r) {
                for (unsigned c=0; c<5; ++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]);
                }
        }


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

-unsigned time_lw_M1(void)
+unsigned time_lw_M1()

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


@@ -81,7 +81,7 @@ unsigned time_lw_M1(void)
        double time = .0;
        
        cout << "timing Lewis-Wester test M1 (26x26 sparse, det)" << flush;
        double time = .0;
        
        cout << "timing Lewis-Wester test M1 (26x26 sparse, det)" << flush;

-       clog << "-------Lewis-Wester test M1 (26x26 sparse, det)" << endl;
+       clog << "-------Lewis-Wester test M1 (26x26 sparse, det):" << endl;

        
        rolex.start();
        // correct for very small times:
        
        rolex.start();
        // correct for very small times: