Fix some apparent typos and misindentations.

[ginac.git] / check / exam_misc.cpp

diff --git a/check/exam_misc.cpp b/check/exam_misc.cpp
index 55462c84c7e3dd1c96dc596b59f78b7dae19d3be..cdbb7637b30c2ed92b4c4bd43ef510e7dc592b25 100644 (file)
--- a/check/exam_misc.cpp
+++ b/check/exam_misc.cpp
@@ -3,7 +3,7 @@
  */
 
 /*
- *  GiNaC Copyright (C) 1999-2005 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2015 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()
@@ -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)))) {
@@ -291,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;
@@ -302,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();
+}