synced to 1.1

[ginac.git] / check / check_numeric.cpp

diff --git a/check/check_numeric.cpp b/check/check_numeric.cpp
index 36a0d1cbf54b02008f4f5f2fec4d4b22e86fe2b9..e67d6933009972243cf017d4f072f14ed1eeeed7 100644 (file)
--- a/check/check_numeric.cpp
+++ b/check/check_numeric.cpp
@@ -4,7 +4,7 @@
  *  tests on these numbers like is_integer() etc... */
 
 /*
  *  tests on these numbers like is_integer() etc... */
 
 /*

- *  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
  *
  *  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,13 +23,9 @@
 
 #include "checks.h"
 
 
 #include "checks.h"
 

-#ifndef NO_NAMESPACE_GINAC
-using namespace GiNaC;
-#endif // ndef NO_NAMESPACE_GINAC
-

 /* Simple and maybe somewhat pointless consistency tests of assorted tests and
  * conversions. */
 /* Simple and maybe somewhat pointless consistency tests of assorted tests and
  * conversions. */

-static unsigned check_numeric1(void)
+static unsigned check_numeric1()

 {
        unsigned result = 0;
        bool errorflag = false;
 {
        unsigned result = 0;
        bool errorflag = false;


@@ -47,7 +43,7 @@ static unsigned check_numeric1(void)
                numeric res = p/q;
                if (res != z) {
                        clog << z << " erroneously transformed into " 
                numeric res = p/q;
                if (res != z) {
                        clog << z << " erroneously transformed into " 

-                                << p << "/" << q << " by numer() and denom()" << endl;
+                            << p << "/" << q << " by numer() and denom()" << endl;

                        errorflag = true;
                }
        }
                        errorflag = true;
                }
        }


@@ -57,38 +53,48 @@ static unsigned check_numeric1(void)
        return result;
 }
 
        return result;
 }
 

-static unsigned check_numeric2(void)
+static unsigned check_numeric2()

 {
        unsigned result = 0;
        bool errorflag = false;
        int i_num, i_den;
        
        // Check non-nested radicals (n/d)^(m/n) in ex wrapper class:
 {
        unsigned result = 0;
        bool errorflag = false;
        int i_num, i_den;
        
        // Check non-nested radicals (n/d)^(m/n) in ex wrapper class:

-       for (int i=0; i<200; ++i) {  // FIXME: run to ~200
+       for (int i=0; i<200; ++i) {

                for (int j=2; j<13; ++j) {
                        // construct an exponent 1/j...
                        numeric nm(1,j);
                        nm += numeric(int(20.0*rand()/(RAND_MAX+1.0))-10);
                        // ...a numerator...
                for (int j=2; j<13; ++j) {
                        // construct an exponent 1/j...
                        numeric nm(1,j);
                        nm += numeric(int(20.0*rand()/(RAND_MAX+1.0))-10);
                        // ...a numerator...

-                       do { i_num = rand(); } while (i_num == 0);
+                       do {
+                               i_num = rand();
+                       } while (i_num<=0);

                        numeric num(i_num);
                        // ...and a denominator.
                        numeric num(i_num);
                        // ...and a denominator.

-                       do { i_den = (rand())/100; } while (i_den == 0);
+                       do {
+                               i_den = (rand())/100;
+                       } while (i_den<=0);

                        numeric den(i_den);
                        // construct the radicals:
                        ex radical = pow(ex(num)/ex(den),ex(nm));
                        numeric floating = pow(num/den,nm);
                        // test the result:
                        numeric den(i_den);
                        // construct the radicals:
                        ex radical = pow(ex(num)/ex(den),ex(nm));
                        numeric floating = pow(num/den,nm);
                        // test the result:

-                       if (is_ex_of_type(radical,numeric)) {
-                               clog << "(" << num << "/" << den << ")^(" << nm
-                                        << ") should have been a product, instead it's "
-                                        << radical << endl;
-                               errorflag = true;
+                       if (is_a<numeric>(radical)) {
+                               // This is very improbable with decent random numbers but it
+                               // still can happen, so we better check if it is correct:
+                               if (pow(radical,inverse(nm))==num/den) {
+                                       // Aha! We drew some lucky numbers. Nothing to see here...
+                               } else {
+                                       clog << "(" << num << "/" << den << ")^(" << nm
+                                                << ") should have been a product, instead it's "
+                                                << radical << endl;
+                                       errorflag = true;
+                               }

                        }
                        }

-                       numeric ratio = ex_to_numeric(evalf(radical))/floating;
+                       numeric ratio = abs(ex_to<numeric>(evalf(radical))/floating);

                        if (ratio>1.0001 && ratio<0.9999) {
                                clog << "(" << num << "/" << den << ")^(" << nm
                        if (ratio>1.0001 && ratio<0.9999) {
                                clog << "(" << num << "/" << den << ")^(" << nm

-                                        << ") erroneously evaluated to " << radical;
+                                    << ") erroneously evaluated to " << radical;

                                errorflag = true;
                        }
                }
                                errorflag = true;
                        }
                }


@@ -99,7 +105,7 @@ static unsigned check_numeric2(void)
        return result;
 }
 
        return result;
 }
 

-unsigned check_numeric(void)
+unsigned check_numeric()

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