X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fncmul.h;h=05f9994929ad0fd28263212c0e224b129fec1e51;hb=85ce9664ddba79c28a6945b1e5b4e2b71f77cb51;hp=acb4edee6bb6c9e35072108a9c349aa3ff803340;hpb=703c6cebb5d3d395437e73e6935f3691aed68e0a;p=ginac.git

diff --git a/ginac/ncmul.h b/ginac/ncmul.h
index acb4edee..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,9 +25,7 @@
 
 #include "exprseq.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 /** Non-commutative product of expressions. */
 class ncmul : public exprseq
@@ -40,48 +38,34 @@ class ncmul : public exprseq
 
 // member functions
 
-	// default constructor, destructor, copy constructor assignment operator and helpers
-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);
+	      const ex & f4);
 	ncmul(const ex & f1, const ex & f2, const ex & f3,
-		  const ex & f4, const ex & f5);
+	      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);
+	      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;
+	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;
+	int degree(const ex & s) const;
+	int ldegree(const ex & s) const;
 	ex expand(unsigned options=0) const;
-	ex coeff(const symbol & s, int n=1) 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_indices(void) 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;
 	
@@ -102,11 +86,6 @@ protected:
 	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__