Use initializer lists to construct container<>, lst.

[ginac.git] / check / exam_misc.cpp

diff --git a/check/exam_misc.cpp b/check/exam_misc.cpp
index 2d0f29e152c21f80a6e8a52480dbec6acf61b1ed..50837cef3001b28d1bdfd5e8d68cf0f6dd990dc2 100644 (file)
--- a/check/exam_misc.cpp
+++ b/check/exam_misc.cpp
@@ -3,7 +3,7 @@
  */
 
 /*
- *  GiNaC Copyright (C) 1999-2008 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,11 +20,12 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <iostream>
 #include "ginac.h"
-using namespace std;
 using namespace GiNaC;
 
+#include <iostream>
+using namespace std;
+
 #define VECSIZE 30
 static unsigned exam_expand_subs()
 {
@@ -95,7 +96,7 @@ static unsigned exam_sqrfree()
        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;
@@ -109,19 +110,19 @@ static unsigned exam_sqrfree()
                     << 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;
@@ -218,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)))) {