X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Fexam_normalization.cpp;h=c0a2e232735287e8bdc33cf017565e35998db54b;hp=02f2a8217fc889b723749754ea0fd148cd4fc176;hb=a629d98f0678a30e382283b3b7d4cd3abebaca20;hpb=1f5afe37b4c079821de9810435fa9fa11e4ea17b

diff --git a/check/exam_normalization.cpp b/check/exam_normalization.cpp
index 02f2a821..c0a2e232 100644
--- a/check/exam_normalization.cpp
+++ b/check/exam_normalization.cpp
@@ -3,7 +3,7 @@
  *  Rational function normalization test suite. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2005 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,7 +17,7 @@
  *
  *  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"
@@ -27,7 +27,7 @@ static symbol w("w"), x("x"), y("y"), z("z");
 static unsigned check_normal(const ex &e, const ex &d)
 {
 	ex en = e.normal();
-	if (en.compare(d) != 0) {
+	if (!en.is_equal(d)) {
 		clog << "normal form of " << e << " erroneously returned "
 		     << en << " (should be " << d << ")" << endl;
 		return 1;
@@ -35,7 +35,7 @@ static unsigned check_normal(const ex &e, const ex &d)
 	return 0;
 }
 
-static unsigned exam_normal1(void)
+static unsigned exam_normal1()
 {
 	unsigned result = 0;
 	ex e, d;
@@ -62,7 +62,7 @@ static unsigned exam_normal1(void)
 	return result;
 }
 
-static unsigned exam_normal2(void)
+static unsigned exam_normal2()
 {
 	unsigned result = 0;
 	ex e, d;
@@ -81,7 +81,7 @@ static unsigned exam_normal2(void)
 	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);
+	d = (x + y) / pow(x - y, 2);
 	result += check_normal(e, d);
 	
 	e = (pow(x, -1) + x) / (pow(x , 2) * 2 + 2);
@@ -90,7 +90,7 @@ static unsigned exam_normal2(void)
 	
 	// 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);
+	d = (8 * x + 8 * y) / pow(x - y, 2);
 	result += check_normal(e, d);
 	
 	// Fraction cancellation with rational coefficients
@@ -101,7 +101,7 @@ static unsigned exam_normal2(void)
 	return result;
 }
 
-static unsigned exam_normal3(void)
+static unsigned exam_normal3()
 {
 	unsigned result = 0;
 	ex e, d;
@@ -124,7 +124,7 @@ static unsigned exam_normal3(void)
 	return result;
 }
 
-static unsigned exam_normal4(void)
+static unsigned exam_normal4()
 {
 	unsigned result = 0;
 	ex e, d;
@@ -157,17 +157,69 @@ static unsigned exam_normal4(void)
 	return result;
 }
 
-unsigned exam_normalization(void)
+/* Test content(), integer_content(), primpart(). */
+static unsigned check_content(const ex & e, const ex & x, const ex & ic, const ex & c, const ex & pp)
+{
+	unsigned result = 0;
+
+	ex r_ic = e.integer_content();
+	if (!r_ic.is_equal(ic)) {
+		clog << "integer_content(" << e << ") erroneously returned "
+		     << r_ic << " instead of " << ic << endl;
+		++result;
+	}
+
+	ex r_c = e.content(x);
+	if (!r_c.is_equal(c)) {
+		clog << "content(" << e << ", " << x << ") erroneously returned "
+		     << r_c << " instead of " << c << endl;
+		++result;
+	}
+
+	ex r_pp = e.primpart(x);
+	if (!r_pp.is_equal(pp)) {
+		clog << "primpart(" << e << ", " << x << ") erroneously returned "
+		     << r_pp << " instead of " << pp << endl;
+		++result;
+	}
+
+	ex r = r_c*r_pp*e.unit(x);
+	if (!(r - e).expand().is_zero()) {
+		clog << "product of unit, content, and primitive part of " << e << " yielded "
+		     << r << " instead of " << e << endl;
+		++result;
+	}
+
+	return result;
+}
+
+static unsigned exam_content()
+{
+	unsigned result = 0;
+	symbol x("x"), y("y");
+
+	result += check_content(ex(-3)/4, x, ex(3)/4, ex(3)/4, 1);
+	result += check_content(-x/4, x, ex(1)/4, ex(1)/4, x);
+	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;
+}
+
+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;
-	result += exam_normal3();  cout << '.' << flush;
-	result += exam_normal4();  cout << '.' << flush;
+	result += exam_normal1(); cout << '.' << flush;
+	result += exam_normal2(); cout << '.' << flush;
+	result += exam_normal3(); cout << '.' << flush;
+	result += exam_normal4(); cout << '.' << flush;
+	result += exam_content(); cout << '.' << flush;
 	
 	if (!result) {
 		cout << " passed " << endl;