- normal() now internally keeps numerator and denominator separated and

[ginac.git] / ginac / basic.h

diff --git a/ginac/basic.h b/ginac/basic.h
index e763de5d63f9e90841b02da38d6cb05708b62022..c54cc3816f49b67ab184b07ac9202d7948ea619d 100644 (file)
--- a/ginac/basic.h
+++ b/ginac/basic.h
@@ -30,14 +30,14 @@
 // CINT needs <algorithm> to work properly with <vector> 
 #include <algorithm>
 
 // CINT needs <algorithm> to work properly with <vector> 
 #include <algorithm>
 

-#include <ginac/flags.h>
-#include <ginac/tinfos.h>
-#include <ginac/assertion.h>
-#include <ginac/registrar.h>
+#include "flags.h"
+#include "tinfos.h"
+#include "assertion.h"
+#include "registrar.h"

 
 

-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC

 namespace GiNaC {
 namespace GiNaC {

-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC

 
 class basic;
 class ex;
 
 class basic;
 class ex;


@@ -137,7 +137,6 @@ public: // only const functions please (may break reference counting)
     virtual ex collect(const symbol & s) const;
     virtual ex eval(int level=0) const;
     virtual ex evalf(int level=0) const;
     virtual ex collect(const symbol & s) const;
     virtual ex eval(int level=0) const;
     virtual ex evalf(int level=0) const;

-    virtual ex diff(const symbol & s) const;

     virtual ex series(const symbol & s, const ex & point, int order) const;
     virtual ex subs(const lst & ls, const lst & lr) const;
     virtual ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
     virtual ex series(const symbol & s, const ex & point, int order) const;
     virtual ex subs(const lst & ls, const lst & lr) const;
     virtual ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;


@@ -147,6 +146,7 @@ public: // only const functions please (may break reference counting)
     virtual exvector get_indices(void) const;
     virtual ex simplify_ncmul(const exvector & v) const;
 protected: // non-const functions should be called from class ex only
     virtual exvector get_indices(void) const;
     virtual ex simplify_ncmul(const exvector & v) const;
 protected: // non-const functions should be called from class ex only

+    virtual ex derivative(const symbol & s) const;

     virtual int compare_same_type(const basic & other) const;
     virtual bool is_equal_same_type(const basic & other) const;
     virtual unsigned return_type(void) const;
     virtual int compare_same_type(const basic & other) const;
     virtual bool is_equal_same_type(const basic & other) const;
     virtual unsigned return_type(void) const;


@@ -157,14 +157,15 @@ protected: // non-const functions should be called from class ex only
     // non-virtual functions in this class
 public:
     ex subs(const ex & e) const;
     // non-virtual functions in this class
 public:
     ex subs(const ex & e) const;

+    ex diff(const symbol & s, unsigned nth=1) const;

     int compare(const basic & other) const;
     bool is_equal(const basic & other) const;
     const basic & hold(void) const;
     unsigned gethash(void) const {if (flags & status_flags::hash_calculated) return hashvalue; else return calchash();}
     unsigned tinfo(void) const {return tinfo_key;}
     int compare(const basic & other) const;
     bool is_equal(const basic & other) const;
     const basic & hold(void) const;
     unsigned gethash(void) const {if (flags & status_flags::hash_calculated) return hashvalue; else return calchash();}
     unsigned tinfo(void) const {return tinfo_key;}

-protected:

     const basic & setflag(unsigned f) const {flags |= f; return *this;}
     const basic & clearflag(unsigned f) const {flags &= ~f; return *this;}
     const basic & setflag(unsigned f) const {flags |= f; return *this;}
     const basic & clearflag(unsigned f) const {flags &= ~f; return *this;}

+protected:

     void ensure_if_modifiable(void) const;
 
 // member variables
     void ensure_if_modifiable(void) const;
 
 // member variables


@@ -190,7 +191,7 @@ extern int max_recursion_level;
 
 // convenience macros
 
 
 // convenience macros
 

-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC

 
 #define is_of_type(OBJ,TYPE) \
     (dynamic_cast<TYPE *>(const_cast<GiNaC::basic *>(&OBJ))!=0)
 
 #define is_of_type(OBJ,TYPE) \
     (dynamic_cast<TYPE *>(const_cast<GiNaC::basic *>(&OBJ))!=0)


@@ -204,7 +205,7 @@ extern int max_recursion_level;
 #define is_ex_exactly_of_type(OBJ,TYPE) \
     ((*(OBJ).bp).tinfo()==GiNaC::TINFO_##TYPE)
 
 #define is_ex_exactly_of_type(OBJ,TYPE) \
     ((*(OBJ).bp).tinfo()==GiNaC::TINFO_##TYPE)
 

-#else // ndef NO_GINAC_NAMESPACE
+#else // ndef NO_NAMESPACE_GINAC

 
 #define is_of_type(OBJ,TYPE) \
     (dynamic_cast<TYPE *>(const_cast<basic *>(&OBJ))!=0)
 
 #define is_of_type(OBJ,TYPE) \
     (dynamic_cast<TYPE *>(const_cast<basic *>(&OBJ))!=0)


@@ -218,10 +219,10 @@ extern int max_recursion_level;
 #define is_ex_exactly_of_type(OBJ,TYPE) \
     ((*(OBJ).bp).tinfo()==TINFO_##TYPE)
 
 #define is_ex_exactly_of_type(OBJ,TYPE) \
     ((*(OBJ).bp).tinfo()==TINFO_##TYPE)
 

-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC

 
 

-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC

 } // namespace GiNaC
 } // namespace GiNaC

-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC

 
 #endif // ndef __GINAC_BASIC_H__
 
 #endif // ndef __GINAC_BASIC_H__