- revamped indexed objects

[ginac.git] / ginac / add.h

diff --git a/ginac/add.h b/ginac/add.h
index e5c687b9e4ba30edd8bc31929f7cc01dbe8a1a8d..8738bdf3d8b6d405ba0587cfd6e0a3011e741c7b 100644 (file)
--- a/ginac/add.h
+++ b/ginac/add.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's sums 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,43 +25,27 @@
 
 #include "expairseq.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 /** Sum of expressions. */
 class add : public expairseq
 {
        GINAC_DECLARE_REGISTERED_CLASS(add, expairseq)
-
+       
        friend class mul;
        friend class ncmul;
        friend class power;
-
-// member functions
-
-       // default constructor, destructor, copy constructor assignment operator and helpers
-public:
-       add();
-       ~add();
-       add(const add & other);
-       const add & operator=(const add & other);
-protected:
-       void copy(const add & other);
-       void destroy(bool call_parent);
-
+       
        // other constructors
 public:
        add(const ex & lh, const ex & rh);
        add(const exvector & v);
        add(const epvector & v);
-       //add(const epvector & v, bool do_not_canonicalize=0);
        add(const epvector & v, const ex & oc);
        add(epvector * vp, const ex & oc);
-
+       
        // functions overriding virtual functions from bases classes
 public:
-       basic * duplicate() const;
        void print(std::ostream & os, unsigned upper_precedence=0) const;
        void printraw(std::ostream & os) const;
        void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence=0) const;
@@ -75,11 +59,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;
@@ -87,9 +70,9 @@ protected:
        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;
+                                            const ex & c) const;
        expair combine_pair_with_coeff_to_pair(const expair & p,
-                                                                                  const ex & c) const;
+                                              const ex & c) const;
        ex recombine_pair_to_ex(const expair & p) const;
        ex expand(unsigned options=0) const;
        
@@ -105,19 +88,12 @@ protected:
        static unsigned precedence;
 };
 
-// global constants
-
-extern const add some_add;
-extern const std::type_info & typeid_add;
-
 // utility functions
 inline const add &ex_to_add(const ex &e)
 {
        return static_cast<const add &>(*e.bp);
 }
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_ADD_H__