Merge branch 'cbehan-patch7'

Author: kpeeters

core/algorithms/sort_product.cc

@@ -115,17 +115,47 @@ Algorithm::result_t sort_product::apply(iterator& st)
 				}
 			}
 		if(found) {
+			// Construct all cyclic orderings
+			std::vector<std::vector<Ex::sibling_iterator>> candidates;
 			one=tr.begin(st);
-			two=one;
-			++two;
-			while(two!=tr.end(st)) {
-				compare.clear();
-				auto es=compare.equal_subtree(one, two);
-				if(compare.should_swap(one, es)) one=two;
+			while(one!=tr.end(st)) {
+				two=one;
 				++two;
+				if(two==tr.end(st)) two=tr.begin(st);
+				std::vector<Ex::sibling_iterator> candidate(1, one);
+				while(two!=one) {
+					candidate.push_back(two);
+					++two;
+					if(two==tr.end(st)) two=tr.begin(st);
+					}
+				candidates.push_back(candidate);
+				++one;
+				}
+			// Narrow them down by comparing first digit, then second digit, ...
+			unsigned int digit=1;
+			while(candidates.size()>1 && digit<=num) {
+				std::vector<std::vector<Ex::sibling_iterator>>::iterator candidate=candidates.begin();
+				one=candidate->at(digit-1);
+				++candidate;
+				while(candidate!=candidates.end()) {
+					two=candidate->at(digit-1);
+					compare.clear();
+					auto es=compare.equal_subtree(one, two);
+					if(es==Ex_comparator::match_t::no_match_greater || es==Ex_comparator::match_t::match_index_greater) {
+						--candidate;
+						candidate=candidates.erase(candidate);
+						one=candidate->at(digit-1);
+						++candidate;
+						}
+					else if(es==Ex_comparator::match_t::no_match_less || es==Ex_comparator::match_t::match_index_less) {
+						candidate=candidates.erase(candidate);
+						}
+					else ++candidate;
+					}
+				++digit;
 				}
-			// We have found the element that should go at the front of the trace
-			Ex::sibling_iterator front=one;
+			// Use the first ordering but keep track of signs this time
+			Ex::sibling_iterator front=candidates.at(0).at(0);
 			if(front!=tr.begin(st)) {
 				while(tr.begin(st)!=front) {
 					one=tr.begin(st);

tests/implicit.cdb

@@ -209,4 +209,16 @@ def test16():
     print("Test 16 passed")
 
 test16()
-        
+
+def test17():
+    __cdbkernel__=create_scope()
+    {A,B}::ImplicitIndex.
+    tr{#}::Trace.
+    ex:=tr( A B B A );
+    sort_product(_)
+    tst:= tr( A A B B ) - @(ex);
+    assert(tst==0)
+    print("Test 17 passed")
+
+test17()
+