X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fadd.h;h=fe8d20b7c93f165d9d4cfc346c0ebc060e6dadf2;hp=c30034dfd282fc03eceabf73cc98117f593bf386;hb=ed58700a9b0dd302f28203c6ac7eee95e8d34d8a;hpb=e58227e1112f989f3b5417e497a61d53fc2971fa

diff --git a/ginac/add.h b/ginac/add.h
index c30034df..fe8d20b7 100644
--- a/ginac/add.h
+++ b/ginac/add.h
@@ -25,61 +25,44 @@
 
 #include "expairseq.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 /** Sum of expressions. */
 class add : public expairseq
 {
 	GINAC_DECLARE_REGISTERED_CLASS(add, expairseq)
-
+	
 	friend class mul;
 	friend class ncmul;
 	friend class power;
-
-// member functions
-
-	// default constructor, destructor, copy constructor assignment operator and helpers
-public:
-	add();
-	~add();
-	add(const add & other);
-	const add & operator=(const add & other);
-protected:
-	void copy(const add & other);
-	void destroy(bool call_parent);
-
+	
 	// other constructors
 public:
 	add(const ex & lh, const ex & rh);
 	add(const exvector & v);
 	add(const epvector & v);
-	//add(const epvector & v, bool do_not_canonicalize=0);
 	add(const epvector & v, const ex & oc);
 	add(epvector * vp, const ex & oc);
-
-	// 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 40;}
 	bool info(unsigned inf) const;
-	int degree(const symbol & s) const;
-	int ldegree(const symbol & s) const;
-	ex coeff(const symbol & s, int n=1) const;
+	int degree(const ex & s) const;
+	int ldegree(const ex & s) const;
+	ex coeff(const ex & s, int n=1) const;
 	ex eval(int level=0) const;
+	ex evalm(void) const;
 	ex series(const relational & r, int order, unsigned options = 0) const;
 	ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
 	numeric integer_content(void) const;
 	ex smod(const numeric &xi) const;
 	numeric max_coefficient(void) const;
-	exvector get_indices(void) const;
+	exvector get_free_indices(void) const;
 	ex simplify_ncmul(const exvector & v) 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;
 	unsigned return_type_tinfo(void) const;
@@ -87,32 +70,28 @@ protected:
 	ex thisexpairseq(epvector * vp, const ex & oc) const;
 	expair split_ex_to_pair(const ex & e) const;
 	expair combine_ex_with_coeff_to_pair(const ex & e,
-										 const ex & c) const;
+	                                     const ex & c) const;
 	expair combine_pair_with_coeff_to_pair(const expair & p,
-										   const ex & c) const;
+	                                       const ex & c) const;
 	ex recombine_pair_to_ex(const expair & p) const;
 	ex expand(unsigned options=0) const;
-	
-	// new virtual functions which can be overridden by derived classes
-	// none
-	
-	// non-virtual functions in this class
-	// none
-
-// member variables
-
-protected:
-	static unsigned precedence;
 };
 
 // utility functions
+
+/** Return the add object handled by an ex.  Deprecated: use ex_to<add>().
+ *  This is unsafe: you need to check the type first. */
 inline const add &ex_to_add(const ex &e)
 {
 	return static_cast<const add &>(*e.bp);
 }
 
-#ifndef NO_NAMESPACE_GINAC
+/** Specialization of is_exactly_a<add>(obj) for add objects. */
+template<> inline bool is_exactly_a<add>(const basic & obj)
+{
+	return obj.tinfo()==TINFO_add;
+}
+
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_ADD_H__