UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-29 03:29:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

[poincare/matrix_identity] Handle MatrixIdentity(0) (returns undef)

Browse Source
This commit is contained in:
Léa Saviot
2019-08-22 09:48:04 +02:00
parent 7f949386a5
commit e1dbda7769
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
poincare/src/matrix_identity.cpp
View File

@@ -31,7 +31,7 @@ template<typename T>
Evaluation<T> MatrixIdentityNode::templatedApproximate(Context * context, Preferences::ComplexFormat complexFormat, Preferences::AngleUnit angleUnit) const {
Evaluation<T> input = childAtIndex(0)->approximate(T(), context, complexFormat, angleUnit);
T r = input.toScalar(); // Undefined if the child is not real
if (!std::isnan(r) && !std::isinf(r) && r > 0 // The child is defined and positive
if (!std::isnan(r) && !std::isinf(r) && r > (T)0.0 // The child is defined and positive
&& std::ceil(r) == std::floor(r) // The child is an integer
&& r < ((float) INT_MAX)) // The child is not too big
{
@@ -55,13 +55,15 @@ Expression MatrixIdentity::shallowReduce(ExpressionNode::ReductionContext reduct
return *this;
}
Integer dimension = static_cast<Rational &>(c).signedIntegerNumerator();
if (dimension.isNegative()) {
if (dimension.isNegative() || dimension.isZero()) {
return replaceWithUndefinedInPlace();
}
if (Integer::NaturalOrder(dimension, Integer(Integer::k_maxExtractableInteger)) > 0) {
return *this;
}
Expression result = Matrix::CreateIdentity(dimension.extractedInt());
int dim = dimension.extractedInt();
assert(dim != 0);
Expression result = Matrix::CreateIdentity(dim);
replaceWithInPlace(result);
return result;
}