X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fncmul.h;h=67d381bc473ac6b13d9256c18a209ba2dfd16221;hp=ec8e5612e414a508687cfb0da400f9e9dc47be96;hb=9046466e331b543e9e22db3d9792295d1bbe334c;hpb=a40b470aeccc76b9a6055dc5191805e0bb6f7df2

diff --git a/ginac/ncmul.h b/ginac/ncmul.h
index ec8e5612..67d381bc 100644
--- a/ginac/ncmul.h
+++ b/ginac/ncmul.h
@@ -51,18 +51,17 @@ public:
 	ncmul(const exvector & v, bool discardable=false);
 	ncmul(exvector * vp); // vp will be deleted
 
-	// functions overriding virtual functions from bases classes
+	// functions overriding virtual functions from base classes
 public:
-	void print(std::ostream & os, unsigned upper_precedence) const;
-	void printraw(std::ostream & os) const;
-	void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence = 0) const;
+	void print(const print_context & c, unsigned level = 0) const;
+	unsigned precedence(void) 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 subs(const lst & ls, const lst & lr) const;
+	ex evalm(void) const;
 	exvector get_free_indices(void) const;
 	ex thisexprseq(const exvector & v) const;
 	ex thisexprseq(exvector * vp) const;
@@ -81,11 +80,6 @@ protected:
 	exvector expandchildren(unsigned options) const;
 public:
 	const exvector & get_factors(void) const;
-
-// member variables
-
-protected:
-	static unsigned precedence;
 };
 
 // friend funtions 
@@ -94,11 +88,20 @@ ex nonsimplified_ncmul(const exvector & v);
 ex simplified_ncmul(const exvector & v);
 
 // utility functions
+
+/** Return the ncmul object handled by an ex.  Deprecated: use ex_to<ncmul>().
+ *  This is unsafe: you need to check the type first. */
 inline const ncmul &ex_to_ncmul(const ex &e)
 {
 	return static_cast <const ncmul &>(*e.bp);
 }
 
+/** 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;
+}
+
 } // namespace GiNaC
 
 #endif // ndef __GINAC_NCMUL_H__