X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=check%2Fcheck_numeric.cpp;h=b21a6c262c2cf14d6994f0d1aa118747605346b4;hb=4be8b22ca5bfa6878bd746383c7e347e5687293b;hp=17bfbae3febb7fc5a58078c634a2d855d5f2f75f;hpb=0cf43f3096cbcfc7472ff9c8927c6eb74f2eeb8c;p=ginac.git

diff --git a/check/check_numeric.cpp b/check/check_numeric.cpp
index 17bfbae3..b21a6c26 100644
--- a/check/check_numeric.cpp
+++ b/check/check_numeric.cpp
@@ -1,10 +1,10 @@
 /** @file check_numeric.cpp
  *
- *  These exams creates some numbers and check the result of several boolean
+ *  These exams creates some numbers and check the result of several Boolean
  *  tests on these numbers like is_integer() etc... */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2016 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
@@ -18,14 +18,19 @@
  *
  *  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 "checks.h"
+#include "ginac.h"
+using namespace GiNaC;
+
+#include <cstdlib> // for rand()
+#include <iostream>
+using namespace std;
 
 /* 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;
@@ -53,35 +58,45 @@ static unsigned check_numeric1(void)
 	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 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);
+			do {
+				i_num = rand();
+			} while (i_num<=0);
 			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:
 			if (is_a<numeric>(radical)) {
-				clog << "(" << num << "/" << den << ")^(" << nm
-				     << ") should have been a product, instead it's "
-				     << radical << endl;
-				errorflag = true;
+				// 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
 				     << ") erroneously evaluated to " << radical;
@@ -95,22 +110,19 @@ static unsigned check_numeric2(void)
 	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;
 }
+
+int main(int argc, char** argv)
+{
+	return check_numeric();
+}