log(-<realnumber>) now returns a real number

[ginac.git] / check / time_lw_G.cpp

diff --git a/check/time_lw_G.cpp b/check/time_lw_G.cpp
index 771b4372560286af7c0dd48c449d9821270011ef..65da2589ddc70cdbd5a1812f2adddeebc8872599 100644 (file)
--- a/check/time_lw_G.cpp
+++ b/check/time_lw_G.cpp
@@ -4,7 +4,7 @@
  *  Lewis and Michael Wester. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2004 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
@@ -23,49 +23,49 @@
 
 #include "times.h"
 
-static unsigned test(void)
+static unsigned test()
 {
-    symbol x("x");
-    symbol y("y");
-    symbol z("z");
-
-    ex p = expand(pow(7*y*pow(x*z,2)-3*x*y*z+11*(x+1)*pow(y,2)+5*z+1,4)
-                  *pow(3*x-7*y+2*z-3,5));
-    ex q = expand(pow(7*y*pow(x*z,2)-3*x*y*z+11*(x+1)*pow(y,2)+5*z+1,3)
-                  *pow(3*x-7*y+2*z+3,6));
-    ex result = gcd(p,q);
-    if (result.expand()!=expand(pow(7*y*pow(x*z,2)-3*x*y*z+11*(x+1)*pow(y,2)+5*z+1,3))) {
-        clog << "gcd(expand((7*y*x^2*z^2-3*x*y*z+11*(x+1)*y^2+5*z+1)^4*(3*x-7*y+2*z-3)^5),expand((7*y*x^2*z^2-3*x*y*z+11*(x+1)*y^2+5*z+1)^3*(3*x-7*y+2*z+3)^6)) erroneously returned " << result << endl;
-        return 1;
-    }
-    return 0;
+       symbol x("x");
+       symbol y("y");
+       symbol z("z");
+       
+       ex p = expand(pow(7*y*pow(x*z,2)-3*x*y*z+11*(x+1)*pow(y,2)+5*z+1,4)
+                     *pow(3*x-7*y+2*z-3,5));
+       ex q = expand(pow(7*y*pow(x*z,2)-3*x*y*z+11*(x+1)*pow(y,2)+5*z+1,3)
+                     *pow(3*x-7*y+2*z+3,6));
+       ex result = gcd(p,q);
+       if (result.expand()!=expand(pow(7*y*pow(x*z,2)-3*x*y*z+11*(x+1)*pow(y,2)+5*z+1,3))) {
+               clog << "gcd(expand((7*y*x^2*z^2-3*x*y*z+11*(x+1)*y^2+5*z+1)^4*(3*x-7*y+2*z-3)^5),expand((7*y*x^2*z^2-3*x*y*z+11*(x+1)*y^2+5*z+1)^3*(3*x-7*y+2*z+3)^6)) erroneously returned " << result << endl;
+               return 1;
+       }
+       return 0;
 }
 
-unsigned time_lw_G(void)
+unsigned time_lw_G()
 {
-    unsigned result = 0;
-    unsigned count = 1;
-    timer rolex;
-    double time = .0;
-    
-    cout << "timing Lewis-Wester test G (gcd of 3-var polys)" << flush;
-    clog << "-------Lewis-Wester test G (gcd of 3-var polys)" << endl;
-    
-    rolex.start();
-    // correct for very small times:
-    do {
-        result = test();
-        ++count;
-    } while ((time=rolex.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;
-    
-    return result;
+       unsigned result = 0;
+       unsigned count = 0;
+       timer rolex;
+       double time = .0;
+       
+       cout << "timing Lewis-Wester test G (gcd of 3-var polys)" << flush;
+       clog << "-------Lewis-Wester test G (gcd of 3-var polys):" << endl;
+       
+       rolex.start();
+       // correct for very small times:
+       do {
+               result = test();
+               ++count;
+       } while ((time=rolex.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;
+       
+       return result;
 }