X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fmul.h;h=1a01741719bacaac7e2b3aac267d3ca19c07805e;hp=71b686bbb9b829fdaccf9da06a4cae0737014cd0;hb=21ebb806befcb3873d58074454fcf8dcba138fa9;hpb=26741891dadf23162799009b6fd57b4984bd4ce5

diff --git a/ginac/mul.h b/ginac/mul.h
index 71b686bb..1a017417 100644
--- a/ginac/mul.h
+++ b/ginac/mul.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's products of expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2000 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,15 +23,17 @@
 #ifndef __GINAC_MUL_H__
 #define __GINAC_MUL_H__
 
-#include <ginac/expairseq.h>
+#include "expairseq.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 /** Product of expressions. */
 class mul : public expairseq
 {
+    GINAC_DECLARE_REGISTERED_CLASS(mul, expairseq)
+
     friend class add;
     friend class ncmul;
     friend class power;
@@ -42,21 +44,21 @@ class mul : public expairseq
 public:
     mul();
     ~mul();
-    mul(mul const & other);
-    mul const & operator=(mul const & other);
+    mul(const mul & other);
+    const mul & operator=(const mul & other);
 protected:
-    void copy(mul const & other);
+    void copy(const mul & other);
     void destroy(bool call_parent);
 
     // other constructors
 public:
-    mul(ex const & lh, ex const & rh);
-    mul(exvector const & v);
-    mul(epvector const & v);
-    //mul(epvector const & v, bool do_not_canonicalize=0);
-    mul(epvector const & v, ex const & oc);
-    mul(epvector * vp, ex const & oc);
-    mul(ex const & lh, ex const & mh, ex const & rh);
+    mul(const ex & lh, const ex & rh);
+    mul(const exvector & v);
+    mul(const epvector & v);
+    //mul(const epvector & v, bool do_not_canonicalize=0);
+    mul(const epvector & v, const ex & oc);
+    mul(epvector * vp, const ex & oc);
+    mul(const ex & lh, const ex & mh, const ex & rh);
 
     // functions overriding virtual functions from bases classes
 public:
@@ -65,36 +67,36 @@ public:
     void printraw(ostream & os) const;
     void printcsrc(ostream & os, unsigned type, unsigned upper_precedence) const;
     bool info(unsigned inf) const;
-    int degree(symbol const & s) const;
-    int ldegree(symbol const & s) const;
-    ex coeff(symbol const & s, int const n=1) const;
+    int degree(const symbol & s) const;
+    int ldegree(const symbol & s) const;
+    ex coeff(const symbol & s, int n=1) const;
     ex eval(int level=0) const;
-    ex diff(symbol const & s) const;
-    ex series(symbol const & s, ex const & point, int order) const;
+    ex series(const symbol & s, const ex & point, int order) const;
     ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
     numeric integer_content(void) const;
-    ex smod(numeric const &xi) const;
+    ex smod(const numeric &xi) const;
     numeric max_coefficient(void) const;
     exvector get_indices(void) const;
-    ex simplify_ncmul(exvector const & v) const;
+    ex simplify_ncmul(const exvector & v) const;
 protected:
-    int compare_same_type(basic const & other) const;
-    bool is_equal_same_type(basic const & other) const;
+    ex derivative(const symbol & s) const;
+    int compare_same_type(const basic & other) const;
+    bool is_equal_same_type(const basic & other) const;
     unsigned return_type(void) const;
     unsigned return_type_tinfo(void) const;
-    ex thisexpairseq(epvector const & v, ex const & oc) const;
-    ex thisexpairseq(epvector * vp, ex const & oc) const;
-    expair split_ex_to_pair(ex const & e) const;
-    expair combine_ex_with_coeff_to_pair(ex const & e,
-                                         ex const & c) const;
-    expair combine_pair_with_coeff_to_pair(expair const & p,
-                                           ex const & c) const;
-    ex recombine_pair_to_ex(expair const & p) 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;
+    expair combine_ex_with_coeff_to_pair(const ex & e,
+                                         const ex & c) const;
+    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;
-    void combine_overall_coeff(ex const & c);
-    void combine_overall_coeff(ex const & c1, ex const & c2);
-    bool can_make_flat(expair const & p) 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;
     ex expand(unsigned options=0) const;
     
     // new virtual functions which can be overridden by derived classes
@@ -113,7 +115,7 @@ protected:
 // global constants
 
 extern const mul some_mul;
-extern type_info const & typeid_mul;
+extern const type_info & typeid_mul;
 
 // utility functions
 inline const mul &ex_to_mul(const ex &e)
@@ -121,8 +123,8 @@ inline const mul &ex_to_mul(const ex &e)
 	return static_cast<const mul &>(*e.bp);
 }
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_MUL_H__