X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fadd.h;h=94d5c8e57bb325c2d14b06a3681d99ecbb2e334e;hp=8a93186b700cfa5b8b923c823f215b08facaea78;hb=216d88c993aada2bffffa32100c23fc7fb4c1844;hpb=4e3a4ac2bcb0837611ea31bc8fc05d84a20c33ac

diff --git a/ginac/add.h b/ginac/add.h
index 8a93186b..94d5c8e5 100644
--- a/ginac/add.h
+++ b/ginac/add.h
@@ -33,7 +33,6 @@ class add : public expairseq
 	GINAC_DECLARE_REGISTERED_CLASS(add, expairseq)
 	
 	friend class mul;
-	friend class ncmul;
 	friend class power;
 	
 	// other constructors
@@ -44,22 +43,22 @@ public:
 	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:
-	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;
@@ -75,23 +74,14 @@ protected:
 	                                       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
-inline const add &ex_to_add(const ex &e)
+
+/** Specialization of is_exactly_a<add>(obj) for add objects. */
+template<> inline bool is_exactly_a<add>(const basic & obj)
 {
-	return static_cast<const add &>(*e.bp);
+	return obj.tinfo()==TINFO_add;
 }
 
 } // namespace GiNaC