Happy new year!

[ginac.git] / check / exam_normalization.cpp

diff --git a/check/exam_normalization.cpp b/check/exam_normalization.cpp
index c9ceb18ca8400943314e1a06414a986e39f9884b..6a931db5b54e03bea76af89ee5745e450155b7c5 100644 (file)
--- a/check/exam_normalization.cpp
+++ b/check/exam_normalization.cpp
@@ -3,7 +3,7 @@
  *  Rational function normalization test suite. */
 
 /*
- *  GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2008 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,10 +17,13 @@
  *
  *  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
  */
 
-#include "exams.h"
+#include <iostream>
+#include "ginac.h"
+using namespace std;
+using namespace GiNaC;
 
 static symbol w("w"), x("x"), y("y"), z("z");
 
@@ -80,18 +83,24 @@ static unsigned exam_normal2()
        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);
+       // Fails stochastically with the new tinfo mechanism, because
+       // sometimes the equivalent answer ... / pow(y - x, 2) is calculated.
+       // TODO: make check for both cases.
+//     e = (pow(x, 2) - pow(y, 2)) / pow(x-y, 3);
+//     d = (x + y) / pow(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);
        
+       // Fails stochastically with the new tinfo mechanism, because
+       // sometimes the equivalent answer ... / pow(y - x, 2) is calculated.
+       // TODO: make check for both cases.
        // 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);
+//     e = (pow(x, 2) - pow(y, 2)) / pow(x/2 - y/2, 3);
+//     d = (8 * x + 8 * y) / pow(x - y, 2);
+//     result += check_normal(e, d);
        
        // Fraction cancellation with rational coefficients
        e = z/5 * (x/7 + y/10) / (x/14 + y/20);
@@ -203,6 +212,7 @@ static unsigned exam_content()
        result += check_content(5*x-15, x, 5, 5, x-3);
        result += check_content(5*x*y-15*y*y, x, 5, 5*y, x-3*y);
        result += check_content(-15*x/2+ex(25)/3, x, ex(5)/6, ex(5)/6, 9*x-10);
+       result += check_content(-x*y, x, 1, y, x);
 
        return result;
 }
@@ -212,7 +222,6 @@ 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;
@@ -220,12 +229,10 @@ unsigned exam_normalization()
        result += exam_normal4(); cout << '.' << flush;
        result += exam_content(); cout << '.' << flush;
        
-       if (!result) {
-               cout << " passed " << endl;
-               clog << "(no output)" << endl;
-       } else {
-               cout << " failed " << endl;
-       }
-       
        return result;
 }
+
+int main(int argc, char** argv)
+{
+       return exam_normalization();
+}