X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Fexam_differentiation.cpp;h=dac69e3dd26d77dde58e3961a1b45c4147cb76d4;hp=b99c022b1caa28b2210b7cf69f30fc0262d5954c;hb=74bc832973cda4204e349396c9f4f7d056f16366;hpb=383d5eb3b0f0506810d9105a268f939125bfc347

diff --git a/check/exam_differentiation.cpp b/check/exam_differentiation.cpp
index b99c022b..dac69e3d 100644
--- a/check/exam_differentiation.cpp
+++ b/check/exam_differentiation.cpp
@@ -3,7 +3,7 @@
  *  Tests for symbolic differentiation, including various functions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2020 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,16 +17,20 @@
  *
  *  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 unsigned check_diff(const ex &e, const symbol &x,
 						   const ex &d, unsigned nth=1)
 {
 	ex ed = e.diff(x, nth);
-	if ((ed - d).compare(ex(0)) != 0) {
+	if (!(ed - d).is_zero()) {
 		switch (nth) {
 		case 0:
 			clog << "zeroth ";
@@ -45,9 +49,7 @@ static unsigned check_diff(const ex &e, const symbol &x,
 		clog << "derivative of " << e << " by " << x << " returned "
 		     << ed << " instead of " << d << endl;
 		clog << "returned:" << endl;
-		ed.printtree(clog);
-		clog << endl << "instead of" << endl;
-		d.printtree(clog);
+		clog << tree << ed << "instead of\n" << d << dflt;
 
 		return 1;
 	}
@@ -55,7 +57,7 @@ static unsigned check_diff(const ex &e, const symbol &x,
 }
 
 // Simple (expanded) polynomials
-static unsigned exam_differentiation1(void)
+static unsigned exam_differentiation1()
 {
 	unsigned result = 0;
 	symbol x("x"), y("y");
@@ -67,26 +69,26 @@ static unsigned exam_differentiation1(void)
 	e = (e1 * e2).expand();
 	
 	// d e / dx:
-	d = ex("121-55/x^2-66/x^3-30/x^3/y^2-42/x^3/y-78/x^3*y-102/x^3*y^2-25/x^2/y^2-35/x^2/y-65/x^2*y-85/x^2*y^2+77/y+143*y+187*y^2+130*x/y^2+182/y*x+338*x*y+442*x*y^2+55/y^2+286*x",lst(x,y));
+	d = ex("121-55/x^2-66/x^3-30/x^3/y^2-42/x^3/y-78/x^3*y-102/x^3*y^2-25/x^2/y^2-35/x^2/y-65/x^2*y-85/x^2*y^2+77/y+143*y+187*y^2+130*x/y^2+182/y*x+338*x*y+442*x*y^2+55/y^2+286*x",lst{x,y});
 	result += check_diff(e, x, d);
 	
 	// d e / dy:
-	d = ex("91-30/x^2/y^3-21/x^2/y^2+39/x^2+102/x^2*y-50/x/y^3-35/x/y^2+65/x+170/x*y-77*x/y^2+143*x+374*x*y-130/y^3*x^2-91/y^2*x^2+169*x^2+442*x^2*y-110/y^3*x-70/y^3+238*y-49/y^2",lst(x,y));
+	d = ex("91-30/x^2/y^3-21/x^2/y^2+39/x^2+102/x^2*y-50/x/y^3-35/x/y^2+65/x+170/x*y-77*x/y^2+143*x+374*x*y-130/y^3*x^2-91/y^2*x^2+169*x^2+442*x^2*y-110/y^3*x-70/y^3+238*y-49/y^2",lst{x,y});
 	result += check_diff(e, y, d);
 	
 	// d^2 e / dx^2:
-	d = ex("286+90/x^4/y^2+126/x^4/y+234/x^4*y+306/x^4*y^2+50/x^3/y^2+70/x^3/y+130/x^3*y+170/x^3*y^2+130/y^2+182/y+338*y+442*y^2+198/x^4+110/x^3",lst(x,y));
+	d = ex("286+90/x^4/y^2+126/x^4/y+234/x^4*y+306/x^4*y^2+50/x^3/y^2+70/x^3/y+130/x^3*y+170/x^3*y^2+130/y^2+182/y+338*y+442*y^2+198/x^4+110/x^3",lst{x,y});
 	result += check_diff(e, x, d, 2);
 	
 	// d^2 e / dy^2:
-	d = ex("238+90/x^2/y^4+42/x^2/y^3+102/x^2+150/x/y^4+70/x/y^3+170/x+330*x/y^4+154*x/y^3+374*x+390*x^2/y^4+182*x^2/y^3+442*x^2+210/y^4+98/y^3",lst(x,y));
+	d = ex("238+90/x^2/y^4+42/x^2/y^3+102/x^2+150/x/y^4+70/x/y^3+170/x+330*x/y^4+154*x/y^3+374*x+390*x^2/y^4+182*x^2/y^3+442*x^2+210/y^4+98/y^3",lst{x,y});
 	result += check_diff(e, y, d, 2);
 	
 	return result;
 }
 
 // Trigonometric functions
-static unsigned exam_differentiation2(void)
+static unsigned exam_differentiation2()
 {
 	unsigned result = 0;
 	symbol x("x"), y("y"), a("a"), b("b");
@@ -135,7 +137,7 @@ static unsigned exam_differentiation2(void)
 }
 	
 // exp function
-static unsigned exam_differentiation3(void)
+static unsigned exam_differentiation3()
 {
 	unsigned result = 0;
 	symbol x("x"), y("y"), a("a"), b("b");
@@ -163,7 +165,7 @@ static unsigned exam_differentiation3(void)
 }
 
 // log functions
-static unsigned exam_differentiation4(void)
+static unsigned exam_differentiation4()
 {
 	unsigned result = 0;
 	symbol x("x"), y("y"), a("a"), b("b");
@@ -193,7 +195,7 @@ static unsigned exam_differentiation4(void)
 }
 
 // Functions with two variables
-static unsigned exam_differentiation5(void)
+static unsigned exam_differentiation5()
 {
 	unsigned result = 0;
 	symbol x("x"), y("y"), a("a"), b("b");
@@ -214,7 +216,7 @@ static unsigned exam_differentiation5(void)
 }
 
 // Series
-static unsigned exam_differentiation6(void)
+static unsigned exam_differentiation6()
 {
 	symbol x("x");
 	ex e, d, ed;
@@ -225,7 +227,7 @@ static unsigned exam_differentiation6(void)
 	ed = series_to_poly(ed);
 	d = series_to_poly(d);
 	
-	if ((ed - d).compare(ex(0)) != 0) {
+	if (!(ed - d).is_zero()) {
 		clog << "derivative of " << e << " by " << x << " returned "
 		     << ed << " instead of " << d << ")" << endl;
 		return 1;
@@ -234,7 +236,7 @@ static unsigned exam_differentiation6(void)
 }
 
 // Hashing can help a lot, if differentiation is done cleverly
-static unsigned exam_differentiation7(void)
+static unsigned exam_differentiation7()
 {
 	symbol x("x");
 	ex P = x + pow(x,3);
@@ -257,12 +259,11 @@ static unsigned exam_differentiation7(void)
 	return 0;
 }
 
-unsigned exam_differentiation(void)
+unsigned exam_differentiation()
 {
 	unsigned result = 0;
 	
 	cout << "examining symbolic differentiation" << flush;
-	clog << "----------symbolic differentiation:" << endl;
 	
 	result += exam_differentiation1();  cout << '.' << flush;
 	result += exam_differentiation2();  cout << '.' << flush;
@@ -272,11 +273,10 @@ unsigned exam_differentiation(void)
 	result += exam_differentiation6();  cout << '.' << flush;
 	result += exam_differentiation7();  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_differentiation();
+}