X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Findexed.h;h=cc604f1378f43654bbd6ae86acaeb5ce86548abf;hb=19d82770007e4d565ce4d07e3e7a02a1809de4eb;hp=3707e6290184d56d613b135a3ab0c7536a3df1ca;hpb=9eab44408b9213d8909b7a9e525f404ad06064dd;p=ginac.git

diff --git a/ginac/indexed.h b/ginac/indexed.h
index 3707e629..cc604f13 100644
--- a/ginac/indexed.h
+++ b/ginac/indexed.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's index carrying objects. */
 
 /*
- *  GiNaC Copyright (C) 1999 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
@@ -24,76 +24,68 @@
 #define __GINAC_INDEXED_H__
 
 #include <string>
-#include <ginac/exprseq.h>
+#include "exprseq.h"
 
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
+#endif // ndef NO_NAMESPACE_GINAC
 
-/** Base class for non-commutative indexed objects */
+
+/** Base class for objects with indices. */
 class indexed : public exprseq
 {
-// member functions
+	GINAC_DECLARE_REGISTERED_CLASS(indexed, exprseq)
 
-    // default constructor, destructor, copy constructor assignment operator and helpers
+	// other constructors
 public:
-    indexed();
-    ~indexed();
-    indexed(indexed const & other);
-    indexed const & operator=(indexed const & other);
-protected:
-    void copy(indexed const & other); 
-    void destroy(bool call_parent);
+	indexed(const ex & i1);
+	indexed(const ex & i1, const ex & i2);
+	indexed(const ex & i1, const ex & i2, const ex & i3);
+	indexed(const ex & i1, const ex & i2, const ex & i3, const ex & i4);
+	indexed(const exvector & iv);
+	indexed(exvector * iv);
 
-    // other constructors
+	// functions overriding virtual functions from base classes
 public:
-    indexed(ex const & i1);
-    indexed(ex const & i1, ex const & i2);
-    indexed(ex const & i1, ex const & i2, ex const & i3);
-    indexed(exvector const & iv);
-    indexed(exvector * iv);
+	void printraw(std::ostream & os) const;
+	void printtree(std::ostream & os, unsigned indent) const;
+	void print(std::ostream & os, unsigned upper_precedence=0) const;
+	void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence) const;
+	bool info(unsigned inf) const;
+
+	/** Return the vector of indices on this object. */
+	exvector get_indices(void) const {return seq;}
 
-    // functions overriding virtual functions from base classes
-public:
-    basic * duplicate() const;
-    void printraw(ostream & os) const;
-    void printtree(ostream & os, unsigned indent) const;
-    void print(ostream & os, unsigned upper_precedence=0) const;
-    void printcsrc(ostream & os, unsigned type, unsigned upper_precedence) const;
-    bool info(unsigned inf) const;
-    ex diff(symbol const & s) const;
-    exvector get_indices(void) const;
 protected:
-    int compare_same_type(basic const & other) const;
-    bool is_equal_same_type(basic const & other) const;
-    unsigned return_type(void) const;
-    unsigned return_type_tinfo(void) const;
-    ex thisexprseq(exvector const & v) const;
-    ex thisexprseq(exvector * vp) const;
+	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 thisexprseq(const exvector & v) const;
+	ex thisexprseq(exvector * vp) const;
 
-    // new virtual functions which can be overridden by derived classes
-    // none
-    
-    // non-virtual functions in this class
+	// new virtual functions which can be overridden by derived classes
+	// none
+	
+	// non-virtual functions in this class
 protected:
-    void printrawindices(ostream & os) const;
-    void printtreeindices(ostream & os, unsigned indent) const;
-    void printindices(ostream & os) const;
-    bool all_of_type_idx(void) const;
+	void printrawindices(std::ostream & os) const;
+	void printtreeindices(std::ostream & os, unsigned indent) const;
+	void printindices(std::ostream & os) const;
+	bool all_of_type_idx(void) const;
 
 // member variables
-    // none
+	// none
 };
 
-// global constants
-
-extern const indexed some_indexed;
-extern type_info const & typeid_indexed;
-
 // utility functions
 inline const indexed &ex_to_indexed(const ex &e)
 {
 	return static_cast<const indexed &>(*e.bp);
 }
 
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_INDEXED_H__