- prepared for 1.0.13 release

[ginac.git] / ginac / idx.h

diff --git a/ginac/idx.h b/ginac/idx.h
index d98d4b14932bf1b6db5cd829e8f987c09d1816f1..ecc6f468439bb7c25d9fc12b2cdcfcd2077bc711 100644 (file)
--- a/ginac/idx.h
+++ b/ginac/idx.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's indices. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2003 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,6 +24,7 @@
 #define __GINAC_IDX_H__
 
 #include "ex.h"
+#include "numeric.h"
 
 namespace GiNaC {
 
@@ -45,7 +46,7 @@ public:
         *  @return newly constructed index */
        explicit idx(const ex & v, const ex & dim);
 
-       // functions overriding virtual functions from bases classes
+       // functions overriding virtual functions from base classes
 public:
        void print(const print_context & c, unsigned level = 0) const;
        bool info(unsigned inf) const;
@@ -70,19 +71,26 @@ public:
        ex get_value(void) const {return value;}
 
        /** Check whether the index is numeric. */
-       bool is_numeric(void) const {return is_ex_exactly_of_type(value, numeric);}
+       bool is_numeric(void) const {return is_exactly_a<numeric>(value);}
 
        /** Check whether the index is symbolic. */
-       bool is_symbolic(void) const {return !is_ex_exactly_of_type(value, numeric);}
+       bool is_symbolic(void) const {return !is_exactly_a<numeric>(value);}
 
        /** Get dimension of index space. */
        ex get_dim(void) const {return dim;}
 
        /** Check whether the dimension is numeric. */
-       bool is_dim_numeric(void) const {return is_ex_exactly_of_type(dim, numeric);}
+       bool is_dim_numeric(void) const {return is_exactly_a<numeric>(dim);}
 
        /** Check whether the dimension is symbolic. */
-       bool is_dim_symbolic(void) const {return !is_ex_exactly_of_type(dim, numeric);}
+       bool is_dim_symbolic(void) const {return !is_exactly_a<numeric>(dim);}
+
+       /** Make a new index with the same value but a different dimension. */
+       ex replace_dim(const ex & new_dim) const;
+
+       /** Return the minimum of the dimensions of this and another index.
+        *  If this is undecidable, throw an exception. */
+       ex minimal_dim(const idx & other) const;
 
 protected:
        ex value; /**< Expression that constitutes the index (numeric or symbolic name) */
@@ -106,7 +114,7 @@ public:
         *  @return newly constructed index */
        varidx(const ex & v, const ex & dim, bool covariant = false);
 
-       // functions overriding virtual functions from bases classes
+       // functions overriding virtual functions from base classes
 public:
        void print(const print_context & c, unsigned level = 0) const;
        bool is_dummy_pair_same_type(const basic & other) const;
@@ -151,7 +159,7 @@ public:
         *  @return newly constructed index */
        spinidx(const ex & v, const ex & dim = 2, bool covariant = false, bool dotted = false);
 
-       // functions overriding virtual functions from bases classes
+       // functions overriding virtual functions from base classes
 public:
        void print(const print_context & c, unsigned level = 0) const;
        bool is_dummy_pair_same_type(const basic & other) const;
@@ -183,27 +191,6 @@ protected:
 
 // utility functions
 
-/** Return the idx object handled by an ex.  Deprecated: use ex_to<idx>().
- *  This is unsafe: you need to check the type first. */
-inline const idx &ex_to_idx(const ex & e)
-{
-       return static_cast<const idx &>(*e.bp);
-}
-
-/** Return the varidx object handled by an ex.  Deprecated: use ex_to<varidx>().
- *  This is unsafe: you need to check the type first. */
-inline const varidx &ex_to_varidx(const ex & e)
-{
-       return static_cast<const varidx &>(*e.bp);
-}
-
-/** Return the spinidx object handled by an ex.  Deprecated: use ex_to<spinidx>().
- *  This is unsafe: you need to check the type first. */
-inline const spinidx &ex_to_spinidx(const ex & e)
-{
-       return static_cast<const spinidx &>(*e.bp);
-}
-
 /** Specialization of is_exactly_a<idx>(obj) for idx objects. */
 template<> inline bool is_exactly_a<idx>(const basic & obj)
 {