UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-20 09:17:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare] Fix MatrixTrace::shallowReduce

Browse Source
This commit is contained in:
Léa Saviot
2019-07-04 09:41:24 +02:00
committed by Émilie Feral
parent bf4293991d
commit a8d8e72fb4
3 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
poincare/include/poincare/matrix_trace.h
View File

@@ -38,7 +38,7 @@ public:
static constexpr Expression::FunctionHelper s_functionHelper = Expression::FunctionHelper("trace", 1, &UntypedBuilderOneChild<MatrixTrace>);
Expression shallowReduce();
Expression shallowReduce(ExpressionNode::ReductionContext reductionContext);
};
}

36
poincare/src/matrix_trace.cpp
View File

@@ -14,7 +14,7 @@ constexpr Expression::FunctionHelper MatrixTrace::s_functionHelper;
int MatrixTraceNode::numberOfChildren() const { return MatrixTrace::s_functionHelper.numberOfChildren(); }
Expression MatrixTraceNode::shallowReduce(ReductionContext reductionContext) {
return MatrixTrace(this).shallowReduce();
return MatrixTrace(this).shallowReduce(reductionContext);
}
Layout MatrixTraceNode::createLayout(Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const {
@@ -33,7 +33,7 @@ Evaluation<T> MatrixTraceNode::templatedApproximate(Context * context, Preferenc
}
Expression MatrixTrace::shallowReduce() {
Expression MatrixTrace::shallowReduce(ExpressionNode::ReductionContext reductionContext) {
{
Expression e = Expression::defaultShallowReduce();
if (e.isUndefined()) {
@@ -41,32 +41,26 @@ Expression MatrixTrace::shallowReduce() {
}
}
Expression c = childAtIndex(0);
#if MATRIX_EXACT_REDUCING
#if 0
if (c.type() == ExpressionNode::Type::Matrix) {
Matrix m = static_cast<Matrix&>(c);
if (m.numberOfRows() != m.numberOfColumns()) {
return Undefined::Builder();
Matrix matrixChild = static_cast<Matrix&>(c);
if (matrixChild.numberOfRows() != matrixChild.numberOfColumns()) {
return replaceWithUndefinedInPlace();
}
int n = m.numberOfRows();
int n = matrixChild.numberOfRows();
Addition a = Addition::Builder();
for (int i = 0; i < n; i++) {
a.addChildAtIndexInPlace(m.childAtIndex(i+n*i), i, a.numberOfChildren());
a.addChildAtIndexInPlace(matrixChild.matrixChild(i,i), i, i);
}
return a.shallowReduce(context, complexFormat, angleUnit);
replaceWithInPlace(a);
return a.shallowReduce(reductionContext);
}
if (!c.recursivelyMatches(Expression::IsMatrix)) {
return c;
/* TODO LEA
if (c.recursivelyMatches(Expression::IsMatrix)) {
return *this;
}
return *this;
#endif
#else
if (c.type() != ExpressionNode::Type::Matrix) {
replaceWithInPlace(c);
return c;
}
return *this;
#endif
*/
replaceWithInPlace(c);
return c;
}
}

6
poincare/test/matrix.cpp
View File

@@ -84,10 +84,10 @@ QUIZ_CASE(poincare_matrix_simplify) {
assert_parsed_expression_simplify_to("dim([[1/√(2),1/2,3][2,1,-3]])", "[[2,3]]");
assert_parsed_expression_simplify_to("inverse([[1/√(2),1/2,3][2,1,-3]])", Undefined::Name());
assert_parsed_expression_simplify_to("inverse([[1,2][3,4]])", "inverse([[1,2][3,4]])"); // TODO: implement matrix inverse if dim < 3
assert_parsed_expression_simplify_to("trace([[1/√(2),1/2,3][2,1,-3]])", Undefined::Name());
assert_parsed_expression_simplify_to("trace([[√(2),2][4,3+log(3)]])", "√(2)+3+log(3)");
assert_parsed_expression_simplify_to("trace(√(2)+log(3))", "√(2)+log(3)");
#endif
assert_parsed_expression_simplify_to("trace([[1/√(2),1/2,3][2,1,-3]])", Undefined::Name());
assert_parsed_expression_simplify_to("trace([[√(2),2][4,3+log(3)]])", "log(3)+√(2)+3");
assert_parsed_expression_simplify_to("trace(√(2)+log(3))", "log(3)+√(2)");
assert_parsed_expression_simplify_to("transpose([[1/√(2),1/2,3][2,1,-3]])", "[[√(2)/2,2][1/2,1][3,-3]]");
assert_parsed_expression_simplify_to("transpose(√(4))", "2");
#if MATRIX_EXACT_REDUCING