X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Frelational.h;h=40c799bf5ce580247a78949a6fd9bf6b557b51cc;hb=d1a4416a1bb37290a42250d871b7b52e35f64e0a;hp=118e494c0be95da3bd5aa6b6d2d9e0d833222465;hpb=703c6cebb5d3d395437e73e6935f3691aed68e0a;p=ginac.git

diff --git a/ginac/relational.h b/ginac/relational.h
index 118e494c..40c799bf 100644
--- a/ginac/relational.h
+++ b/ginac/relational.h
@@ -3,7 +3,7 @@
  *  Interface to relations between expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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
@@ -26,9 +26,7 @@
 #include "basic.h"
 #include "ex.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 /** This class holds a relation consisting of two expressions and a logical
  *  relation between them. */
@@ -38,45 +36,31 @@ class relational : public basic
 
 // types
 public:
-	enum operators { equal,
-		   not_equal,
-		   less,
-		   less_or_equal,
-		   greater,
-		   greater_or_equal
+	enum operators {
+		equal,
+		not_equal,
+		less,
+		less_or_equal,
+		greater,
+		greater_or_equal
 	};
 	
-// member functions
-
-	// default constructor, destructor, copy constructor assignment operator and helpers
-public:
-	relational();
-	~relational();
-	relational(const relational & other);
-	const relational & operator=(const relational & other);
-protected:
-	void copy(const relational & other);
-	void destroy(bool call_parent);
-
-	// other constructors
+	// other ctors
 public:
 	relational(const ex & lhs, const ex & rhs, operators oper=equal);
 	
-	// functions overriding virtual functions from bases classes
+	// functions overriding virtual functions from base classes
 public:
-	basic * duplicate() const;
-	void print(std::ostream & os, unsigned upper_precedence=0) const;
-	void printraw(std::ostream & os) const;
-	void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence=0) const;
+	void print(const print_context & c, unsigned level = 0) const;
+	unsigned precedence(void) const {return 20;}
 	bool info(unsigned inf) const;
 	unsigned nops() const;
 	ex & let_op(int i);
 	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 simplify_ncmul(const exvector & v) const;
+
 protected:
-	int compare_same_type(const basic & other) const;
+	bool match_same_type(const basic & other) const;
 	unsigned return_type(void) const;
 	unsigned return_type_tinfo(void) const;
 
@@ -95,22 +79,23 @@ protected:
 	ex lh;
 	ex rh;
 	operators o;
-	static unsigned precedence;
 };
 
-// global constants
-
-extern const relational some_relational;
-extern const type_info & typeid_relational;
-
 // utility functions
+
+/** Return the relational object handled by an ex.  Deprecated: use ex_to<relational>().
+ *  This is unsafe: you need to check the type first. */
 inline const relational &ex_to_relational(const ex &e)
 {
 	return static_cast<const relational &>(*e.bp);
 }
 
-#ifndef NO_NAMESPACE_GINAC
+/** Specialization of is_exactly_a<relational>(obj) for relational objects. */
+template<> inline bool is_exactly_a<relational>(const basic & obj)
+{
+	return obj.tinfo()==TINFO_relational;
+}
+
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_RELATIONAL_H__