X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=check%2Fexam_normalization.cpp;h=d98dec681a79d9071d03ccc3cfd300f36545cdcc;hb=94719f5adbfa69fed0023284811da9d749ddf9f1;hp=6a931db5b54e03bea76af89ee5745e450155b7c5;hpb=7d870583a6bf21a2ffb7b6f051b702064623892e;p=ginac.git diff --git a/check/exam_normalization.cpp b/check/exam_normalization.cpp index 6a931db5..d98dec68 100644 --- a/check/exam_normalization.cpp +++ b/check/exam_normalization.cpp @@ -3,7 +3,7 @@ * Rational function normalization test suite. */ /* - * 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 #include "ginac.h" -using namespace std; using namespace GiNaC; +#include +using namespace std; + static symbol w("w"), x("x"), y("y"), z("z"); static unsigned check_normal(const ex &e, const ex &d) @@ -162,7 +163,12 @@ static unsigned exam_normal4() e = (pow(x-y*2,4)/pow(pow(x,2)-pow(y,2)*4,2)+1)*(x+y*2)*(y+z)/(pow(x,2)+pow(y,2)*4); d = (y*2 + z*2) / (x + y*2); result += check_normal(e, d); - + + // Replacement of nested functions with temporary symbols + e = x/(sqrt(sin(z)-1)) + y/(sqrt(sin(z)-1)); + d = (x + y)/(sqrt(sin(z)-1)); + result += check_normal(e, d); + return result; }