X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fidx.cpp;h=578b2bf935da21b0f475a8d281df851739e6aba5;hp=9017a9cae95876e1d30146fdf2bcd9024a32086c;hb=bb3808bb989db7e81755f1bfc7c6863d7c960e06;hpb=d448856f20cb58f939ddbf636e7f72e3599b1468

diff --git a/ginac/idx.cpp b/ginac/idx.cpp
index 9017a9ca..578b2bf9 100644
--- a/ginac/idx.cpp
+++ b/ginac/idx.cpp
@@ -20,8 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <iostream>
 #include <stdexcept>
-#include <algorithm>
 
 #include "idx.h"
 #include "symbol.h"
@@ -29,7 +29,6 @@
 #include "print.h"
 #include "archive.h"
 #include "utils.h"
-#include "debugmsg.h"
 
 namespace GiNaC {
 
@@ -38,23 +37,18 @@ GINAC_IMPLEMENT_REGISTERED_CLASS(varidx, idx)
 GINAC_IMPLEMENT_REGISTERED_CLASS(spinidx, varidx)
 
 //////////
-// default constructor, destructor, copy constructor assignment operator and helpers
+// default ctor, dtor, copy ctor, assignment operator and helpers
 //////////
 
-idx::idx() : inherited(TINFO_idx)
-{
-	debugmsg("idx default constructor", LOGLEVEL_CONSTRUCT);
-}
+idx::idx() : inherited(TINFO_idx) {}
 
 varidx::varidx() : covariant(false)
 {
-	debugmsg("varidx default constructor", LOGLEVEL_CONSTRUCT);
 	tinfo_key = TINFO_varidx;
 }
 
 spinidx::spinidx() : dotted(false)
 {
-	debugmsg("spinidx default constructor", LOGLEVEL_CONSTRUCT);
 	tinfo_key = TINFO_spinidx;
 }
 
@@ -87,7 +81,6 @@ DEFAULT_DESTROY(spinidx)
 
 idx::idx(const ex & v, const ex & d) : inherited(TINFO_idx), value(v), dim(d)
 {
-	debugmsg("idx constructor from ex,ex", LOGLEVEL_CONSTRUCT);
 	if (is_dim_numeric())
 		if (!dim.info(info_flags::posint))
 			throw(std::invalid_argument("dimension of space must be a positive integer"));
@@ -95,13 +88,11 @@ idx::idx(const ex & v, const ex & d) : inherited(TINFO_idx), value(v), dim(d)
 
 varidx::varidx(const ex & v, const ex & d, bool cov) : inherited(v, d), covariant(cov)
 {
-	debugmsg("varidx constructor from ex,ex,bool", LOGLEVEL_CONSTRUCT);
 	tinfo_key = TINFO_varidx;
 }
 
 spinidx::spinidx(const ex & v, const ex & d, bool cov, bool dot) : inherited(v, d, cov), dotted(dot)
 {
-	debugmsg("spinidx constructor from ex,ex,bool,bool", LOGLEVEL_CONSTRUCT);
 	tinfo_key = TINFO_spinidx;
 }
 
@@ -111,20 +102,17 @@ spinidx::spinidx(const ex & v, const ex & d, bool cov, bool dot) : inherited(v,
 
 idx::idx(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
 {
-	debugmsg("idx constructor from archive_node", LOGLEVEL_CONSTRUCT);
 	n.find_ex("value", value, sym_lst);
 	n.find_ex("dim", dim, sym_lst);
 }
 
 varidx::varidx(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
 {
-	debugmsg("varidx constructor from archive_node", LOGLEVEL_CONSTRUCT);
 	n.find_bool("covariant", covariant);
 }
 
 spinidx::spinidx(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
 {
-	debugmsg("spinidx constructor from archive_node", LOGLEVEL_CONSTRUCT);
 	n.find_bool("dotted", dotted);
 }
 
@@ -157,8 +145,6 @@ DEFAULT_UNARCHIVE(spinidx)
 
 void idx::print(const print_context & c, unsigned level) const
 {
-	debugmsg("idx print", LOGLEVEL_PRINT);
-
 	if (is_of_type(c, print_tree)) {
 
 		c.s << std::string(level, ' ') << class_name()
@@ -170,7 +156,9 @@ void idx::print(const print_context & c, unsigned level) const
 
 	} else {
 
-		if (!is_of_type(c, print_latex))
+		if (is_a<print_latex>(c))
+			c.s << "_{";
+		else
 			c.s << ".";
 		bool need_parens = !(is_ex_exactly_of_type(value, numeric) || is_ex_of_type(value, symbol));
 		if (need_parens)
@@ -178,13 +166,13 @@ void idx::print(const print_context & c, unsigned level) const
 		value.print(c);
 		if (need_parens)
 			c.s << ")";
+		if (is_a<print_latex>(c))
+			c.s << "}";
 	}
 }
 
 void varidx::print(const print_context & c, unsigned level) const
 {
-	debugmsg("varidx print", LOGLEVEL_PRINT);
-
 	if (is_of_type(c, print_tree)) {
 
 		c.s << std::string(level, ' ') << class_name()
@@ -196,8 +184,12 @@ void varidx::print(const print_context & c, unsigned level) const
 		dim.print(c, level + delta_indent);
 
 	} else {
-
-		if (!is_of_type(c, print_latex)) {
+		if (is_a<print_latex>(c)) {
+			if (covariant)
+				c.s << "_{";
+			else
+				c.s << "^{";
+		} else {
 			if (covariant)
 				c.s << ".";
 			else
@@ -209,13 +201,13 @@ void varidx::print(const print_context & c, unsigned level) const
 		value.print(c);
 		if (need_parens)
 			c.s << ")";
+		if (is_a<print_latex>(c))
+			c.s << "}";
 	}
 }
 
 void spinidx::print(const print_context & c, unsigned level) const
 {
-	debugmsg("spinidx print", LOGLEVEL_PRINT);
-
 	if (is_of_type(c, print_tree)) {
 
 		c.s << std::string(level, ' ') << class_name()
@@ -230,7 +222,12 @@ void spinidx::print(const print_context & c, unsigned level) const
 	} else {
 
 		bool is_tex = is_of_type(c, print_latex);
-		if (!is_tex) {
+		if (is_tex) {
+			if (covariant)
+				c.s << "_{";
+			else
+				c.s << "^{";
+		} else {
 			if (covariant)
 				c.s << ".";
 			else
@@ -250,6 +247,8 @@ void spinidx::print(const print_context & c, unsigned level) const
 			c.s << ")";
 		if (is_tex && dotted)
 			c.s << "}";
+		if (is_tex)
+			c.s << "}";
 	}
 }
 
@@ -387,7 +386,7 @@ ex idx::subs(const lst & ls, const lst & lr, bool no_pattern) const
  *  @see ex::diff */
 ex idx::derivative(const symbol & s) const
 {
-	return _ex0();
+	return _ex0;
 }
 
 //////////