Update AUTHORS file...

[ginac.git] / check / exam_misc.cpp

diff --git a/check/exam_misc.cpp b/check/exam_misc.cpp
index 29febf644e8cf47851c31334e3e82745d4d745de..93b6f8e7d2de414eefb707babcb54b1ef6960c0f 100644 (file)
--- a/check/exam_misc.cpp
+++ b/check/exam_misc.cpp
@@ -3,7 +3,7 @@
  */
 
 /*
- *  GiNaC Copyright (C) 1999-2007 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
@@ -20,8 +20,11 @@
  *  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()
@@ -86,49 +89,6 @@ static unsigned exam_expand_power()
        return result;
 }
 
-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));
-       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;
-}
-
 /* Arithmetic Operators should behave just as one expects from built-in types.
  * 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
@@ -161,7 +121,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 +176,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)))) {
@@ -291,23 +260,19 @@ 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;
        result += exam_subs(); cout << '.' << flush;
        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();
+}