match() (find()): use exmap (exset) to store matched subexpressions.

[ginac.git] / check / exam_differentiation.cpp

diff --git a/check/exam_differentiation.cpp b/check/exam_differentiation.cpp
index 331d3649131cc28335d61f3287fa177a3070b375..2b5a595650388afddcad9f274bd9f1c8a8f07871 100644 (file)
--- a/check/exam_differentiation.cpp
+++ b/check/exam_differentiation.cpp
@@ -3,7 +3,7 @@
  *  Tests for symbolic differentiation, including various functions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2002 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,16 +17,19 @@
  *
  *  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 unsigned check_diff(const ex &e, const symbol &x,
                                                   const ex &d, unsigned nth=1)
 {
        ex ed = e.diff(x, nth);
-       if ((ed - d).compare(ex(0)) != 0) {
+       if (!(ed - d).is_zero()) {
                switch (nth) {
                case 0:
                        clog << "zeroth ";
@@ -45,9 +48,7 @@ static unsigned check_diff(const ex &e, const symbol &x,
                clog << "derivative of " << e << " by " << x << " returned "
                     << ed << " instead of " << d << endl;
                clog << "returned:" << endl;
-               ed.printtree(clog);
-               clog << endl << "instead of" << endl;
-               d.printtree(clog);
+               clog << tree << ed << "instead of\n" << d << dflt;
 
                return 1;
        }
@@ -55,7 +56,7 @@ static unsigned check_diff(const ex &e, const symbol &x,
 }
 
 // Simple (expanded) polynomials
-static unsigned exam_differentiation1(void)
+static unsigned exam_differentiation1()
 {
        unsigned result = 0;
        symbol x("x"), y("y");
@@ -86,7 +87,7 @@ static unsigned exam_differentiation1(void)
 }
 
 // Trigonometric functions
-static unsigned exam_differentiation2(void)
+static unsigned exam_differentiation2()
 {
        unsigned result = 0;
        symbol x("x"), y("y"), a("a"), b("b");
@@ -135,7 +136,7 @@ static unsigned exam_differentiation2(void)
 }
        
 // exp function
-static unsigned exam_differentiation3(void)
+static unsigned exam_differentiation3()
 {
        unsigned result = 0;
        symbol x("x"), y("y"), a("a"), b("b");
@@ -163,7 +164,7 @@ static unsigned exam_differentiation3(void)
 }
 
 // log functions
-static unsigned exam_differentiation4(void)
+static unsigned exam_differentiation4()
 {
        unsigned result = 0;
        symbol x("x"), y("y"), a("a"), b("b");
@@ -193,7 +194,7 @@ static unsigned exam_differentiation4(void)
 }
 
 // Functions with two variables
-static unsigned exam_differentiation5(void)
+static unsigned exam_differentiation5()
 {
        unsigned result = 0;
        symbol x("x"), y("y"), a("a"), b("b");
@@ -214,7 +215,7 @@ static unsigned exam_differentiation5(void)
 }
 
 // Series
-static unsigned exam_differentiation6(void)
+static unsigned exam_differentiation6()
 {
        symbol x("x");
        ex e, d, ed;
@@ -225,7 +226,7 @@ static unsigned exam_differentiation6(void)
        ed = series_to_poly(ed);
        d = series_to_poly(d);
        
-       if ((ed - d).compare(ex(0)) != 0) {
+       if (!(ed - d).is_zero()) {
                clog << "derivative of " << e << " by " << x << " returned "
                     << ed << " instead of " << d << ")" << endl;
                return 1;
@@ -234,7 +235,7 @@ static unsigned exam_differentiation6(void)
 }
 
 // Hashing can help a lot, if differentiation is done cleverly
-static unsigned exam_differentiation7(void)
+static unsigned exam_differentiation7()
 {
        symbol x("x");
        ex P = x + pow(x,3);
@@ -257,12 +258,11 @@ static unsigned exam_differentiation7(void)
        return 0;
 }
 
-unsigned exam_differentiation(void)
+unsigned exam_differentiation()
 {
        unsigned result = 0;
        
        cout << "examining symbolic differentiation" << flush;
-       clog << "----------symbolic differentiation:" << endl;
        
        result += exam_differentiation1();  cout << '.' << flush;
        result += exam_differentiation2();  cout << '.' << flush;
@@ -272,11 +272,10 @@ unsigned exam_differentiation(void)
        result += exam_differentiation6();  cout << '.' << flush;
        result += exam_differentiation7();  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_differentiation();
+}