- revamped indexed objects

[ginac.git] / ginac / mul.h

diff --git a/ginac/mul.h b/ginac/mul.h
index 93ac7b0d51567f97f392cfda8770a2d2647ce2c9..c531fd6fa4ec36e2172b482c2dbda9e01db86eca 100644 (file)
--- a/ginac/mul.h
+++ b/ginac/mul.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's products of expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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
@@ -25,32 +25,18 @@
 
 #include "expairseq.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#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;
-
-// member functions
-
-       // default constructor, destructor, copy constructor assignment operator and helpers
-public:
-       mul();
-       ~mul();
-       mul(const mul & other);
-       const mul & operator=(const mul & other);
-protected:
-       void copy(const mul & other);
-       void destroy(bool call_parent);
-
-       // other constructors
+       
+       // other ctors
 public:
        mul(const ex & lh, const ex & rh);
        mul(const exvector & v);
@@ -58,10 +44,9 @@ public:
        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:
-       basic * duplicate() const;
        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) const;
@@ -76,11 +61,10 @@ public:
        numeric integer_content(void) const;
        ex smod(const numeric &xi) const;
        numeric max_coefficient(void) const;
-       exvector get_indices(void) const;
+       exvector get_free_indices(void) const;
        ex simplify_ncmul(const exvector & v) const;
 protected:
        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;
@@ -101,30 +85,23 @@ protected:
        
        // new virtual functions which can be overridden by derived classes
        // none
-
+       
        // non-virtual functions in this class
 protected:
        epvector * expandchildren(unsigned options) const;
-
+       
 // member variables
-
+       
 protected:
        static unsigned precedence;
 };
 
-// global constants
-
-extern const mul some_mul;
-extern const std::type_info & typeid_mul;
-
 // utility functions
 inline const mul &ex_to_mul(const ex &e)
 {
        return static_cast<const mul &>(*e.bp);
 }
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_MUL_H__