- added ex::to_rational() to convert general expression to rational expression

[ginac.git] / ginac / expairseq.h

diff --git a/ginac/expairseq.h b/ginac/expairseq.h
index f50395396d0e71b61e5208ec77e3a9f415a291ee..6284ce28bee1459834e8cb29e9c53abe120687ab 100644 (file)
--- a/ginac/expairseq.h
+++ b/ginac/expairseq.h
@@ -31,9 +31,9 @@
 
 #include "expair.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 //#define EXPAIRSEQ_USE_HASHTAB
 
@@ -102,9 +102,10 @@ public:
     ex eval(int level=0) const;
     ex evalf(int level=0) const;
     ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
-    ex diff(const symbol & s) const;
+    ex to_rational(lst &repl_lst) const;
     ex subs(const lst & ls, const lst & lr) const;
 protected:
+    ex derivative(const symbol & s) const;
     int compare_same_type(const basic & other) const;
     bool is_equal_same_type(const basic & other) const;
     unsigned return_type(void) const;
@@ -165,7 +166,8 @@ protected:
                             vector<bool> & touched,
                             unsigned & number_of_zeroes);
     bool has_coeff_0(void) const;
-    void add_numerics_to_hashtab(epvector::iterator first_numeric,                                              epvector::const_iterator last_non_zero);
+    void add_numerics_to_hashtab(epvector::iterator first_numeric,
+                                 epvector::const_iterator last_non_zero);
 #endif // def EXPAIRSEQ_USE_HASHTAB
     bool is_canonical() const;
     epvector * expandchildren(unsigned options) const;
@@ -202,8 +204,8 @@ inline const expairseq &ex_to_expairseq(const ex &e)
        return static_cast<const expairseq &>(*e.bp);
 }
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_EXPAIRSEQ_H__