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=17101bc5fcb2370983be434283e7f3706b4a5d9e;hb=f7884835d397de85e648d1957c058b7d4c0948ba;hpb=86639cca6eecbdf16ed3a5428351f3bb63804cac

diff --git a/check/exam_misc.cpp b/check/exam_misc.cpp
index 17101bc5..13152f27 100644
--- a/check/exam_misc.cpp
+++ b/check/exam_misc.cpp
@@ -3,7 +3,7 @@
  */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 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,14 +17,17 @@
  *
  *  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(void)
+static unsigned exam_expand_subs()
 {
 	unsigned result = 0;
 	symbol a[VECSIZE];
@@ -51,7 +54,7 @@ static unsigned exam_expand_subs(void)
  *  2)  expand e
  *  3)  substitute a0 by -a1 in e
  *  after which e should return 0 (without expanding). */
-static unsigned exam_expand_subs2(void)
+static unsigned exam_expand_subs2()
 {
 	unsigned result = 0;
 	symbol a("a"), b("b");
@@ -69,7 +72,7 @@ static unsigned exam_expand_subs2(void)
 	return result;
 }
 
-static unsigned exam_expand_power(void)
+static unsigned exam_expand_power()
 {
 	unsigned result = 0;
 	symbol x("x"), a("a"), b("b");
@@ -86,14 +89,14 @@ static unsigned exam_expand_power(void)
 	return result;
 }
 
-static unsigned exam_sqrfree(void)
+static unsigned exam_sqrfree()
 {
 	unsigned result = 0;
 	symbol x("x"), y("y");
 	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(void)
 		     << 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;
@@ -133,7 +136,7 @@ static unsigned exam_sqrfree(void)
  * When somebody screws up the operators this routine will most probably fail
  * to compile.  Unfortunately we can only test the stuff that is allowed, not
  * what is forbidden (e.g. e1+e2 = 42) since that must not compile.  :-(   */
-static unsigned exam_operator_semantics(void)
+static unsigned exam_operator_semantics()
 {
 	unsigned result = 0;
 	ex e1, e2;
@@ -161,7 +164,7 @@ static unsigned exam_operator_semantics(void)
 		++result;
 	}
 	
-	// Prefix/postfix increment/decrement behaviour:
+	// Prefix/postfix increment/decrement behavior:
 	e1 = 7; e2 = 4;
 	i1 = 7; i2 = 4;
 	e1 = (--e2 = 2)++;
@@ -191,7 +194,7 @@ static unsigned exam_operator_semantics(void)
 	// (which incidentally was severely broken from version 0.7.3 to 0.8.2).
 	ex selfprobe = numeric("65536");
 	selfprobe = selfprobe;
-	if (!is_ex_exactly_of_type(selfprobe, numeric)) {
+	if (!is_exactly_a<numeric>(selfprobe)) {
 		clog << "ex (of numeric) after self-assignment became " << selfprobe << endl;
 		++result;
 	}
@@ -199,25 +202,121 @@ static unsigned exam_operator_semantics(void)
 	return result;
 }
 
-unsigned exam_misc(void)
+/* This checks whether subs() works as intended in some special cases. */
+static unsigned exam_subs()
+{
+	unsigned result = 0;
+	symbol x("x");
+	ex e1, e2;
+
+	// This used to fail in GiNaC 1.0.5 because it first substituted
+	// x+1 -> (x-1)+1 -> x, and then substituted again x -> x-1, giving
+	// the wrong result
+	e1 = x+1;
+	e2 = e1.subs(x == x-1);
+	if (!e2.is_equal(x)) {
+		clog << "(x+1).subs(x==x-1) erroneously returned " << e2 << " instead of x" << endl;
+		++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)))) {
+		clog << "sin(1+sin(x)).subs(sin($1)==cos($1)) erroneously returned " << e2 << " instead of cos(1+cos(x))" << endl;
+		++result;
+	}
+
+	return result;
+}
+
+/* Joris van der Hoeven (he of TeXmacs fame) is a funny guy.  He has his own
+ * ideas what a symbolic system should do.  Let's make sure we won't disappoint
+ * him some day.  Incidentally, this seems to always have worked. */
+static unsigned exam_joris()
+{
+	unsigned result = 0;
+	symbol x("x");
+
+	ex e = expand(pow(x, x-1) * x);
+	if (e != pow(x, x)) {
+		clog << "x^(x-1)*x did not expand to x^x.  Please call Joris!" << endl;
+		++result;
+	}
+
+	return result;
+}
+
+/* Test Chris Dams' algebraic substitutions. */
+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::algebraic);
+	if (e != 4*x) {
+		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::algebraic);
+	if (e != y*y*x) {
+		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;
+}
+
+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;
 	result += exam_expand_power(); cout << '.' << flush;
 	result += exam_sqrfree(); cout << '.' << flush;
 	result += exam_operator_semantics(); cout << '.' << flush;
-	
-	if (!result) {
-		cout << " passed " << endl;
-		clog << "(no output)" << endl;
-	} else {
-		cout << " failed " << endl;
-	}
+	result += exam_subs(); cout << '.' << flush;
+	result += exam_joris(); cout << '.' << flush;
+	result += exam_subs_algebraic(); cout << '.' << flush;
 	
 	return result;
 }
+
+int main(int argc, char** argv)
+{
+	return exam_misc();
+}