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] Power: implement (±inf)^x

Browse Source
This commit is contained in:
Émilie Feral
2018-11-21 15:42:28 +01:00
parent 0e3d8514c5
commit 123f974bff
3 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
poincare/src/power.cpp
View File

@@ -5,6 +5,7 @@
#include <poincare/constant.h>
#include <poincare/cosine.h>
#include <poincare/division.h>
#include <poincare/infinity.h>
#include <poincare/nth_root.h>
#include <poincare/opposite.h>
#include <poincare/parenthesis.h>
@@ -386,6 +387,29 @@ Expression Power::shallowReduce(Context & context, Preferences::AngleUnit angleU
return result.shallowReduce(context, angleUnit);
}
}
// (±inf)^x
if (childAtIndex(0).type() == ExpressionNode::Type::Infinity) {
Expression result;
if (childAtIndex(1).sign() == ExpressionNode::Sign::Negative) {
// --> 0 if x < 0
result = Rational(0);
} else if (childAtIndex(1).sign() == ExpressionNode::Sign::Positive) {
// --> (±inf) if x > 0
result = Infinity(false);
if (childAtIndex(0).sign() == ExpressionNode::Sign::Negative) {
// (-inf)^x --> (-1)^x*inf
Power p(Rational(-1), childAtIndex(1));
result = Multiplication(p, result);
p.shallowReduce(context, angleUnit);
}
}
if (!result.isUninitialized()) {
replaceWithInPlace(result);
return result.shallowReduce(context, angleUnit);
}
}
bool letPowerAtRoot = parentIsALogarithmOfSameBase();
if (childAtIndex(0).type() == ExpressionNode::Type::Rational) {
Rational a = childAtIndex(0).convert<Rational>();

14
poincare/test/infinity.cpp
View File

@@ -17,10 +17,22 @@ QUIZ_CASE(poincare_infinity) {
assert_parsed_expression_simplify_to("0/inf", "0");
assert_parsed_expression_simplify_to("inf/0", Undefined::Name());
assert_parsed_expression_simplify_to("0*inf", Undefined::Name());
assert_parsed_expression_simplify_to("3*inf/inf", "inf/inf"); //TODO undef would be better
assert_parsed_expression_simplify_to("3*inf/inf", "undef");
assert_parsed_expression_simplify_to("1E1000", "inf");
assert_parsed_expression_simplify_to("-1E1000", "-inf");
assert_parsed_expression_simplify_to("-1E-1000", "0");
assert_parsed_expression_simplify_to("1E-1000", "0");
assert_parsed_expression_evaluates_to<double>("1*10^1000", "inf");
assert_parsed_expression_simplify_to("inf^(-1)", "0");
assert_parsed_expression_simplify_to("(-inf)^(-1)", "0");
assert_parsed_expression_simplify_to("inf^(-R(2))", "0");
assert_parsed_expression_simplify_to("(-inf)^(-R(2))", "0");
assert_parsed_expression_simplify_to("inf^2", "inf");
assert_parsed_expression_simplify_to("(-inf)^2", "inf");
assert_parsed_expression_simplify_to("inf^R(2)", "inf");
assert_parsed_expression_simplify_to("(-inf)^R(2)", "inf*(-1)^R(2)");
assert_parsed_expression_simplify_to("inf^x", "inf^x");
assert_parsed_expression_simplify_to("1/inf+24", "24");
}

2
poincare/test/rational.cpp
View File

@@ -89,7 +89,7 @@ QUIZ_CASE(poincare_rational_simplify) {
assert_parsed_expression_simplify_to(buffer, buffer);
// 1/OverflowedIntegerString()
strlcpy(buffer+2, BigOverflowedIntegerString(), 400-2);
assert_parsed_expression_simplify_to(buffer, "1/inf");
assert_parsed_expression_simplify_to(buffer, "0");
// MaxIntegerString()
assert_parsed_expression_simplify_to(MaxIntegerString(), MaxIntegerString());
// OverflowedIntegerString()