X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fidx.h;h=f332f57484120cf0663882e27712e04d580249c8;hb=9df145c8bfa8ce9f2cbe6c05673481b6ca4c4c22;hp=773b2e6b1ae9570abd8e2e896e57caa6e86819a1;hpb=afdd7fa8c6c0a587f7c80789198551383e8beb7b;p=ginac.git

diff --git a/ginac/idx.h b/ginac/idx.h
index 773b2e6b..f332f574 100644
--- a/ginac/idx.h
+++ b/ginac/idx.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's indices. */
 
 /*
- *  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
@@ -25,50 +25,52 @@
 
 #include <string>
 //#include <vector>
-#include <ginac/basic.h>
-#include <ginac/ex.h>
+#include "basic.h"
+#include "ex.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#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 std::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:
     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 printraw(std::ostream & os) const;
+    void printtree(std::ostream & os, unsigned indent) const;
+    void print(std::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
@@ -76,14 +78,14 @@ public:
     bool is_symbolic(void) const;
     unsigned get_value(void) const;
     bool is_covariant(void) const;
-    void setname(string const & n) {name=n;}
-    string getname(void) const {return name;}
+    void setname(const std::string & n) {name=n;}
+    std::string getname(void) const {return name;}
 
     // member variables
 protected:
     unsigned serial;
     bool symbolic;
-    string name;
+    std::string name;
     unsigned value;
     static unsigned next_serial;
     bool covariant; // x_mu, default is contravariant: x^mu
@@ -92,7 +94,7 @@ protected:
 // global constants
 
 extern const idx some_idx;
-extern type_info const & typeid_idx;
+extern const type_info & typeid_idx;
 
 // utility functions
 inline const idx &ex_to_idx(const ex &e)
@@ -102,19 +104,17 @@ inline const idx &ex_to_idx(const ex &e)
 
 // global functions
 
-// 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_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_IDX_H__