X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fidx.h;h=beb137d12d967f4c940825ec8ace48d392b210ef;hb=c97593c0903a847e84c7ae4aad182bafb6430ffd;hp=f00f2dd141a4c0c6a83c6deb1cb686db9fcbf9ec;hpb=67467d256b44f5e08498ca81c946d9ffaa25d1e2;p=ginac.git

diff --git a/ginac/idx.h b/ginac/idx.h
index f00f2dd1..beb137d1 100644
--- a/ginac/idx.h
+++ b/ginac/idx.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's indices. */
 
 /*
- *  GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2024 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
@@ -20,15 +20,14 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_IDX_H__
-#define __GINAC_IDX_H__
+#ifndef GINAC_IDX_H
+#define GINAC_IDX_H
 
 #include "ex.h"
 #include "numeric.h"
 
 namespace GiNaC {
 
-
 /** This class holds one index of an indexed object. Indices can
  *  theoretically consist of any symbolic expression but they are usually
  *  only just a symbol (e.g. "mu", "i") or numeric (integer). Indices belong
@@ -42,23 +41,23 @@ public:
 	/** Construct index with given value and dimension.
 	 *
 	 *  @param v Value of index (numeric or symbolic)
-	 *  @param dim Dimension of index space (numeric or symbolic)
-	 *  @return newly constructed index */
+	 *  @param dim Dimension of index space (numeric or symbolic) */
 	explicit idx(const ex & v, const ex & dim);
 
 	// functions overriding virtual functions from base classes
 public:
-	bool info(unsigned inf) const;
-	size_t nops() const;
-	ex op(size_t i) const;
-	ex map(map_function & f) const;
-	ex evalf(int level = 0) const;
-	ex subs(const exmap & m, unsigned options = 0) const;
-
+	bool info(unsigned inf) const override;
+	size_t nops() const override;
+	ex op(size_t i) const override;
+	ex map(map_function & f) const override;
+	ex evalf() const override;
+	ex subs(const exmap & m, unsigned options = 0) const override;
+	void archive(archive_node& n) const override;
+	void read_archive(const archive_node& n, lst& syms) override;
 protected:
-	ex derivative(const symbol & s) const;
-	bool match_same_type(const basic & other) const;
-	unsigned calchash() const;
+	ex derivative(const symbol & s) const override;
+	bool match_same_type(const basic & other) const override;
+	unsigned calchash() const override;
 
 	// new virtual functions in this class
 public:
@@ -104,6 +103,7 @@ protected:
 	ex value; /**< Expression that constitutes the index (numeric or symbolic name) */
 	ex dim;   /**< Dimension of space (can be symbolic or numeric) */
 };
+GINAC_DECLARE_UNARCHIVER(idx); 
 
 
 /** This class holds an index with a variance (co- or contravariant). There
@@ -118,16 +118,16 @@ public:
 	 *
 	 *  @param v Value of index (numeric or symbolic)
 	 *  @param dim Dimension of index space (numeric or symbolic)
-	 *  @param covariant Make covariant index (default is contravariant)
-	 *  @return newly constructed index */
+	 *  @param covariant Make covariant index (default is contravariant) */
 	varidx(const ex & v, const ex & dim, bool covariant = false);
 
 	// functions overriding virtual functions from base classes
 public:
-	bool is_dummy_pair_same_type(const basic & other) const;
-
+	bool is_dummy_pair_same_type(const basic & other) const override;
+	void archive(archive_node& n) const override;
+	void read_archive(const archive_node& n, lst& syms) override;
 protected:
-	bool match_same_type(const basic & other) const;
+	bool match_same_type(const basic & other) const override;
 
 	// non-virtual functions in this class
 public:
@@ -148,6 +148,7 @@ protected:
 protected:
 	bool covariant; /**< x.mu, default is contravariant: x~mu */
 };
+GINAC_DECLARE_UNARCHIVER(varidx);
 
 
 /** This class holds a spinor index that can be dotted or undotted and that
@@ -166,18 +167,18 @@ public:
 	 *  @param v Value of index (numeric or symbolic)
 	 *  @param dim Dimension of index space (numeric or symbolic)
 	 *  @param covariant Make covariant index (default is contravariant)
-	 *  @param dotted Make covariant dotted (default is undotted)
-	 *  @return newly constructed index */
+	 *  @param dotted Make covariant dotted (default is undotted) */
 	spinidx(const ex & v, const ex & dim = 2, bool covariant = false, bool dotted = false);
 
 	// functions overriding virtual functions from base classes
 public:
-	bool is_dummy_pair_same_type(const basic & other) const;
+	bool is_dummy_pair_same_type(const basic & other) const override;
 	// complex conjugation
-	ex conjugate() const { return toggle_dot(); }
-
+	ex conjugate() const override { return toggle_dot(); }
+	void archive(archive_node& n) const override;
+	void read_archive(const archive_node& n, lst& syms) override;
 protected:
-	bool match_same_type(const basic & other) const;
+	bool match_same_type(const basic & other) const override;
 
 	// non-virtual functions in this class
 public:
@@ -204,6 +205,7 @@ protected:
 protected:
 	bool dotted;
 };
+GINAC_DECLARE_UNARCHIVER(spinidx);
 
 
 // utility functions
@@ -269,4 +271,4 @@ ex minimal_dim(const ex & dim1, const ex & dim2);
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_IDX_H__
+#endif // ndef GINAC_IDX_H