UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare/multiplication] Handle non reduced matrices in shallowReduce

Browse Source
This commit is contained in:
Léa Saviot
2019-07-08 09:47:16 +02:00
committed by Émilie Feral
parent 4c09504ebe
commit 9742e019d9
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
poincare/src/multiplication.cpp
View File

@@ -261,7 +261,7 @@ Expression Multiplication::denominator(Context * context, Preferences::ComplexFo
Expression Multiplication::privateShallowReduce(ExpressionNode::ReductionContext reductionContext, bool shouldExpand, bool canBeInterrupted) {
{
Expression e = Expression::defaultShallowReduce();;
Expression e = Expression::defaultShallowReduce();
if (e.isUndefined()) {
return e;
}
@@ -275,9 +275,8 @@ Expression Multiplication::privateShallowReduce(ExpressionNode::ReductionContext
sortChildrenInPlace([](const ExpressionNode * e1, const ExpressionNode * e2, bool canBeInterrupted) { return ExpressionNode::SimplificationOrder(e1, e2, true, canBeInterrupted); }, reductionContext.context(), true);
// Step 3: Handle matrices
/* All children have been simplified so if any child contains a matrix, it
* is at the root node of the child. Moreover, thanks to the simplification
* order, all matrix children (if any) are the last children. */
/* Thanks to the simplification order, all matrix children (if any) are the
* last children. */
Expression lastChild = childAtIndex(numberOfChildren()-1);
if (lastChild.type() == ExpressionNode::Type::Matrix) {
Matrix resultMatrix = static_cast<Matrix &>(lastChild);
@@ -343,9 +342,14 @@ Expression Multiplication::privateShallowReduce(ExpressionNode::ReductionContext
resultMatrix = newResult;
multiplicationChildIndex--;
}
// Distribute the remaining multiplication children on the matrix children
int remainingChildrenCount = numberOfChildren();
if (remainingChildrenCount > 1) {
/* Distribute the remaining multiplication children on the matrix children,
* if there are no oether matrices (such as a non reduced confidence
* interval). */
if (multiplicationChildIndex >= 0) {
if (SortedIsMatrix(childAtIndex(multiplicationChildIndex), reductionContext.context())) {
return *this;
}
removeChildInPlace(resultMatrix, resultMatrix.numberOfChildren());
for (int i = 0; i < n*m; i++) {
Multiplication m = clone().convert<Multiplication>();
@@ -552,7 +556,7 @@ void Multiplication::mergeMultiplicationChildrenInPlace() {
while (i < numberOfChildren()) {
Expression c = childAtIndex(i);
if (c.type() == ExpressionNode::Type::Multiplication) {
mergeChildrenAtIndexInPlace(c, numberOfChildren()); // TODO: ensure that matrix children are not swapped to implement MATRIX_EXACT_REDUCING
mergeChildrenAtIndexInPlace(c, i); // TODO: ensure that matrix children are not swapped to implement MATRIX_EXACT_REDUCING
continue;
}
i++;

1
poincare/test/multiplication.cpp
View File

@@ -70,4 +70,5 @@ QUIZ_CASE(poincare_multiplication_simplify) {
assert_parsed_expression_simplify_to("12^(1/4)×(π/6)×(12×π)^(1/4)", "(√(3)×π^(5/4))/3");
assert_parsed_expression_simplify_to("[[1,2+𝐢][3,4][5,6]]×[[1,2+𝐢,3,4][5,6+𝐢,7,8]]", "[[11+5×𝐢,13+9×𝐢,17+7×𝐢,20+8×𝐢][23,30+7×𝐢,37,44][35,46+11×𝐢,57,68]]");
assert_parsed_expression_simplify_to("[[1,2][3,4]]×[[1,3][5,6]]×[[2,3][4,6]]", "[[82,123][178,267]]");
assert_parsed_expression_simplify_to("π×confidence(π/5,3)[[1,2]]", "π×confidence(π/5,3)×[[1,2]]");
}