X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fmul.h;h=12e7e48d8809fa8fbc2daa303cbd9f32d73aa988;hp=d24d37edd8c273e23a65e81c2fc358b3865db993;hb=0f7b8280ad89fa88a0cbaab7785a4b7cb06e6a63;hpb=591b85b0697370f2f5f25a29a1e94ff831a02c12

diff --git a/ginac/mul.h b/ginac/mul.h
index d24d37ed..12e7e48d 100644
--- a/ginac/mul.h
+++ b/ginac/mul.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's products of expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2003 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
@@ -36,7 +36,7 @@ class mul : public expairseq
 	friend class ncmul;
 	friend class power;
 	
-	// other ctors
+	// other constructors
 public:
 	mul(const ex & lh, const ex & rh);
 	mul(const exvector & v);
@@ -45,29 +45,28 @@ public:
 	mul(epvector * vp, const ex & oc);
 	mul(const ex & lh, const ex & mh, const ex & rh);
 	
-	// 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;
-	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 coeff(const ex & s, int n = 1) const;
 	ex eval(int level=0) const;
 	ex evalf(int level=0) const;
-	ex evalm(void) const;
+	ex evalm() const;
 	ex series(const relational & s, int order, unsigned options = 0) const;
-	ex normal(lst &sym_lst, lst &repl_lst, int level = 0) const;
-	numeric integer_content(void) const;
+	ex normal(exmap & repl, exmap & rev_lookup, int level = 0) const;
+	numeric integer_content() const;
 	ex smod(const numeric &xi) const;
-	numeric max_coefficient(void) const;
-	exvector get_free_indices(void) const;
-	ex simplify_ncmul(const exvector & v) const;
+	numeric max_coefficient() const;
+	exvector get_free_indices() const;
 protected:
 	ex derivative(const symbol & s) const;
-	bool is_equal_same_type(const basic & other) const;
-	unsigned return_type(void) const;
-	unsigned return_type_tinfo(void) const;
+	ex eval_ncmul(const exvector & v) const;
+	unsigned return_type() const;
+	unsigned return_type_tinfo() const;
 	ex thisexpairseq(const epvector & v, const ex & oc) const;
 	ex thisexpairseq(epvector * vp, const ex & oc) const;
 	expair split_ex_to_pair(const ex & e) const;
@@ -75,7 +74,7 @@ protected:
 	expair combine_pair_with_coeff_to_pair(const expair & p, const ex & c) const;
 	ex recombine_pair_to_ex(const expair & p) const;
 	bool expair_needs_further_processing(epp it);
-	ex default_overall_coeff(void) const;
+	ex default_overall_coeff() const;
 	void combine_overall_coeff(const ex & c);
 	void combine_overall_coeff(const ex & c1, const ex & c2);
 	bool can_make_flat(const expair & p) const;
@@ -85,19 +84,14 @@ protected:
 	// none
 	
 	// non-virtual functions in this class
+public:
+	ex algebraic_subs_mul(const exmap & m, unsigned options) const;
 protected:
 	epvector * expandchildren(unsigned options) const;
 };
 
 // utility functions
 
-/** Return the mul object handled by an ex.  Deprecated: use ex_to<mul>().
- *  This is unsafe: you need to check the type first. */
-inline const mul &ex_to_mul(const ex &e)
-{
-	return static_cast<const mul &>(*e.bp);
-}
-
 /** Specialization of is_exactly_a<mul>(obj) for mul objects. */
 template<> inline bool is_exactly_a<mul>(const basic & obj)
 {