X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Fexam_misc.cpp;h=29febf644e8cf47851c31334e3e82745d4d745de;hp=1da10b784e2a75ab9bf551e6d695fd5dfa366e71;hb=7d05f39c095dc51cc4526b17a5ab3280f8924219;hpb=1f5afe37b4c079821de9810435fa9fa11e4ea17b

diff --git a/check/exam_misc.cpp b/check/exam_misc.cpp
index 1da10b78..29febf64 100644
--- a/check/exam_misc.cpp
+++ b/check/exam_misc.cpp
@@ -3,7 +3,7 @@
  */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2007 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,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"
 
 #define VECSIZE 30
-static unsigned exam_expand_subs(void)
+static unsigned exam_expand_subs()
 {
 	unsigned result = 0;
 	symbol a[VECSIZE];
@@ -51,7 +51,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 +69,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,7 +86,7 @@ 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");
@@ -133,7 +133,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;
@@ -200,7 +200,7 @@ static unsigned exam_operator_semantics(void)
 }
 
 /* This checks whether subs() works as intended in some special cases. */
-static unsigned exam_subs(void)
+static unsigned exam_subs()
 {
 	unsigned result = 0;
 	symbol x("x");
@@ -226,7 +226,67 @@ static unsigned exam_subs(void)
 	return result;
 }
 
-unsigned exam_misc(void)
+/* 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;
 	
@@ -239,6 +299,8 @@ unsigned exam_misc(void)
 	result += exam_sqrfree(); cout << '.' << flush;
 	result += exam_operator_semantics(); cout << '.' << flush;
 	result += exam_subs(); cout << '.' << flush;
+	result += exam_joris(); cout << '.' << flush;
+	result += exam_subs_algebraic(); cout << '.' << flush;
 	
 	if (!result) {
 		cout << " passed " << endl;