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

[ginac.git] / check / differentiation.cpp

diff --git a/check/differentiation.cpp b/check/differentiation.cpp
index 0d963fed8b0f6d830a56063f71859a9a6786d561..ece8bc376eb4ce9d70bb952d8afe2c517b218e57 100644 (file)
--- a/check/differentiation.cpp
+++ b/check/differentiation.cpp
@@ -21,13 +21,16 @@
  */
 
 #include <ginac/ginac.h>
  */
 
 #include <ginac/ginac.h>

+
+#ifndef NO_GINAC_NAMESPACE

 using namespace GiNaC;
 using namespace GiNaC;

+#endif // ndef NO_GINAC_NAMESPACE

 
 static unsigned check_diff(const ex &e, const symbol &x,
                            const ex &d, unsigned nth=1)
 {
     ex ed = e.diff(x, nth);
 
 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 ";
         switch (nth) {
         case 0:
             clog << "zeroth ";


@@ -255,13 +258,13 @@ static unsigned differentiation6(void)
     symbol x("x");
     ex e, d, ed;
     
     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 = e.diff(x);
     ed = static_cast<series *>(ed.bp)->convert_to_poly();
     d = static_cast<series *>(d.bp)->convert_to_poly();
     

-    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;
         clog << "derivative of " << e << " by " << x << " returned "
              << ed << " instead of " << d << ")" << endl;
         return 1;