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

[ginac.git] / ginac / basic.h

diff --git a/ginac/basic.h b/ginac/basic.h
index ae8104769fcfc4e043b6848649e6a020c2b65319..ed049eaf1b239159b2770a227ec7bd2766555d23 100644 (file)
--- a/ginac/basic.h
+++ b/ginac/basic.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's ABC. */
 
 /*
- *  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
@@ -30,19 +30,22 @@
 // CINT needs <algorithm> to work properly with <vector> 
 #include <algorithm>
 
-#include <ginac/flags.h>
-#include <ginac/tinfos.h>
-#include <ginac/assertion.h>
+#include "flags.h"
+#include "tinfos.h"
+#include "assertion.h"
+#include "registrar.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 class basic;
 class ex;
 class symbol;
 class lst;
 class numeric;
+class relational;
+class archive_node;
 
 //typedef vector<ex> exvector;
 typedef vector<ex,malloc_alloc> exvector; // CINT does not like vector<...,default_alloc>
@@ -53,6 +56,8 @@ typedef vector<ex,malloc_alloc> exvector; // CINT does not like vector<...,defau
  *  It is responsible for the reference counting. */
 class basic
 {
+    GINAC_DECLARE_REGISTERED_CLASS(basic, void)
+
     friend class ex;
 
 // member functions
@@ -78,7 +83,7 @@ public:
 ;
 #endif // def INLINE_BASIC_CONSTRUCTORS
 
-    basic(basic const & other)
+    basic(const basic & other)
 #ifdef INLINE_BASIC_CONSTRUCTORS
     {
         copy(other);
@@ -87,10 +92,10 @@ public:
 ;
 #endif // def INLINE_BASIC_CONSTRUCTORS
 
-    virtual basic const & operator=(basic const & other);
+    virtual const basic & operator=(const basic & other);
     
 protected:
-    void copy(basic const & other)
+    void copy(const basic & other)
     {
         flags = other.flags & ~status_flags::dynallocated;
         hashvalue = other.hashvalue;
@@ -114,37 +119,38 @@ protected:
     // new virtual functions which can be overridden by derived classes
 public: // only const functions please (may break reference counting)
     virtual basic * duplicate() const;
+    virtual void print(ostream & os,unsigned upper_precedence=0) const;
     virtual void printraw(ostream & os) const;
     virtual void printtree(ostream & os, unsigned indent) const;
-    virtual void print(ostream & os,unsigned upper_precedence=0) const;
     virtual void printcsrc(ostream & os, unsigned type, unsigned upper_precedence=0) const;
     virtual void dbgprint(void) const;
     virtual void dbgprinttree(void) const;
     virtual bool info(unsigned inf) const;
-    virtual int nops() const;
-    virtual ex op(int const i) const;
-    virtual ex & let_op(int const i);
-    virtual ex operator[](ex const & index) const;
-    virtual ex operator[](int const i) const;
-    virtual bool has(ex const & other) const;
-    virtual int degree(symbol const & s) const;
-    virtual int ldegree(symbol const & s) const;
-    virtual ex coeff(symbol const & s, int const n=1) const;
-    virtual ex collect(symbol const & s) const;
+    virtual unsigned nops() const;
+    virtual ex op(int i) const;
+    virtual ex & let_op(int i);
+    virtual ex operator[](const ex & index) const;
+    virtual ex operator[](int i) const;
+    virtual bool has(const ex & other) const;
+    virtual int degree(const symbol & s) const;
+    virtual int ldegree(const symbol & s) const;
+    virtual ex coeff(const symbol & s, int n=1) 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(symbol const & s) const;
-    virtual ex series(symbol const & s, ex const & point, int order) const;
-    virtual ex subs(lst const & ls, lst const & lr) const;
+    virtual ex series(const relational & r, 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 to_rational(lst &repl_lst) const;
     virtual numeric integer_content(void) const;
-    virtual ex smod(numeric const &xi) const;
+    virtual ex smod(const numeric &xi) const;
     virtual numeric max_coefficient(void) const;
     virtual exvector get_indices(void) const;
-    virtual ex simplify_ncmul(exvector const & v) const;
+    virtual ex simplify_ncmul(const exvector & v) const;
 protected: // non-const functions should be called from class ex only
-    virtual int compare_same_type(basic const & other) const;
-    virtual bool is_equal_same_type(basic const & other) const;
+    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 unsigned return_type_tinfo(void) const;
     virtual unsigned calchash(void) const;
@@ -152,15 +158,16 @@ protected: // non-const functions should be called from class ex only
 
     // non-virtual functions in this class
 public:
-    ex subs(ex const & e) const;
-    int compare(basic const & other) const;
-    bool is_equal(basic const & other) const;
-    basic const & hold(void) const;
+    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;}
+    const basic & setflag(unsigned f) const {flags |= f; return *this;}
+    const basic & clearflag(unsigned f) const {flags &= ~f; return *this;}
 protected:
-    basic const & setflag(unsigned f) const {flags |= f; return *this;}
-    basic const & clearflag(unsigned f) const {flags &= ~f; return *this;}
     void ensure_if_modifiable(void) const;
 
 // member variables
@@ -178,7 +185,7 @@ private:
 // global constants
 
 extern const basic some_basic;
-extern type_info const & typeid_basic;
+extern const type_info & typeid_basic;
 
 // global variables
 
@@ -186,7 +193,7 @@ extern int max_recursion_level;
 
 // 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)
@@ -200,7 +207,7 @@ extern int max_recursion_level;
 #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)
@@ -214,11 +221,10 @@ extern int max_recursion_level;
 #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
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_BASIC_H__
-