X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=check%2Fexam_misc.cpp;h=412f5d94122b41ac3b9c7581130db3ad6256cc8e;hb=43e0a8f5ca5e1c48cef5daaf014acdbca4e44568;hp=86bd12abb1e728ecbde9deb3139103a890f14a63;hpb=f4ea690a3f118bf364190f0ef3c3f6d2ccdf6206;p=ginac.git

diff --git a/check/exam_misc.cpp b/check/exam_misc.cpp
index 86bd12ab..412f5d94 100644
--- a/check/exam_misc.cpp
+++ b/check/exam_misc.cpp
@@ -1,8 +1,9 @@
 /** @file exam_misc.cpp
  *
  */
+
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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
@@ -25,27 +26,24 @@
 #define VECSIZE 30
 static unsigned exam_expand_subs(void)
 {
-    unsigned result = 0;
-    symbol a1("a1");
-    symbol a[VECSIZE];
-    ex e, aux;
-    
-    a[1] = a1;
-    for (unsigned i=0; i<VECSIZE; ++i) {
-        e = e + a[i];
-    }
-    
-    // prepare aux so it will swallow anything but a1^2:
-    aux = -e + a[0] + a[1];
-    e = expand(subs(expand(pow(e, 2)), a[0] == aux));
-    
-    if (e != pow(a1,2)) {
-        clog << "Denny Fliegner's quick consistency check erroneously returned "
-             << e << "." << endl;
-        ++result;
-    }
-    
-    return result;
+	unsigned result = 0;
+	symbol a[VECSIZE];
+	ex e, aux;
+	
+	for (unsigned i=0; i<VECSIZE; ++i)
+		e = e + a[i];
+	
+	// prepare aux so it will swallow anything but a1^2:
+	aux = -e + a[0] + a[1];
+	e = expand(subs(expand(pow(e, 2)), a[0] == aux));
+	
+	if (e != pow(a[1],2)) {
+		clog << "Denny Fliegner's quick consistency check erroneously returned "
+		     << e << "." << endl;
+		++result;
+	}
+	
+	return result;
 }
 
 /*  A simple modification of Denny Fliegner's three step consistency test:
@@ -55,38 +53,100 @@ static unsigned exam_expand_subs(void)
  *  after which e should return 0 (without expanding). */
 static unsigned exam_expand_subs2(void)
 {
-    unsigned result = 0;
-    symbol a("a"), b("b");
-    ex e, f;
-    
-    e = pow(a+b,200).expand();
-    f = e.subs(a == -b);
+	unsigned result = 0;
+	symbol a("a"), b("b");
+	ex e, f;
+	
+	e = pow(a+b,200).expand();
+	f = e.subs(a == -b);
+	
+	if (f != 0) {
+		clog << "e = pow(a+b,200).expand(); f = e.subs(a == -b); erroneously returned "
+		     << f << " instead of simplifying to 0." << endl;
+		++result;
+	}
+	
+	return result;
+}
+
+static unsigned exam_expand_power(void)
+{
+	unsigned result = 0;
+	symbol x("x"), a("a"), b("b");
+	ex e;
+	
+	e = pow(x,pow(a+b,2)-pow(a,2)-pow(b,2)-a*b*2).expand();
+	
+	if (e != 1) {
+		clog << "e = pow(x,pow(a+b,2)-pow(a,2)-pow(b,2)-a*b*2).expand(); erroneously returned "
+		     << e << " instead of simplifying to 1." << endl;
+		++result;
+	}
+	
+	return result;
+}
 
-    if (f != 0) {
-        clog << "e = pow(a+b,200).expand(); f = e.subs(a == -b); erroneously returned "
-             << f << " instead of simplifying to 0." << endl;
-        ++result;
-    }
-    
-    return result;
+static unsigned exam_sqrfree(void)
+{
+	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));
+	if (e1 != e2) {
+		clog << "sqrfree(expand(" << e1 << ")) erroneously returned "
+		     << e2 << endl;
+		++result;
+	}
+	
+	e1 = (x+y)*pow((x+2*y),2)*pow((x+3*y),3)*pow((x+4*y),4);
+	e2 = sqrfree(expand(e1));
+	if (e1 != e2) {
+		clog << "sqrfree(expand(" << e1 << ")) erroneously returned "
+		     << e2 << endl;
+		++result;
+	}
+	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));
+	if (e1 != e2) {
+		clog << "sqrfree(expand(" << e1 << "),[y]) erroneously returned "
+		     << e2 << endl;
+		++result;
+	}
+	e2 = sqrfree(expand(e1),lst(x,y));
+	if (e1 != e2) {
+		clog << "sqrfree(expand(" << e1 << "),[x,y]) erroneously returned "
+		     << e2 << endl;
+		++result;
+	}
+	
+	return result;
 }
 
 unsigned exam_misc(void)
 {
-    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;
-    
-    if (!result) {
-        cout << " passed " << endl;
-        clog << "(no output)" << endl;
-    } else {
-        cout << " failed " << endl;
-    }
-    
-    return result;
+	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;
+	
+	if (!result) {
+		cout << " passed " << endl;
+		clog << "(no output)" << endl;
+	} else {
+		cout << " failed " << endl;
+	}
+	
+	return result;
 }