Problem roughly localised

Author: kpeeters

core/Permutations.hh

@@ -24,10 +24,11 @@ class Perm {
 		std::vector<int> perm;
 
 		/// Find the permutation that takes [start1, end1> to [start2, end2>.
+		/// This will be available in 'perm' afterwards.
 		template<class iterator>
 		void find(iterator start1, iterator end1, iterator start2, iterator end2);
 
-		/// Apply the permutation on the range. 
+		/// Apply the permutation 'perm' on the given range.
 		template<class iterator>
 		void apply(iterator start1, iterator end1);
 
@@ -81,7 +82,11 @@ void Perm::apply(iterator start, iterator end)
 		}
 
 	// std::cerr << orig.size() << ", " << perm.size() << std::endl;
-	assert(orig.size()==perm.size());
+	if(orig.size()!=perm.size()) {
+		std::cerr << "Perm::apply: orig.size()=" << orig.size() << ", "
+					 << "perm.size()=" << perm.size() << std::endl;
+		assert(orig.size()==perm.size());
+		}
 
 	for(unsigned int i=0; i<orig.size(); ++i) {
 		*start=orig[perm[i]];

core/algorithms/evaluate.cc

@@ -12,7 +12,7 @@
 #include "properties/Accent.hh"
 #include <functional>
 
-//#define DEBUG
+#define DEBUG
 
 using namespace cadabra;
 
@@ -364,18 +364,24 @@ void evaluate::merge_components(iterator it1, iterator it2)
 	// we can be assured that the free indices match; they just may not be
 	// in the same order).
 
+	#ifdef DEBUG
+	std::cerr << "merge_components on " << Ex(it1) << " and " << Ex(it2) << std::endl;
+	#endif
+
 	assert(*it1->name=="\\components");
 	assert(*it2->name=="\\components");
 	sibling_iterator sib1=tr.end(it1);
 	--sib1;
 	sibling_iterator sib2=tr.end(it2);
 	--sib2;
+	assert(*sib1->name=="\\comma");
+	assert(*sib2->name=="\\comma");	
 
-	// We cannot directly compare the lhs of this equals node with the lhs
-	// of the equals node of the other components node, because the index
-	// order on the two components nodes may be different. We first
-	// have to ensure that the orders are the same (but only, of course)
-	// if we have anything to permutate in the first place.
+	// We cannot directly compare the lhs of the equals nodes of it1
+	// with the lhs of the equals node of it2, because the index order
+	// on the two components nodes may be different. We first have to
+	// ensure that the orders are the same (but only, of course) if we
+	// have anything to permutate in the first place.
 
 	if(*tr.begin(it1)->name!="\\comma") {
 		// Look at all indices on the two components nodes. Find
@@ -384,14 +390,20 @@ void evaluate::merge_components(iterator it1, iterator it2)
 		Perm perm;
 		perm.find(tr.begin(it2), sib2, tr.begin(it1), sib1);
 
-		//perm.apply(tr.begin(it2), sib2);
-		//std::cerr << "after permutation " << Ex(tr) << std::endl;
-		
+		// For each \equals node in the it2 comma node, permute
+		// the values so they agree with the index order on it1.
 		cadabra::do_list(tr, sib2, [&](Ex::iterator nd) {
-				auto lhs2 = tr.begin(nd);
-				perm.apply(tr.begin(lhs2), tr.end(lhs2));
+				// nd is an \equals node.
+				assert(*nd->name=="\\equals");
+				auto comma = tr.begin(nd);
+				assert(*comma->name=="\\comma");
+				perm.apply(tr.begin(comma), tr.end(comma));
 				return true;
 				});
+
+      #ifdef DEBUG
+		std::cerr << "permutations done" << std::endl;
+		#endif
 		}
 
 	// Now all index orders match and we can simply compare index value sets.

doc/cadabra2_hep.tex

@@ -493,9 +493,9 @@ \subsection{Bianchi, Ricci and Schouten identities}
 
 \toprule
 \begin{cdbin}
-\tableau{#}::FilledTableau(dimension=10).
-\tableau{0,0}{1,1} \tableau{a,a}{b,b}:
-@lr_tensor!(%);
+\ftableau{#}::FilledTableau(dimension=10).
+ex:=\ftableau{0,0}{1,1} \ftableau{a,a}{b,b}:
+lr_tensor(_);
 \end{cdbin}
 \begin{cdbout}
 \ftableau{{0}{0}{a}{a},{1}{1}{b}{b}} + \ftableau{{0}{0}{a}{a},{1}{1}{b},{b}} + \ftableau{{0}{0}{a}{a},{1}{1},{b}{b}} + \ftableau{{0}{0}{a},{1}{1}{b},{a},{b}} + \ftableau{{0}{0}{a},{1}{1},{a}{b},{b}} + \ftableau{{0}{0},{1}{1},{a}{a},{b}{b}};

tests/components.cdb

@@ -461,10 +461,10 @@ g^{\alpha\beta}::InverseMetric.
 
 sphe:={ g_{\theta\theta} = r**2,
          g_{\varphi\varphi} = r**2 \sin(\theta)**2 }.
-# complete(sphe, $g^{\alpha\beta}$);
+complete(sphe, $g^{\alpha\beta}$);
 
-#ch:= \Gamma^{\alpha}_{\mu\nu} = 1/2 g^{\alpha\beta} ( \partial_{\nu}{g_{\beta\mu}}
-#                                                      +\partial_{\mu}{g_{\beta\nu}}
-#                                                     -\partial_{\beta}{g_{\mu\nu}} );
+ch:= \Gamma^{\alpha}_{\mu\nu} = 1/2 g^{\alpha\beta} ( \partial_{\nu}{g_{\beta\mu}}
+                                                      +\partial_{\mu}{g_{\beta\nu}}
+                                                     -\partial_{\beta}{g_{\mu\nu}} );
 
-# evaluate(ch, sphe, rhsonly=True);
+evaluate(ch, sphe, rhsonly=True);