X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Findexed.cpp;h=c6a84e31ac70e6346091651bd0eb61f1a70fef5d;hp=459caa92f473c535bdb81415d5fcadc42a3bc3fd;hb=f30eb24864efd57bd7271cfccd8e526321682266;hpb=591b85b0697370f2f5f25a29a1e94ff831a02c12

diff --git a/ginac/indexed.cpp b/ginac/indexed.cpp
index 459caa92..c6a84e31 100644
--- a/ginac/indexed.cpp
+++ b/ginac/indexed.cpp
@@ -187,7 +187,7 @@ void indexed::archive(archive_node &n) const
 DEFAULT_UNARCHIVE(indexed)
 
 //////////
-// functions overriding virtual functions from bases classes
+// functions overriding virtual functions from base classes
 //////////
 
 void indexed::print(const print_context & c, unsigned level) const
@@ -201,7 +201,6 @@ void indexed::print(const print_context & c, unsigned level) const
 		    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
 		    << ", " << seq.size()-1 << " indices"
 		    << ", symmetry=" << symtree << std::endl;
-		c.s << std::endl;
 		unsigned delta_indent = static_cast<const print_tree &>(c).delta_indent;
 		seq[0].print(c, level + delta_indent);
 		printindices(c, level + delta_indent);
@@ -411,6 +410,14 @@ void indexed::validate(void) const
 	}
 }
 
+/** Implementation of ex::diff() for an indexed object always returns 0.
+ *
+ *  @see ex::diff */
+ex indexed::derivative(const symbol & s) const
+{
+	return _ex0();
+}
+
 //////////
 // global functions
 //////////
@@ -527,8 +534,8 @@ exvector power::get_free_indices(void) const
  *    by the function */
 static ex rename_dummy_indices(const ex & e, exvector & global_dummy_indices, exvector & local_dummy_indices)
 {
-	int global_size = global_dummy_indices.size(),
-	    local_size = local_dummy_indices.size();
+	unsigned global_size = global_dummy_indices.size(),
+	         local_size = local_dummy_indices.size();
 
 	// Any local dummy indices at all?
 	if (local_size == 0)
@@ -557,7 +564,8 @@ static ex rename_dummy_indices(const ex & e, exvector & global_dummy_indices, ex
 	for (unsigned i=0; i<local_size; i++) {
 		ex loc_sym = local_dummy_indices[i].op(0);
 		ex glob_sym = global_dummy_indices[i].op(0);
-		if (!loc_sym.is_equal(glob_sym)) {
+		if (!loc_sym.is_equal(glob_sym)
+		 && ex_to<idx>(local_dummy_indices[i]).get_dim().is_equal(ex_to<idx>(global_dummy_indices[i]).get_dim())) {
 			all_equal = false;
 			local_syms.append(loc_sym);
 			global_syms.append(glob_sym);
@@ -587,7 +595,7 @@ ex simplify_indexed_product(const ex & e, exvector & free_indices, exvector & du
 		v.push_back(e.op(0));
 		v.push_back(e.op(0));
 	} else {
-		for (int i=0; i<e.nops(); i++) {
+		for (unsigned i=0; i<e.nops(); i++) {
 			ex f = e.op(i);
 			if (is_ex_exactly_of_type(f, power) && f.op(1).is_equal(_ex2())) {
 				v.push_back(f.op(0));
@@ -595,7 +603,7 @@ ex simplify_indexed_product(const ex & e, exvector & free_indices, exvector & du
 			} else if (is_ex_exactly_of_type(f, ncmul)) {
 				// Noncommutative factor found, split it as well
 				non_commutative = true; // everything becomes noncommutative, ncmul will sort out the commutative factors later
-				for (int j=0; j<f.nops(); j++)
+				for (unsigned j=0; j<f.nops(); j++)
 					v.push_back(f.op(j));
 			} else
 				v.push_back(f);
@@ -636,12 +644,13 @@ try_again:
 			// Check whether the two factors share dummy indices
 			exvector free, dummy;
 			find_free_and_dummy(un, free, dummy);
-			if (dummy.size() == 0)
+			unsigned num_dummies = dummy.size();
+			if (num_dummies == 0)
 				continue;
 
 			// At least one dummy index, is it a defined scalar product?
 			bool contracted = false;
-			if (free.size() == 0) {
+			if (free.empty()) {
 				if (sp.is_defined(*it1, *it2)) {
 					*it1 = sp.evaluate(*it1, *it2);
 					*it2 = _ex1();
@@ -650,13 +659,13 @@ try_again:
 			}
 
 			// Contraction of symmetric with antisymmetric object is zero
-			if (dummy.size() > 1
+			if (num_dummies > 1
 			 && ex_to<symmetry>(ex_to<indexed>(*it1).symtree).has_symmetry()
 			 && ex_to<symmetry>(ex_to<indexed>(*it2).symtree).has_symmetry()) {
 
 				// Check all pairs of dummy indices
-				for (unsigned idx1=0; idx1<dummy.size()-1; idx1++) {
-					for (unsigned idx2=idx1+1; idx2<dummy.size(); idx2++) {
+				for (unsigned idx1=0; idx1<num_dummies-1; idx1++) {
+					for (unsigned idx2=idx1+1; idx2<num_dummies; idx2++) {
 
 						// Try and swap the index pair and check whether the
 						// relative sign changed
@@ -881,10 +890,12 @@ ex scalar_products::evaluate(const ex & v1, const ex & v2) const
 void scalar_products::debugprint(void) const
 {
 	std::cerr << "map size=" << spm.size() << std::endl;
-	for (spmap::const_iterator cit=spm.begin(); cit!=spm.end(); ++cit) {
-		const spmapkey & k = cit->first;
+	spmap::const_iterator i = spm.begin(), end = spm.end();
+	while (i != end) {
+		const spmapkey & k = i->first;
 		std::cerr << "item key=(" << k.first << "," << k.second;
-		std::cerr << "), value=" << cit->second << std::endl;
+		std::cerr << "), value=" << i->second << std::endl;
+		++i;
 	}
 }