X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fncmul.h;h=1e0b68eb506fe20b6cd203677b8ef292b6345d65;hp=78a45ed6d65db00ae4635391df781f07c58bf6e1;hb=cca88b51436e4b654d16a4d60cd0d1c66fcf5dd6;hpb=dbd9c306a74f1cb258c0d15a346b973b39deaad2

diff --git a/ginac/ncmul.h b/ginac/ncmul.h
index 78a45ed6..1e0b68eb 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-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2014 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
@@ -17,13 +17,14 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_NCMUL_H__
-#define __GINAC_NCMUL_H__
+#ifndef GINAC_NCMUL_H
+#define GINAC_NCMUL_H
 
 #include "exprseq.h"
+#include "archive.h"
 
 namespace GiNaC {
 
@@ -33,8 +34,8 @@ class ncmul : public 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 ex reeval_ncmul(const exvector & v);
+	friend ex hold_ncmul(const exvector & v);
 
 // member functions
 
@@ -49,52 +50,50 @@ public:
 	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
+	ncmul(std::auto_ptr<exvector> vp);
 
 	// functions overriding virtual functions from base classes
 public:
-	void print(const print_context & c, unsigned level = 0) const;
-	unsigned precedence(void) const {return 50;}
+	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(void) const;
-	exvector get_free_indices(void) const;
-	ex thisexprseq(const exvector & v) const;
-	ex thisexprseq(exvector * vp) 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;
+	ex real_part() const;
+	ex imag_part() const;
+
 protected:
 	ex derivative(const symbol & s) const;
-	unsigned return_type(void) const;
-	unsigned return_type_tinfo(void) const;
+	unsigned return_type() const;
+	return_type_t 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(const ex & e) 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;
+	std::auto_ptr<exvector> expandchildren(unsigned options) const;
 public:
-	const exvector & get_factors(void) const;
+	const exvector & get_factors() const;
 };
+GINAC_DECLARE_UNARCHIVER(ncmul);
 
 // friend funtions 
 
-ex nonsimplified_ncmul(const exvector & v);
-ex simplified_ncmul(const exvector & v);
-
-// utility functions
-
-/** Specialization of is_exactly_a<ncmul>(obj) for ncmul objects. */
-template<> inline bool is_exactly_a<ncmul>(const basic & obj)
-{
-	return obj.tinfo()==TINFO_ncmul;
-}
+ex reeval_ncmul(const exvector & v);
+ex hold_ncmul(const exvector & v);
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_NCMUL_H__
+#endif // ndef GINAC_NCMUL_H