- Partially solves performance regression in expand(), gcd(), etc [Sheplyakov].

[ginac.git] / check / exam_misc.cpp

diff --git a/check/exam_misc.cpp b/check/exam_misc.cpp
index 6866f44af1e38cce27a5a33440a6d12f42c93f38..29febf644e8cf47851c31334e3e82745d4d745de 100644 (file)
--- a/check/exam_misc.cpp
+++ b/check/exam_misc.cpp
@@ -3,7 +3,7 @@
  */
 
 /*
- *  GiNaC Copyright (C) 1999-2004 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,7 +17,7 @@
  *
  *  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
  */
 
 
@@ -249,18 +249,40 @@ 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::subs_algebraic);
+       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::subs_algebraic) erroneously returned " << e << endl;
+               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::subs_algebraic);
+       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::subs_algebraic) erroneously returned " << e << endl;
+               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;
 }