X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fncmul.h;h=05f9994929ad0fd28263212c0e224b129fec1e51;hb=0573a5aa2a4834b26a3d40f4160d145658988eff;hp=7476e290392762e46c57ccc7567de56b281a87d1;hpb=bd2d7351b89743eb68ce7d3bfa7ab62c331f9522;p=ginac.git

diff --git a/ginac/ncmul.h b/ginac/ncmul.h
index 7476e290..05f99949 100644
--- a/ginac/ncmul.h
+++ b/ginac/ncmul.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's non-commutative 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,88 +25,67 @@
 
 #include "exprseq.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 /** Non-commutative product of expressions. */
 class ncmul : public exprseq
 {
-    GINAC_DECLARE_REGISTERED_CLASS(ncmul, exprseq)
+	GINAC_DECLARE_REGISTERED_CLASS(ncmul, exprseq)
 
-    friend class power;
-    friend ex nonsimplified_ncmul(const exvector & v);
-    friend ex simplified_ncmul(const exvector & v);
+	friend class power;
+	friend ex nonsimplified_ncmul(const exvector & v);
+	friend ex simplified_ncmul(const exvector & v);
 
 // member functions
 
-    // default constructor, destructor, copy constructor assignment operator and helpers
+	// other constructors
 public:
-    ncmul();
-    ~ncmul();
-    ncmul(const ncmul & other);
-    const ncmul & operator=(const ncmul & other);
-protected:
-    void copy(const ncmul & other);
-    void destroy(bool call_parent);
-
-    // other constructors
-public:
-    ncmul(const ex & lh, const ex & rh);
-    ncmul(const ex & f1, const ex & f2, const ex & f3);
-    ncmul(const ex & f1, const ex & f2, const ex & f3,
-          const ex & f4);
-    ncmul(const ex & f1, const ex & f2, const ex & f3,
-          const ex & f4, const ex & f5);
-    ncmul(const ex & f1, const ex & f2, const ex & f3,
-          const ex & f4, const ex & f5, const ex & f6);
-    ncmul(const exvector & v, bool discardable=false);
-    ncmul(exvector * vp); // vp will be deleted
-
-    // functions overriding virtual functions from bases classes
+	ncmul(const ex & lh, const ex & rh);
+	ncmul(const ex & f1, const ex & f2, const ex & f3);
+	ncmul(const ex & f1, const ex & f2, const ex & f3,
+	      const ex & f4);
+	ncmul(const ex & f1, const ex & f2, const ex & f3,
+	      const ex & f4, const ex & f5);
+	ncmul(const ex & f1, const ex & f2, const ex & f3,
+	      const ex & f4, const ex & f5, const ex & f6);
+	ncmul(const exvector & v, bool discardable=false);
+	ncmul(exvector * vp); // vp will be deleted
+
+	// 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 upper_precedence) const;
-    bool info(unsigned inf) const;
-    int degree(const symbol & s) const;
-    int ldegree(const symbol & s) const;
-    ex expand(unsigned options=0) const;
-    ex coeff(const symbol & s, int n=1) const;
-    ex eval(int level=0) const;
-    ex subs(const lst & ls, const lst & lr) const;
-    exvector get_indices(void) const;
-    ex thisexprseq(const exvector & v) const;
-    ex thisexprseq(exvector * vp) const;
+	void print(const print_context & c, unsigned level = 0) const;
+	bool info(unsigned inf) const;
+	int degree(const ex & s) const;
+	int ldegree(const ex & s) const;
+	ex expand(unsigned options=0) const;
+	ex coeff(const ex & s, int n=1) const;
+	ex eval(int level=0) const;
+	ex subs(const lst & ls, const lst & lr) const;
+	exvector get_free_indices(void) const;
+	ex thisexprseq(const exvector & v) const;
+	ex thisexprseq(exvector * vp) const;
 protected:
-    ex derivative(const symbol & s) const;
-    int compare_same_type(const basic & other) const;
-    unsigned return_type(void) const;
-    unsigned return_type_tinfo(void) const;
-    
-    // new virtual functions which can be overridden by derived classes
-    // none
-
-    // non-virtual functions in this class
+	ex derivative(const symbol & s) const;
+	unsigned return_type(void) const;
+	unsigned return_type_tinfo(void) const;
+	
+	// new virtual functions which can be overridden by derived classes
+	// none
+
+	// non-virtual functions in this class
 protected:
-    unsigned count_factors(const ex & e) const;
-    void append_factors(exvector & v, const ex & e) const;
-    exvector expandchildren(unsigned options) const;
+	unsigned count_factors(const ex & e) const;
+	void append_factors(exvector & v, const ex & e) const;
+	exvector expandchildren(unsigned options) const;
 public:
-    const exvector & get_factors(void) const;
+	const exvector & get_factors(void) const;
 
 // member variables
 
 protected:
-    static unsigned precedence;
+	static unsigned precedence;
 };
 
-// global constants
-
-extern const ncmul some_ncmul;
-extern const type_info & typeid_ncmul;
-
 // friend funtions 
 
 ex nonsimplified_ncmul(const exvector & v);
@@ -118,8 +97,6 @@ inline const ncmul &ex_to_ncmul(const ex &e)
 	return static_cast <const ncmul &>(*e.bp);
 }
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_NCMUL_H__