- Banned exZERO(), exONE(), exMINUSHALF() and all this from the interface.

[ginac.git] / check / series_expansion.cpp

diff --git a/check/series_expansion.cpp b/check/series_expansion.cpp
index b67705d7a3a5e1b567b4bf66688f2c3fe68faa2c..b8e80204606a52620e8b000f331583ed3f49f9df 100644 (file)
--- a/check/series_expansion.cpp
+++ b/check/series_expansion.cpp
@@ -32,7 +32,7 @@ static unsigned check_series(const ex &e, const ex &point, const ex &d, int orde
 {
     ex es = e.series(x, point, order);
     ex ep = static_cast<series *>(es.bp)->convert_to_poly();
 {
     ex es = e.series(x, point, order);
     ex ep = static_cast<series *>(es.bp)->convert_to_poly();

-    if ((ep - d).compare(exZERO()) != 0) {
+    if (!(ep - d).is_zero()) {

         clog << "series expansion of " << e << " at " << point
              << " erroneously returned " << ep << " (instead of " << d
              << ")" << endl;
         clog << "series expansion of " << e << " at " << point
              << " erroneously returned " << ep << " (instead of " << d
              << ")" << endl;


@@ -50,57 +50,57 @@ static unsigned series1(void)
     
     e = sin(x);
     d = x - pow(x, 3) / 6 + pow(x, 5) / 120 - pow(x, 7) / 5040 + Order(pow(x, 8));
     
     e = sin(x);
     d = x - pow(x, 3) / 6 + pow(x, 5) / 120 - pow(x, 7) / 5040 + Order(pow(x, 8));

-    result += check_series(e, exZERO(), d);
+    result += check_series(e, 0, d);

     
     e = cos(x);
     d = 1 - pow(x, 2) / 2 + pow(x, 4) / 24 - pow(x, 6) / 720 + Order(pow(x, 8));
     
     e = cos(x);
     d = 1 - pow(x, 2) / 2 + pow(x, 4) / 24 - pow(x, 6) / 720 + Order(pow(x, 8));

-    result += check_series(e, exZERO(), d);
+    result += check_series(e, 0, d);

     
     e = exp(x);
     d = 1 + x + pow(x, 2) / 2 + pow(x, 3) / 6 + pow(x, 4) / 24 + pow(x, 5) / 120 + pow(x, 6) / 720 + pow(x, 7) / 5040 + Order(pow(x, 8));
     
     e = exp(x);
     d = 1 + x + pow(x, 2) / 2 + pow(x, 3) / 6 + pow(x, 4) / 24 + pow(x, 5) / 120 + pow(x, 6) / 720 + pow(x, 7) / 5040 + Order(pow(x, 8));

-    result += check_series(e, exZERO(), d);
+    result += check_series(e, 0, d);

     
     e = pow(1 - x, -1);
     d = 1 + x + pow(x, 2) + pow(x, 3) + pow(x, 4) + pow(x, 5) + pow(x, 6) + pow(x, 7) + Order(pow(x, 8));
     
     e = pow(1 - x, -1);
     d = 1 + x + pow(x, 2) + pow(x, 3) + pow(x, 4) + pow(x, 5) + pow(x, 6) + pow(x, 7) + Order(pow(x, 8));

-    result += check_series(e, exZERO(), d);
+    result += check_series(e, 0, d);

     
     e = x + pow(x, -1);
     d = x + pow(x, -1);
     
     e = x + pow(x, -1);
     d = x + pow(x, -1);

-    result += check_series(e, exZERO(), d);
+    result += check_series(e, 0, d);

     
     e = x + pow(x, -1);
     d = 2 + pow(x-1, 2) - pow(x-1, 3) + pow(x-1, 4) - pow(x-1, 5) + pow(x-1, 6) - pow(x-1, 7) + Order(pow(x-1, 8));
     
     e = x + pow(x, -1);
     d = 2 + pow(x-1, 2) - pow(x-1, 3) + pow(x-1, 4) - pow(x-1, 5) + pow(x-1, 6) - pow(x-1, 7) + Order(pow(x-1, 8));

-    result += check_series(e, exONE(), d);
+    result += check_series(e, 1, d);

     
     e = pow(x + pow(x, 3), -1);
     d = pow(x, -1) - x + pow(x, 3) - pow(x, 5) + Order(pow(x, 7));
     
     e = pow(x + pow(x, 3), -1);
     d = pow(x, -1) - x + pow(x, 3) - pow(x, 5) + Order(pow(x, 7));

-    result += check_series(e, exZERO(), d);
+    result += check_series(e, 0, d);

     
     e = pow(pow(x, 2) + pow(x, 4), -1);
     d = pow(x, -2) - 1 + pow(x, 2) - pow(x, 4) + Order(pow(x, 6));
     
     e = pow(pow(x, 2) + pow(x, 4), -1);
     d = pow(x, -2) - 1 + pow(x, 2) - pow(x, 4) + Order(pow(x, 6));

-    result += check_series(e, exZERO(), d);
+    result += check_series(e, 0, d);

     
     e = pow(sin(x), -2);
     d = pow(x, -2) + numeric(1,3) + pow(x, 2) / 15 + pow(x, 4) * 2/189 + Order(pow(x, 5));
     
     e = pow(sin(x), -2);
     d = pow(x, -2) + numeric(1,3) + pow(x, 2) / 15 + pow(x, 4) * 2/189 + Order(pow(x, 5));

-    result += check_series(e, exZERO(), d);
+    result += check_series(e, 0, d);

     
     e = sin(x) / cos(x);
     d = x + pow(x, 3) / 3 + pow(x, 5) * 2/15 + pow(x, 7) * 17/315 + Order(pow(x, 8));
     
     e = sin(x) / cos(x);
     d = x + pow(x, 3) / 3 + pow(x, 5) * 2/15 + pow(x, 7) * 17/315 + Order(pow(x, 8));

-    result += check_series(e, exZERO(), d);
+    result += check_series(e, 0, d);

     
     e = cos(x) / sin(x);
     d = pow(x, -1) - x / 3 - pow(x, 3) / 45 - pow(x, 5) * 2/945 + Order(pow(x, 6));
     
     e = cos(x) / sin(x);
     d = pow(x, -1) - x / 3 - pow(x, 3) / 45 - pow(x, 5) * 2/945 + Order(pow(x, 6));

-    result += check_series(e, exZERO(), d);
+    result += check_series(e, 0, d);

     
     e = pow(numeric(2), x);
     ex t = log(ex(2)) * x;
     d = 1 + t + pow(t, 2) / 2 + pow(t, 3) / 6 + pow(t, 4) / 24 + pow(t, 5) / 120 + pow(t, 6) / 720 + pow(t, 7) / 5040 + Order(pow(x, 8));
     
     e = pow(numeric(2), x);
     ex t = log(ex(2)) * x;
     d = 1 + t + pow(t, 2) / 2 + pow(t, 3) / 6 + pow(t, 4) / 24 + pow(t, 5) / 120 + pow(t, 6) / 720 + pow(t, 7) / 5040 + Order(pow(x, 8));

-    result += check_series(e, exZERO(), d.expand());
+    result += check_series(e, 0, d.expand());

     
     e = pow(Pi, x);
     t = log(Pi) * x;
     d = 1 + t + pow(t, 2) / 2 + pow(t, 3) / 6 + pow(t, 4) / 24 + pow(t, 5) / 120 + pow(t, 6) / 720 + pow(t, 7) / 5040 + Order(pow(x, 8));
     
     e = pow(Pi, x);
     t = log(Pi) * x;
     d = 1 + t + pow(t, 2) / 2 + pow(t, 3) / 6 + pow(t, 4) / 24 + pow(t, 5) / 120 + pow(t, 6) / 720 + pow(t, 7) / 5040 + Order(pow(x, 8));

-    result += check_series(e, exZERO(), d.expand());
+    result += check_series(e, 0, d.expand());

     
     return result;
 }
     
     return result;
 }


@@ -111,9 +111,9 @@ static unsigned series2(void)
     unsigned result = 0;
     ex e, d;
     
     unsigned result = 0;
     ex e, d;
     

-    e = pow(sin(x), -1).series(x, exZERO(), 8) + pow(sin(-x), -1).series(x, exZERO(), 12);
+    e = pow(sin(x), -1).series(x, 0, 8) + pow(sin(-x), -1).series(x, 0, 12);

     d = Order(pow(x, 6));
     d = Order(pow(x, 6));

-    result += check_series(e, exZERO(), d);
+    result += check_series(e, 0, d);

     
     return result;
 }
     
     return result;
 }


@@ -124,9 +124,9 @@ static unsigned series3(void)
     unsigned result = 0;
     ex e, d;
     
     unsigned result = 0;
     ex e, d;
     

-    e = sin(x).series(x, exZERO(), 8) * pow(sin(x), -1).series(x, exZERO(), 12);
+    e = sin(x).series(x, 0, 8) * pow(sin(x), -1).series(x, 0, 12);

     d = 1 + Order(pow(x, 7));
     d = 1 + Order(pow(x, 7));

-    result += check_series(e, exZERO(), d);
+    result += check_series(e, 0, d);

     
     return result;
 }
     
     return result;
 }