X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fncmul.h;h=46a7aae1bd101da1f86cab802e0bb4d4bb6a9364;hp=de48b59e58d98d02dd80291dd5dfaafdcd024091;hb=8dc09f48182574d792a2ed7c37b66831d9267a6c;hpb=afdd7fa8c6c0a587f7c80789198551383e8beb7b

diff --git a/ginac/ncmul.h b/ginac/ncmul.h
index de48b59e..46a7aae1 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 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2004 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
@@ -23,101 +23,81 @@
 #ifndef __GINAC_NCMUL_H__
 #define __GINAC_NCMUL_H__
 
-#include <ginac/exprseq.h>
+#include "exprseq.h"
 
-#ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
 
 /** Non-commutative product of expressions. */
 class ncmul : public exprseq
 {
-    friend class power;
-    friend ex nonsimplified_ncmul(exvector const & v);
-    friend ex simplified_ncmul(exvector const & v);
+	GINAC_DECLARE_REGISTERED_CLASS(ncmul, exprseq)
 
-// member functions
+	friend class power;
+	friend ex reeval_ncmul(const exvector & v);
+	friend ex hold_ncmul(const exvector & v);
 
-    // default constructor, destructor, copy constructor assignment operator and helpers
-public:
-    ncmul();
-    ~ncmul();
-    ncmul(ncmul const & other);
-    ncmul const & operator=(ncmul const & other);
-protected:
-    void copy(ncmul const & other);
-    void destroy(bool call_parent);
+// member functions
 
-    // other constructors
+	// other constructors
 public:
-    ncmul(ex const & lh, ex const & rh);
-    ncmul(ex const & f1, ex const & f2, ex const & f3);
-    ncmul(ex const & f1, ex const & f2, ex const & f3,
-          ex const & f4);
-    ncmul(ex const & f1, ex const & f2, ex const & f3,
-          ex const & f4, ex const & f5);
-    ncmul(ex const & f1, ex const & f2, ex const & f3,
-          ex const & f4, ex const & f5, ex const & f6);
-    ncmul(exvector const & 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(std::auto_ptr<exvector> vp);
+
+	// functions overriding virtual functions from base classes
 public:
-    basic * duplicate() const;
-    void printraw(ostream & os) const;
-    void print(ostream & os, unsigned upper_precedence) const;
-    void printcsrc(ostream & os, unsigned upper_precedence) const;
-    bool info(unsigned inf) const;
-    int degree(symbol const & s) const;
-    int ldegree(symbol const & s) const;
-    ex expand(unsigned options=0) const;
-    ex coeff(symbol const & s, int const n=1) const;
-    ex eval(int level=0) const;
-    ex diff(symbol const & s) const;
-    ex subs(lst const & ls, lst const & lr) const;
-    exvector get_indices(void) const;
-    ex thisexprseq(exvector const & v) const;
-    ex thisexprseq(exvector * vp) const;
+	unsigned precedence() const {return 50;}
+	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 evalm() const;
+	exvector get_free_indices() const;
+	ex thiscontainer(const exvector & v) const;
+	ex thiscontainer(std::auto_ptr<exvector> vp) const;
+	ex conjugate() const;
+
 protected:
-    int compare_same_type(basic const & 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() const;
+	unsigned return_type_tinfo() const;
+	
+	// new virtual functions which can be overridden by derived classes
+	// none
+
+	// non-virtual functions in this class
 protected:
-    unsigned count_factors(ex const & e) const;
-    void append_factors(exvector & v, ex const & e) const;
-    exvector expandchildren(unsigned options) const;
+	void do_print(const print_context & c, unsigned level) const;
+	void do_print_csrc(const print_context & c, unsigned level) const;
+	size_t count_factors(const ex & e) const;
+	void append_factors(exvector & v, const ex & e) const;
+	exvector expandchildren(unsigned options) const;
 public:
-    exvector const & get_factors(void) const;
-
-// member variables
-
-protected:
-    static unsigned precedence;
+	const exvector & get_factors() const;
 };
 
-// global constants
-
-extern const ncmul some_ncmul;
-extern type_info const & typeid_ncmul;
-
 // friend funtions 
 
-ex nonsimplified_ncmul(exvector const & v);
-ex simplified_ncmul(exvector const & v);
+ex reeval_ncmul(const exvector & v);
+ex hold_ncmul(const exvector & v);
 
 // utility functions
-inline const ncmul &ex_to_ncmul(const ex &e)
+
+/** Specialization of is_exactly_a<ncmul>(obj) for ncmul objects. */
+template<> inline bool is_exactly_a<ncmul>(const basic & obj)
 {
-	return static_cast <const ncmul &>(*e.bp);
+	return obj.tinfo()==TINFO_ncmul;
 }
 
-#ifndef NO_GINAC_NAMESPACE
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
 
 #endif // ndef __GINAC_NCMUL_H__