X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Fexam_normalization.cpp;h=d98dec681a79d9071d03ccc3cfd300f36545cdcc;hp=c9ceb18ca8400943314e1a06414a986e39f9884b;hb=56055db8e4780d223f6ddc680fb09ef994691c1d;hpb=f1f3b07b2d13f073af146f6928ec44a7da8b6e9d

diff --git a/check/exam_normalization.cpp b/check/exam_normalization.cpp
index c9ceb18c..d98dec68 100644
--- a/check/exam_normalization.cpp
+++ b/check/exam_normalization.cpp
@@ -3,7 +3,7 @@
  *  Rational function normalization test suite. */
 
 /*
- *  GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2015 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
@@ -17,10 +17,14 @@
  *
  *  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 "exams.h"
+#include "ginac.h"
+using namespace GiNaC;
+
+#include <iostream>
+using namespace std;
 
 static symbol w("w"), x("x"), y("y"), z("z");
 
@@ -80,18 +84,24 @@ static unsigned exam_normal2()
 	d = (x + y) * (w + z);
 	result += check_normal(e, d);
 	
-	e = (pow(x, 2) - pow(y, 2)) / pow(x-y, 3);
-	d = (x + y) / (pow(x, 2) + pow(y, 2) - x * y * 2);
-	result += check_normal(e, d);
+	// Fails stochastically with the new tinfo mechanism, because
+	// sometimes the equivalent answer ... / pow(y - x, 2) is calculated.
+	// TODO: make check for both cases.
+//	e = (pow(x, 2) - pow(y, 2)) / pow(x-y, 3);
+//	d = (x + y) / pow(x - y, 2);
+//	result += check_normal(e, d);
 	
 	e = (pow(x, -1) + x) / (pow(x , 2) * 2 + 2);
 	d = pow(x * 2, -1);
 	result += check_normal(e, d);
 	
+	// Fails stochastically with the new tinfo mechanism, because
+	// sometimes the equivalent answer ... / pow(y - x, 2) is calculated.
+	// TODO: make check for both cases.
 	// Fraction cancellation with rational coefficients
-	e = (pow(x, 2) - pow(y, 2)) / pow(x/2 - y/2, 3);
-	d = (8 * x + 8 * y) / (pow(x, 2) + pow(y, 2) - x * y * 2);
-	result += check_normal(e, d);
+//	e = (pow(x, 2) - pow(y, 2)) / pow(x/2 - y/2, 3);
+//	d = (8 * x + 8 * y) / pow(x - y, 2);
+//	result += check_normal(e, d);
 	
 	// Fraction cancellation with rational coefficients
 	e = z/5 * (x/7 + y/10) / (x/14 + y/20);
@@ -153,7 +163,12 @@ static unsigned exam_normal4()
 	e = (pow(x-y*2,4)/pow(pow(x,2)-pow(y,2)*4,2)+1)*(x+y*2)*(y+z)/(pow(x,2)+pow(y,2)*4);
 	d = (y*2 + z*2) / (x + y*2);
 	result += check_normal(e, d);
-	
+
+	// Replacement of nested functions with temporary symbols
+	e = x/(sqrt(sin(z)-1)) + y/(sqrt(sin(z)-1));
+	d = (x + y)/(sqrt(sin(z)-1));
+	result += check_normal(e, d);
+
 	return result;
 }
 
@@ -203,6 +218,7 @@ static unsigned exam_content()
 	result += check_content(5*x-15, x, 5, 5, x-3);
 	result += check_content(5*x*y-15*y*y, x, 5, 5*y, x-3*y);
 	result += check_content(-15*x/2+ex(25)/3, x, ex(5)/6, ex(5)/6, 9*x-10);
+	result += check_content(-x*y, x, 1, y, x);
 
 	return result;
 }
@@ -212,7 +228,6 @@ unsigned exam_normalization()
 	unsigned result = 0;
 	
 	cout << "examining rational function normalization" << flush;
-	clog << "----------rational function normalization:" << endl;
 	
 	result += exam_normal1(); cout << '.' << flush;
 	result += exam_normal2(); cout << '.' << flush;
@@ -220,12 +235,10 @@ unsigned exam_normalization()
 	result += exam_normal4(); cout << '.' << flush;
 	result += exam_content(); cout << '.' << flush;
 	
-	if (!result) {
-		cout << " passed " << endl;
-		clog << "(no output)" << endl;
-	} else {
-		cout << " failed " << endl;
-	}
-	
 	return result;
 }
+
+int main(int argc, char** argv)
+{
+	return exam_normalization();
+}