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

[poincare] Fix merge error (reapply commit e9df8f7783 and 6c03a5ac0e)

Browse Source
This commit is contained in:
Émilie Feral
2019-05-06 16:33:44 +02:00
parent 4a67d3813e
commit 01c2144bb9
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
poincare/src/matrix_identity.cpp
View File

@@ -27,18 +27,12 @@ int MatrixIdentityNode::serialize(char * buffer, int bufferSize, Preferences::Pr
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);
// Check if the child is an integer
if (input.type() == EvaluationNode<T>::Type::Complex) {
// The child is a complex
std::complex<T> c = static_cast<Complex<T>&>(input).stdComplex();
T im = c.imag();
T re = c.real();
if ((im == 0.0 || std::isnan(im)) // The child is a real
&& (!std::isnan(re) && re > 0) // The child is positive
&& (std::ceil(re) == std::floor(re))) // The child is an integer
{
return MatrixComplex<T>::CreateIdentity((int)re);
}
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
&& std::ceil(r) == std::floor(r) // The child is an integer
&& r < ((float) INT_MAX)) // The child is not too big
{
return MatrixComplex<T>::CreateIdentity((int)r);
}
return Complex<T>::Undefined();
}