X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fncmul.h;h=2233b8d7b3905aa1d998f3a365c1192bb2d9f30d;hp=05b96da375d2e72936195ba9bef5976367d1307d;hb=d5b86dd10dd9cba12175d07af0b6edfc9a215e36;hpb=c8f1702a09070f7d0d64118a0a3405521affb2cb

diff --git a/ginac/ncmul.h b/ginac/ncmul.h
index 05b96da3..2233b8d7 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-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2015 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
 
@@ -48,54 +49,51 @@ public:
 	      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
+	ncmul(const exvector & v);
+	ncmul(exvector && v);
 
-	// functions overriding virtual functions from bases classes
+	// functions overriding virtual functions from base classes
 public:
-	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;
-	exvector get_free_indices(void) const;
-	ex thisexprseq(const exvector & v) const;
-	ex thisexprseq(exvector * vp) const;
+	unsigned precedence() const override {return 50;}
+	bool info(unsigned inf) const override;
+	int degree(const ex & s) const override;
+	int ldegree(const ex & s) const override;
+	ex expand(unsigned options=0) const override;
+	ex coeff(const ex & s, int n=1) const override;
+	ex eval(int level=0) const override;
+	ex evalm() const override;
+	exvector get_free_indices() const override;
+	ex thiscontainer(const exvector & v) const override;
+	ex thiscontainer(exvector && v) const override;
+	ex conjugate() const override;
+	ex real_part() const override;
+	ex imag_part() const override;
+
 protected:
-	ex derivative(const symbol & s) const;
-	unsigned return_type(void) const;
-	unsigned return_type_tinfo(void) const;
+	ex derivative(const symbol & s) const override;
+	unsigned return_type() const override;
+	return_type_t return_type_tinfo() const override;
 	
 	// 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;
 public:
-	const exvector & get_factors(void) const;
-
-// member variables
-
-protected:
-	static unsigned precedence;
+	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
-inline const ncmul &ex_to_ncmul(const ex &e)
-{
-	return static_cast <const ncmul &>(*e.bp);
-}
+ex reeval_ncmul(const exvector & v);
+ex hold_ncmul(const exvector & v);
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_NCMUL_H__
+#endif // ndef GINAC_NCMUL_H