X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Fcheck_numeric.cpp;h=e67d6933009972243cf017d4f072f14ed1eeeed7;hp=811ba52593125bc5f839f7d50d4ce17e0402a1a9;hb=e2627379c98aeafae903cc2f04bdbdc9defa34f7;hpb=f4ea690a3f118bf364190f0ef3c3f6d2ccdf6206 diff --git a/check/check_numeric.cpp b/check/check_numeric.cpp index 811ba525..e67d6933 100644 --- 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-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 @@ -23,98 +23,104 @@ #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) +static unsigned check_numeric1() { - unsigned result = 0; - bool errorflag = false; - int re_q, im_q; - - // Check some numerator and denominator calculations: - for (int i=0; i<200; ++i) { - do { re_q = rand(); } while (re_q == 0); - do { im_q = rand(); } while (im_q == 0); - numeric r(rand()-RAND_MAX/2, re_q); - numeric i(rand()-RAND_MAX/2, im_q); - numeric z = r + I*i; - numeric p = numer(z); - numeric q = denom(z); - numeric res = p/q; - if (res != z) { - clog << z << " erroneously transformed into " - << p << "/" << q << " by numer() and denom()" << endl; - errorflag = true; - } - } - if (errorflag) - ++result; - - return result; + unsigned result = 0; + bool errorflag = false; + int re_q, im_q; + + // Check some numerator and denominator calculations: + for (int rep=0; rep<200; ++rep) { + do { re_q = rand(); } while (re_q == 0); + do { im_q = rand(); } while (im_q == 0); + numeric r(rand()-RAND_MAX/2, re_q); + numeric i(rand()-RAND_MAX/2, im_q); + numeric z = r + I*i; + numeric p = numer(z); + numeric q = denom(z); + numeric res = p/q; + if (res != z) { + clog << z << " erroneously transformed into " + << p << "/" << q << " by numer() and denom()" << endl; + errorflag = true; + } + } + if (errorflag) + ++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: - for (int i=0; i<200; ++i) { // FIXME: run to ~200 - 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); - numeric num(i_num); - // ...and a denominator. - 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: - if (is_ex_of_type(radical,numeric)) { - clog << "(" << num << "/" << den << ")^(" << nm - << ") should have been a product, instead it's " - << radical << endl; - errorflag = true; - } - numeric ratio = ex_to_numeric(evalf(radical))/floating; - if (ratio>1.0001 && ratio<0.9999) { - clog << "(" << num << "/" << den << ")^(" << nm - << ") erroneously evaluated to " << radical; - errorflag = true; - } - } - } - if (errorflag) - ++result; - - return result; + 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) { + 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); + numeric num(i_num); + // ...and a denominator. + 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: + if (is_a(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 = abs(ex_to(evalf(radical))/floating); + if (ratio>1.0001 && ratio<0.9999) { + clog << "(" << num << "/" << den << ")^(" << nm + << ") erroneously evaluated to " << radical; + errorflag = true; + } + } + } + if (errorflag) + ++result; + + return result; } -unsigned check_numeric(void) +unsigned check_numeric() { - unsigned result = 0; - - cout << "checking consistency of numeric types" << flush; - clog << "---------consistency of numeric types:" << endl; - - result += check_numeric1(); cout << '.' << flush; - result += check_numeric2(); cout << '.' << flush; - - if (!result) { - cout << " passed " << endl; - clog << "(no output)" << endl; - } else { - cout << " failed " << endl; - } - - return result; + unsigned result = 0; + + cout << "checking consistency of numeric types" << flush; + clog << "---------consistency of numeric types:" << endl; + + result += check_numeric1(); cout << '.' << flush; + result += check_numeric2(); cout << '.' << flush; + + if (!result) { + cout << " passed " << endl; + clog << "(no output)" << endl; + } else { + cout << " failed " << endl; + } + + return result; }