X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Fexam_misc.cpp;h=13152f2707ed183e281c2758b4e07f62b7385d5d;hp=6866f44af1e38cce27a5a33440a6d12f42c93f38;hb=f7884835d397de85e648d1957c058b7d4c0948ba;hpb=6d225ee55693c0617d254e6fa283c00c71bd2919

diff --git a/check/exam_misc.cpp b/check/exam_misc.cpp
index 6866f44a..13152f27 100644
--- a/check/exam_misc.cpp
+++ b/check/exam_misc.cpp
@@ -3,7 +3,7 @@
  */
 
 /*
- *  GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2019 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,11 +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 "ginac.h"
+using namespace GiNaC;
 
-#include "exams.h"
+#include <iostream>
+using namespace std;
 
 #define VECSIZE 30
 static unsigned exam_expand_subs()
@@ -93,7 +96,7 @@ static unsigned exam_sqrfree()
 	ex e1, e2;
 	
 	e1 = (1+x)*pow((2+x),2)*pow((3+x),3)*pow((4+x),4);
-	e2 = sqrfree(expand(e1),lst(x));
+	e2 = sqrfree(expand(e1),lst{x});
 	if (e1 != e2) {
 		clog << "sqrfree(expand(" << e1 << ")) erroneously returned "
 		     << e2 << endl;
@@ -107,19 +110,19 @@ static unsigned exam_sqrfree()
 		     << e2 << endl;
 		++result;
 	}
-	e2 = sqrfree(expand(e1),lst(x));
+	e2 = sqrfree(expand(e1),lst{x});
 	if (e1 != e2) {
 		clog << "sqrfree(expand(" << e1 << "),[x]) erroneously returned "
 		     << e2 << endl;
 		++result;
 	}
-	e2 = sqrfree(expand(e1),lst(y));
+	e2 = sqrfree(expand(e1),lst{y});
 	if (e1 != e2) {
 		clog << "sqrfree(expand(" << e1 << "),[y]) erroneously returned "
 		     << e2 << endl;
 		++result;
 	}
-	e2 = sqrfree(expand(e1),lst(x,y));
+	e2 = sqrfree(expand(e1),lst{x,y});
 	if (e1 != e2) {
 		clog << "sqrfree(expand(" << e1 << "),[x,y]) erroneously returned "
 		     << e2 << endl;
@@ -161,7 +164,7 @@ static unsigned exam_operator_semantics()
 		++result;
 	}
 	
-	// Prefix/postfix increment/decrement behaviour:
+	// Prefix/postfix increment/decrement behavior:
 	e1 = 7; e2 = 4;
 	i1 = 7; i2 = 4;
 	e1 = (--e2 = 2)++;
@@ -216,6 +219,15 @@ static unsigned exam_subs()
 		++result;
 	}
 
+	// And this used to fail in GiNaC 1.5.8 because it first substituted
+	// exp(x) -> exp(log(x)) -> x, and then substituted again x -> log(x)
+	e1 = exp(x);
+	e2 = e1.subs(x == log(x));
+	if (!e2.is_equal(x)) {
+		clog << "exp(x).subs(x==log(x)) erroneously returned " << e2 << " instead of x" << endl;
+		++result;
+	}
+
 	e1 = sin(1+sin(x));
 	e2 = e1.subs(sin(wild()) == cos(wild()));
 	if (!e2.is_equal(cos(1+cos(x)))) {
@@ -249,18 +261,40 @@ static unsigned exam_subs_algebraic()
 	unsigned result = 0;
 	symbol x("x"), y("y");
 
-	ex e = ex(x*x*x*y*y).subs(x*y==2, subs_options::subs_algebraic);
+	ex e = ex(x*x*x*y*y).subs(x*y==2, subs_options::algebraic);
 	if (e != 4*x) {
-		clog << "(x^3*y^2).subs(x*y==2,subs_options::subs_algebraic) erroneously returned " << e << endl;
+		clog << "(x^3*y^2).subs(x*y==2,subs_options::algebraic) erroneously returned " << e << endl;
 		++result;
 	}
 
-	e = ex(x*x*x*x*x).subs(x*x==y, subs_options::subs_algebraic);
+	e = ex(x*x*x*x*x).subs(x*x==y, subs_options::algebraic);
 	if (e != y*y*x) {
-		clog << "x^5.subs(x^2==y,subs_options::subs_algebraic) erroneously returned " << e << endl;
+		clog << "x^5.subs(x^2==y,subs_options::algebraic) erroneously returned " << e << endl;
 		++result;
 	}
-	
+
+	e=x*x*y;
+	if (!e.has(x*y, has_options::algebraic))
+	{	clog << "(x^2*y).has(x*y, has_options::algebraic) erroneously returned false." << endl;
+		++result;
+	}
+
+	if (e.has(x*y*y, has_options::algebraic))
+	{	clog << "(x^2*y).has(x*y*y, has_options::algebraic) erroneously returned true." << endl;
+		++result;
+	}
+
+	e=x*x*x*y;
+	if (!e.has(x*x, has_options::algebraic))
+	{	clog << "(x^3*y).has(x*x, has_options::algebraic) erroneously returned false." << endl;
+		++result;
+	}
+
+	if (e.has(y*y, has_options::algebraic))
+	{	clog << "(x^3*y).has(y*y, has_options::algebraic) erroneously returned true." << endl;
+		++result;
+	}
+
 	return result;
 }
 
@@ -269,7 +303,6 @@ unsigned exam_misc()
 	unsigned result = 0;
 	
 	cout << "examining miscellaneous other things" << flush;
-	clog << "----------miscellaneous other things:" << endl;
 	
 	result += exam_expand_subs();  cout << '.' << flush;
 	result += exam_expand_subs2();  cout << '.' << flush;
@@ -280,12 +313,10 @@ unsigned exam_misc()
 	result += exam_joris(); cout << '.' << flush;
 	result += exam_subs_algebraic(); 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_misc();
+}