X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginac%2Fmul.h;h=8009d78410424e7d304303fa2de2a6f485f14751;hb=4dc267ddbec7fcc1ba15bf0d60d72a346c9efb26;hp=8358b57df6ab55cd6c074e026b05ea3458f47891;hpb=703c6cebb5d3d395437e73e6935f3691aed68e0a;p=ginac.git

diff --git a/ginac/mul.h b/ginac/mul.h
index 8358b57d..8009d784 100644
--- a/ginac/mul.h
+++ b/ginac/mul.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's products of 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
@@ -25,32 +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;
-
-// member functions
-
-	// default constructor, destructor, copy constructor assignment operator and helpers
-public:
-	mul();
-	~mul();
-	mul(const mul & other);
-	const mul & operator=(const mul & other);
-protected:
-	void copy(const mul & other);
-	void destroy(bool call_parent);
-
-	// other constructors
+	
+	// other ctors
 public:
 	mul(const ex & lh, const ex & rh);
 	mul(const exvector & v);
@@ -58,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;
@@ -76,11 +59,10 @@ 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;
@@ -101,30 +83,23 @@ 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;
 };
 
-// global constants
-
-extern const mul some_mul;
-extern const type_info & typeid_mul;
-
 // utility functions
 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__