X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fbasic.h;h=9dc49bfdee4b8752cb2982dddfed23377d9bc59d;hp=1434d2ba732612622efc2298acf83d590ada57b8;hb=244c5cb90b4650deebb237eaaadc02fb90ad7682;hpb=a48fe78199a2249d2839195064b63ed60d47c7cd

diff --git a/ginac/basic.h b/ginac/basic.h
index 1434d2ba..9dc49bfd 100644
--- a/ginac/basic.h
+++ b/ginac/basic.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's ABC. */
 
 /*
- *  GiNaC Copyright (C) 1999-2005 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2011 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,21 +20,22 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_BASIC_H__
-#define __GINAC_BASIC_H__
-
-#include <cstddef> // for size_t
-#include <vector>
-#include <map>
-// CINT needs <algorithm> to work properly with <vector>
-#include <algorithm>
+#ifndef GINAC_BASIC_H
+#define GINAC_BASIC_H
 
 #include "flags.h"
-#include "tinfos.h"
 #include "ptr.h"
 #include "assertion.h"
 #include "registrar.h"
 
+// CINT needs <algorithm> to work properly with <vector>
+#include <algorithm>
+#include <cstddef> // for size_t
+#include <map>
+#include <set>
+#include <typeinfo> // for typeid
+#include <vector>
+
 namespace GiNaC {
 
 class ex;
@@ -46,9 +47,9 @@ class archive_node;
 class print_context;
 
 typedef std::vector<ex> exvector;
+typedef std::set<ex, ex_is_less> exset;
 typedef std::map<ex, ex, ex_is_less> exmap;
 
-
 // Define this to enable some statistical output for comparisons and hashing
 #undef GINAC_COMPARE_STATISTICS
 
@@ -108,7 +109,7 @@ class basic : public refcounted
 	
 	// default constructor, destructor, copy constructor and assignment operator
 protected:
-	basic() : tinfo_key(TINFO_basic), flags(0) {}
+	basic() : flags(0) {}
 
 public:
 	/** basic destructor, virtual because class ex will delete objects of
@@ -121,10 +122,6 @@ public:
 	const basic & operator=(const basic & other);
 
 protected:
-	/** Constructor with specified tinfo_key (used by derived classes instead
-	 *  of the default constructor to avoid assigning tinfo_key twice). */
-	basic(unsigned ti) : tinfo_key(ti), flags(0) {}
-	
 	// new virtual functions which can be overridden by derived classes
 public: // only const functions please (may break reference counting)
 
@@ -162,8 +159,8 @@ public:
 	virtual ex & operator[](size_t i);
 
 	// pattern matching
-	virtual bool has(const ex & other) const;
-	virtual bool match(const ex & pattern, lst & repl_lst) const;
+	virtual bool has(const ex & other, unsigned options = 0) const;
+	virtual bool match(const ex & pattern, exmap & repls) const;
 protected:
 	virtual bool match_same_type(const basic & other) const;
 public:
@@ -182,6 +179,7 @@ public:
 	}
 
 	// degree/coeff
+	virtual bool is_polynomial(const ex & var) const;
 	virtual int degree(const ex & s) const;
 	virtual int ldegree(const ex & s) const;
 	virtual ex coeff(const ex & s, int n = 1) const;
@@ -214,10 +212,12 @@ public:
 
 	// noncommutativity
 	virtual unsigned return_type() const;
-	virtual unsigned return_type_tinfo() const;
+	virtual return_type_t return_type_tinfo() const;
 
-	// complex conjugation
+	// functions for complex expressions
 	virtual ex conjugate() const;
+	virtual ex real_part() const;
+	virtual ex imag_part() const;
 
 	// functions that should be called from class ex only
 protected:
@@ -241,6 +241,23 @@ public:
 
 	void print_dispatch(const registered_class_info & ri, const print_context & c, unsigned level) const;
 
+	/** Save (serialize) the object into archive node.
+	 *
+	 * Losely speaking, this method turns an expression into a byte
+	 * stream (which can be saved and restored later on, or sent via
+	 * network, etc.)
+	 */
+	virtual void archive(archive_node& n) const;
+	/** Load (deserialize) the object from an archive node.
+	 *
+	 *  @note This method is essentially a constructor. However,
+	 *  constructors can't be virtual. So, if unarchiving routines
+	 *  are implemented as constructors one would need to define such
+	 *  a constructor in every class, even if all it does is simply
+	 *  calling constructor of a superclass.
+	 */
+	virtual void read_archive(const archive_node& n, lst& syms); // no const
+
 	ex subs_one_level(const exmap & m, unsigned options) const;
 	ex diff(const symbol & s, unsigned nth = 1) const;
 	int compare(const basic & other) const;
@@ -262,8 +279,6 @@ public:
 		}
 	}
 
-	unsigned tinfo() const {return tinfo_key;}
-
 	/** Set some status_flags. */
 	const basic & setflag(unsigned f) const {flags |= f; return *this;}
 
@@ -279,7 +294,6 @@ protected:
 	
 	// member variables
 protected:
-	unsigned tinfo_key;                 ///< typeinfo
 	mutable unsigned flags;             ///< of type status_flags
 	mutable unsigned hashvalue;         ///< hash value
 };
@@ -299,15 +313,13 @@ inline bool is_a(const basic &obj)
 	return dynamic_cast<const T *>(&obj) != 0;
 }
 
-/** Check if obj is a T, not including base classes.  This one is just an
- *  inefficient default.  It should in all time-critical cases be overridden
- *  by template specializations that use the TINFO_* constants directly. */
+/** Check if obj is a T, not including base classes. */
 template <class T>
-inline bool is_exactly_a(const basic &obj)
+inline bool is_exactly_a(const basic & obj)
 {
-	return obj.tinfo() == T::get_class_info_static().options.get_id();
+	return typeid(T) == typeid(obj);
 }
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_BASIC_H__
+#endif // ndef GINAC_BASIC_H