X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fidx.h;h=334b58cadb1ab1abe795a885f893765c00cc0314;hp=8e460d4c96e58b063c59184e45a50cef87d39e96;hb=35267c690dfa19cdb1ddafa3c1d2c5e3640f6891;hpb=6b3768e8c544739ae53321539cb4d1e3112ded1b

diff --git a/ginac/idx.h b/ginac/idx.h
index 8e460d4c..334b58ca 100644
--- a/ginac/idx.h
+++ b/ginac/idx.h
@@ -2,34 +2,58 @@
  *
  *  Interface to GiNaC's indices. */
 
-#ifndef _IDX_H_
-#define _IDX_H_
+/*
+ *  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
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
-#include <string>
-#include <vector>
+#ifndef __GINAC_IDX_H__
+#define __GINAC_IDX_H__
 
+#include <string>
+//#include <vector>
 #include "basic.h"
+#include "ex.h"
+
+#ifndef NO_NAMESPACE_GINAC
+namespace GiNaC {
+#endif // ndef NO_NAMESPACE_GINAC
 
 class idx : public basic
 {
+    GINAC_DECLARE_REGISTERED_CLASS(idx, basic)
+
 // member functions
 
     // default constructor, destructor, copy constructor assignment operator and helpers
 public:
     idx();
     ~idx();
-    idx (idx const & other);
-    idx const & operator=(idx const & other);
+    idx (const idx & other);
+    const idx & operator=(const idx & other);
 protected:
-    void copy(idx const & other);
+    void copy(const idx & other);
     void destroy(bool call_parent);
 
     // other constructors
 public:
     explicit idx(bool cov);
-    explicit idx(string const & n, bool cov=false);
-    explicit idx(char const * n, bool cov=false);
-    explicit idx(unsigned const v, bool cov=false); 
+    explicit idx(const string & n, bool cov=false);
+    explicit idx(const char * n, bool cov=false);
+    explicit idx(unsigned v, bool cov=false); 
 
     // functions overriding virtual functions from bases classes
 public:
@@ -39,14 +63,14 @@ public:
     void print(ostream & os, unsigned upper_precedence=0) const;
     bool info(unsigned inf) const;
 protected:
-    int compare_same_type(basic const & other) const;
-    bool is_equal_same_type(basic const & other) const;
+    int compare_same_type(const basic & other) const;
+    bool is_equal_same_type(const basic & other) const;
     unsigned calchash(void) const;
-    ex subs(lst const & ls, lst const & lr) const;
+    ex subs(const lst & ls, const lst & lr) const;
 
     // new virtual functions which can be overridden by derived classes
 public:
-    virtual bool is_co_contra_pair(basic const & other) const;
+    virtual bool is_co_contra_pair(const basic & other) const;
     virtual ex toggle_covariant(void) const;
 
     // non-virtual functions in this class
@@ -54,6 +78,8 @@ public:
     bool is_symbolic(void) const;
     unsigned get_value(void) const;
     bool is_covariant(void) const;
+    void setname(const string & n) {name=n;}
+    string getname(void) const {return name;}
 
     // member variables
 protected:
@@ -68,23 +94,29 @@ protected:
 // global constants
 
 extern const idx some_idx;
-extern type_info const & typeid_idx;
-
-// macros
+extern const type_info & typeid_idx;
 
-#define ex_to_idx(X) (static_cast<idx const &>(*(X).bp))
+// utility functions
+inline const idx &ex_to_idx(const ex &e)
+{
+	return static_cast<const idx &>(*e.bp);
+}
 
-// other functions
+// global functions
 
-typedef vector<ex> exvector;
+// typedef vector<ex> exvector;
 
 int canonicalize_indices(exvector & iv, bool antisymmetric=false);
-exvector idx_intersect(exvector const & iv1, exvector const & iv2);
-ex permute_free_index_to_front(exvector const & iv3, exvector const & iv2,
+exvector idx_intersect(const exvector & iv1, const exvector & iv2);
+ex permute_free_index_to_front(const exvector & iv3, const exvector & iv2,
                                bool antisymmetric, int * sig);
-unsigned subs_index_in_exvector(exvector & v, ex const & is, ex const & ir);
-ex subs_indices(ex const & e, exvector const & idxv_contra,
-                exvector const & idxv_co);
-unsigned count_index(ex const & e, ex const & i);
+unsigned subs_index_in_exvector(exvector & v, const ex & is, const ex & ir);
+ex subs_indices(const ex & e, const exvector & idxv_contra,
+                const exvector & idxv_co);
+unsigned count_index(const ex & e, const ex & i);
+
+#ifndef NO_NAMESPACE_GINAC
+} // namespace GiNaC
+#endif // ndef NO_NAMESPACE_GINAC
 
-#endif // ndef _IDX_H_
+#endif // ndef __GINAC_IDX_H__