X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Fexam_normalization.cpp;h=0aafa4999437ef695ecf92d5685445c5fc14bac3;hp=98e1d7c56f96ae18c577096e6eef871cef1c6cf6;hb=c1285bb62f3a86454ca26260cf8b4352238a1fc5;hpb=f4ea690a3f118bf364190f0ef3c3f6d2ccdf6206

diff --git a/check/exam_normalization.cpp b/check/exam_normalization.cpp
index 98e1d7c5..0aafa499 100644
--- a/check/exam_normalization.cpp
+++ b/check/exam_normalization.cpp
@@ -3,7 +3,7 @@
  *  Rational function normalization test suite. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2003 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
@@ -26,155 +26,155 @@ static symbol w("w"), x("x"), y("y"), z("z");
 
 static unsigned check_normal(const ex &e, const ex &d)
 {
-    ex en = e.normal();
-    if (en.compare(d) != 0) {
-        clog << "normal form of " << e << " erroneously returned "
-             << en << " (should be " << d << ")" << endl;
-        return 1;
-    }
-    return 0;
+	ex en = e.normal();
+	if (en.compare(d) != 0) {
+		clog << "normal form of " << e << " erroneously returned "
+		     << en << " (should be " << d << ")" << endl;
+		return 1;
+	}
+	return 0;
 }
 
-static unsigned exam_normal1(void)
+static unsigned exam_normal1()
 {
-    unsigned result = 0;
-    ex e, d;
-    
-    // Expansion
-    e = pow(x, 2) - (x+1)*(x-1) - 1;
-    d = ex(0);
-    result += check_normal(e, d);
-    
-    // Expansion inside functions
-    e = sin(x*(x+1)-x) + 1;
-    d = sin(pow(x, 2)) + 1;
-    result += check_normal(e, d);
-    
-    // Fraction addition
-    e = 2/x + y/3;
-    d = (x*y + 6) / (x*3);
-    result += check_normal(e, d);
-    
-    e = pow(x, -1) + x/(x+1);
-    d = (pow(x, 2)+x+1)/(x*(x+1));
-    result += check_normal(e, d);
+	unsigned result = 0;
+	ex e, d;
+	
+	// Expansion
+	e = pow(x, 2) - (x+1)*(x-1) - 1;
+	d = 0;
+	result += check_normal(e, d);
+	
+	// Expansion inside functions
+	e = sin(x*(x+1)-x) + 1;
+	d = sin(pow(x, 2)) + 1;
+	result += check_normal(e, d);
+	
+	// Fraction addition
+	e = 2/x + y/3;
+	d = (x*y + 6) / (x*3);
+	result += check_normal(e, d);
+	
+	e = pow(x, -1) + x/(x+1);
+	d = (pow(x, 2)+x+1)/(x*(x+1));
+	result += check_normal(e, d);
 
-    return result;
+	return result;
 }
 
-static unsigned exam_normal2(void)
+static unsigned exam_normal2()
 {
-    unsigned result = 0;
-    ex 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);
-    
-    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);
-    
-    return result;
+	unsigned result = 0;
+	ex 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);
+	
+	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);
+	
+	return result;
 }
 
-static unsigned exam_normal3(void)
+static unsigned exam_normal3()
 {
-    unsigned result = 0;
-    ex e, d;
-    
-    // Distribution of powers
-    e = pow(x/y, 2);
-    d = pow(x, 2) / pow(y, 2);
-    result += check_normal(e, d);
-    
-    // Distribution of powers (integer, distribute) and fraction addition
-    e = pow(pow(x, -1) + x, 2);
-    d = pow(pow(x, 2) + 1, 2) / pow(x, 2);
-    result += check_normal(e, d);
-    
-    // Distribution of powers (non-integer, don't distribute) and fraction addition
-    e = pow(pow(x, -1) + x, numeric(1)/2);
-    d = pow((pow(x, 2) + 1) / x, numeric(1)/2);
-    result += check_normal(e, d);
-    
-    return result;
+	unsigned result = 0;
+	ex e, d;
+	
+	// Distribution of powers
+	e = pow(x/y, 2);
+	d = pow(x, 2) / pow(y, 2);
+	result += check_normal(e, d);
+	
+	// Distribution of powers (integer, distribute) and fraction addition
+	e = pow(pow(x, -1) + x, 2);
+	d = pow(pow(x, 2) + 1, 2) / pow(x, 2);
+	result += check_normal(e, d);
+	
+	// Distribution of powers (non-integer, don't distribute) and fraction addition
+	e = pow(pow(x, -1) + x, numeric(1)/2);
+	d = pow((pow(x, 2) + 1) / x, numeric(1)/2);
+	result += check_normal(e, d);
+	
+	return result;
 }
 
-static unsigned exam_normal4(void)
+static unsigned exam_normal4()
 {
-    unsigned result = 0;
-    ex e, d;
-    
-    // Replacement of functions with temporary symbols and fraction cancellation
-    e = pow(sin(x), 2) - pow(cos(x), 2);
-    e /= sin(x) + cos(x);
-    d = sin(x) - cos(x);
-    result += check_normal(e, d);
-    
-    // Replacement of non-integer powers with temporary symbols
-    e = (pow(numeric(2), numeric(1)/2) * x + x) / x;
-    d = pow(numeric(2), numeric(1)/2) + 1;
-    result += check_normal(e, d);
-    
-    // Replacement of complex numbers with temporary symbols
-    e = (x + y + x*I + y*I) / (x + y);
-    d = 1 + I;
-    result += check_normal(e, d);
-    
-    e = (pow(x, 2) + pow(y, 2)) / (x + y*I);
-    d = e;
-    result += check_normal(e, d);
-    
-    // More complex rational function
-    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);
-    
-    return result;
+	unsigned result = 0;
+	ex e, d;
+	
+	// Replacement of functions with temporary symbols and fraction cancellation
+	e = pow(sin(x), 2) - pow(cos(x), 2);
+	e /= sin(x) + cos(x);
+	d = sin(x) - cos(x);
+	result += check_normal(e, d);
+	
+	// Replacement of non-integer powers with temporary symbols
+	e = (pow(numeric(2), numeric(1)/2) * x + x) / x;
+	d = pow(numeric(2), numeric(1)/2) + 1;
+	result += check_normal(e, d);
+	
+	// Replacement of complex numbers with temporary symbols
+	e = (x + y + x*I + y*I) / (x + y);
+	d = 1 + I;
+	result += check_normal(e, d);
+	
+	e = (pow(x, 2) + pow(y, 2)) / (x + y*I);
+	d = e;
+	result += check_normal(e, d);
+	
+	// More complex rational function
+	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);
+	
+	return result;
 }
 
-unsigned exam_normalization(void)
+unsigned exam_normalization()
 {
-    unsigned result = 0;
-    
-    cout << "examining rational function normalization" << flush;
-    clog << "----------rational function normalization:" << endl;
-    
-    result += exam_normal1();  cout << '.' << flush;
-    result += exam_normal2();  cout << '.' << flush;
-    result += exam_normal3();  cout << '.' << flush;
-    result += exam_normal4();  cout << '.' << flush;
-    
-    if (!result) {
-        cout << " passed " << endl;
-        clog << "(no output)" << endl;
-    } else {
-        cout << " failed " << endl;
-    }
-    
-    return result;
+	unsigned result = 0;
+	
+	cout << "examining rational function normalization" << flush;
+	clog << "----------rational function normalization:" << endl;
+	
+	result += exam_normal1();  cout << '.' << flush;
+	result += exam_normal2();  cout << '.' << flush;
+	result += exam_normal3();  cout << '.' << flush;
+	result += exam_normal4();  cout << '.' << flush;
+	
+	if (!result) {
+		cout << " passed " << endl;
+		clog << "(no output)" << endl;
+	} else {
+		cout << " failed " << endl;
+	}
+	
+	return result;
 }