X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fmul.h;h=2d3d240f459307d3016cea9567ce7f5763cae560;hp=c6d607dbeb844a71cbd0fd2ce98aa20267db0d1d;hb=d58aba5750e206575895725df80b65d907196928;hpb=e5362a33f72613b324b3714524a8c2e5f7b7f46f

diff --git a/ginac/mul.h b/ginac/mul.h
index c6d607db..2d3d240f 100644
--- a/ginac/mul.h
+++ b/ginac/mul.h
@@ -25,20 +25,18 @@
 
 #include "expairseq.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 /** Product of expressions. */
 class mul : public expairseq
 {
 	GINAC_DECLARE_REGISTERED_CLASS(mul, expairseq)
-
+	
 	friend class add;
 	friend class ncmul;
 	friend class power;
-
-	// other constructors
+	
+	// other ctors
 public:
 	mul(const ex & lh, const ex & rh);
 	mul(const exvector & v);
@@ -46,17 +44,14 @@ public:
 	mul(const epvector & v, const ex & oc);
 	mul(epvector * vp, const ex & oc);
 	mul(const ex & lh, const ex & mh, const ex & rh);
-
+	
 	// functions overriding virtual functions from bases classes
 public:
-	basic * duplicate() const;
-	void print(std::ostream & os, unsigned upper_precedence) const;
-	void printraw(std::ostream & os) const;
-	void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence) const;
+	void print(const print_context & c, unsigned level = 0) const;
 	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 evalf(int level=0) const;
 	ex series(const relational & s, int order, unsigned options = 0) const;
@@ -64,21 +59,18 @@ public:
 	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;
 	ex thisexpairseq(const epvector & v, const ex & oc) const;
 	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;
-	expair combine_pair_with_coeff_to_pair(const expair & p,
-										   const ex & c) const;
+	expair combine_ex_with_coeff_to_pair(const ex & e, const ex & c) const;
+	expair combine_pair_with_coeff_to_pair(const expair & p, const ex & c) const;
 	ex recombine_pair_to_ex(const expair & p) const;
 	bool expair_needs_further_processing(epp it);
 	ex default_overall_coeff(void) const;
@@ -89,13 +81,13 @@ protected:
 	
 	// new virtual functions which can be overridden by derived classes
 	// none
-
+	
 	// non-virtual functions in this class
 protected:
 	epvector * expandchildren(unsigned options) const;
-
+	
 // member variables
-
+	
 protected:
 	static unsigned precedence;
 };
@@ -106,8 +98,6 @@ inline const mul &ex_to_mul(const ex &e)
 	return static_cast<const mul &>(*e.bp);
 }
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_MUL_H__