- use initializers in exception class pole_error.

[ginac.git] / check / check_numeric.cpp

diff --git a/check/check_numeric.cpp b/check/check_numeric.cpp
index 36a0d1cbf54b02008f4f5f2fec4d4b22e86fe2b9..74dcf33b27b7e7815a063ea37740b64fbc4deea0 100644 (file)
--- a/check/check_numeric.cpp
+++ b/check/check_numeric.cpp
@@ -4,7 +4,7 @@
  *  tests on these numbers like is_integer() etc... */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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,10 +23,6 @@
 
 #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. */
 static unsigned check_numeric1(void)
@@ -47,7 +43,7 @@ static unsigned check_numeric1(void)
                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;
                }
        }
@@ -64,7 +60,7 @@ static unsigned check_numeric2(void)
        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);
@@ -79,16 +75,16 @@ static unsigned check_numeric2(void)
                        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)) {
+                       if (is_a<numeric>(radical)) {
                                clog << "(" << num << "/" << den << ")^(" << nm
-                                        << ") should have been a product, instead it's "
-                                        << radical << endl;
+                                    << ") 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
-                                        << ") erroneously evaluated to " << radical;
+                                    << ") erroneously evaluated to " << radical;
                                errorflag = true;
                        }
                }