X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Fdifferentiation.cpp;h=307bd59a6e0e4d6c85930b3281dc9738ac6e073e;hp=0d963fed8b0f6d830a56063f71859a9a6786d561;hb=ff6822e9aa640a0ee6eeb653e891a236a19a1e64;hpb=be0485a03e9886496eeb7e8cdc2cc5c95b848632;ds=sidebyside

diff --git a/check/differentiation.cpp b/check/differentiation.cpp
index 0d963fed..307bd59a 100644
--- a/check/differentiation.cpp
+++ b/check/differentiation.cpp
@@ -3,7 +3,7 @@
  *  Tests for symbolic differentiation, including various functions. */
 
 /*
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2000 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
@@ -20,14 +20,17 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <ginac/ginac.h>
+#include "ginac.h"
+
+#ifndef NO_NAMESPACE_GINAC
 using namespace GiNaC;
+#endif // ndef NO_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(exZERO()) != 0) {
+    if ((ed - d).compare(ex(0)) != 0) {
         switch (nth) {
         case 0:
             clog << "zeroth ";
@@ -255,13 +258,13 @@ static unsigned differentiation6(void)
     symbol x("x");
     ex e, d, ed;
     
-    e = sin(x).series(x, exZERO(), 8);
-    d = cos(x).series(x, exZERO(), 7);
+    e = sin(x).series(x, 0, 8);
+    d = cos(x).series(x, 0, 7);
     ed = e.diff(x);
-    ed = static_cast<series *>(ed.bp)->convert_to_poly();
-    d = static_cast<series *>(d.bp)->convert_to_poly();
+    ed = series_to_poly(ed);
+    d = series_to_poly(d);
     
-    if ((ed - d).compare(exZERO()) != 0) {
+    if ((ed - d).compare(ex(0)) != 0) {
         clog << "derivative of " << e << " by " << x << " returned "
              << ed << " instead of " << d << ")" << endl;
         return 1;