X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Fnormalization.cpp;h=814c45be9cdfc80fa00d50be60a7932701d0288c;hp=fa14496a85c38bcd184b220545633330b89ebd12;hb=083b0f50275a536be807fa2a34c1e278098e12f5;hpb=84806997c064f7429cbec8b446b91445430fb1fb

diff --git a/check/normalization.cpp b/check/normalization.cpp
index fa14496a..814c45be 100644
--- a/check/normalization.cpp
+++ b/check/normalization.cpp
@@ -20,13 +20,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <ginac/ginac.h>
+#include "ginac.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
-static symbol x("x"), y("y"), z("z");
+static symbol w("w"), x("x"), y("y"), z("z");
 
 static unsigned check_normal(const ex &e, const ex &d)
 {
@@ -55,24 +55,44 @@ static unsigned normal1(void)
     result += check_normal(e, d);
     
     // Fraction addition
-    e = numeric(2)/x + y/3;
-    d = (x*y/3 + 2) / x;
+    e = 2/x + y/3;
+    d = (x*y + 6) / (x*3);
     result += check_normal(e, d);
     
-    // Fraction addition
     e = pow(x, -1) + x/(x+1);
     d = (pow(x, 2)+x+1)/(x*(x+1));
     result += check_normal(e, d);
     
     // Fraction cancellation
+	e = numeric(1)/2 * z * (2*x + 2*y);
+	d = z * (x + y);
+	result += check_normal(e, d);
+
+	e = numeric(1)/6 * z * (3*x + 3*y) * (2*x + 2*w);
+	d = z * (x + y) * (x + w);
+	result += check_normal(e, d);
+
+	e = (3*x + 3*y) * (w/3 + z/3);
+	d = (x + y) * (w + z);
+	result += check_normal(e, d);
+
     e = (pow(x, 2) - pow(y, 2)) / pow(x-y, 3);
     d = (x + y) / (pow(x, 2) + pow(y, 2) - x * y * 2);
     result += check_normal(e, d);
     
-    // Fraction cancellation
     e = (pow(x, -1) + x) / (pow(x , 2) * 2 + 2);
     d = pow(x * 2, -1);
     result += check_normal(e, d);
+
+	// Fraction cancellation with rational coefficients
+	e = (pow(x, 2) - pow(y, 2)) / pow(x/2 - y/2, 3);
+	d = (8 * x + 8 * y) / (pow(x, 2) + pow(y, 2) - x * y * 2);
+	result += check_normal(e, d);
+
+	// Fraction cancellation with rational coefficients
+	e = z/5 * (x/7 + y/10) / (x/14 + y/20);
+	d = 2*z/5;
+	result += check_normal(e, d);
     
     // Distribution of powers
     e = pow(x/y, 2);