UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare] Power: fix rule x^0 and 1^x with x infinity

Browse Source
This commit is contained in:
Émilie Feral
2019-01-31 14:37:26 +01:00
committed by LeaNumworks
parent 3caf165621
commit e9b11d5bf7
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
poincare/src/power.cpp
View File

@@ -348,8 +348,8 @@ Expression Power::shallowReduce(Context & context, Preferences::ComplexFormat co
const Rational b = childAtIndex(1).convert<Rational>();
// x^0
if (b.isZero()) {
// 0^0 = undef
if (childAtIndex(0).type() == ExpressionNode::Type::Rational && childAtIndex(0).convert<Rational>().isZero()) {
// 0^0 = undef or (±inf)^0 = undef
if ((childAtIndex(0).type() == ExpressionNode::Type::Rational && childAtIndex(0).convert<Rational>().isZero()) || childAtIndex(0).type() == ExpressionNode::Type::Infinity) {
Expression result = Undefined();
replaceWithInPlace(result);
return result;
@@ -376,19 +376,21 @@ Expression Power::shallowReduce(Context & context, Preferences::ComplexFormat co
Rational a = childAtIndex(0).convert<Rational>();
// 0^x
if (a.isZero()) {
// 0^x with x > 0 = 0
if (childAtIndex(1).sign(&context) == ExpressionNode::Sign::Positive) {
Expression result = Rational(0);
replaceWithInPlace(result);
return result;
}
// 0^x with x < 0 = undef
if (childAtIndex(1).sign(&context) == ExpressionNode::Sign::Negative) {
Expression result = Undefined();
replaceWithInPlace(result);
return result;
}
}
// 1^x
if (a.isOne()) {
// 1^x = 1 if x != ±inf
if (a.isOne() && !childAtIndex(1).recursivelyMatchesInfinity(context)) {
Expression result = Rational(1);
replaceWithInPlace(result);
return result;

3
poincare/test/infinity.cpp
View File

@@ -24,6 +24,9 @@ QUIZ_CASE(poincare_infinity) {
assert_parsed_expression_simplify_to("1E-1000", "0");
assert_parsed_expression_evaluates_to<double>("1*10^1000", "inf");
assert_parsed_expression_simplify_to("inf^0", "undef");
assert_parsed_expression_simplify_to("1^inf", "1^inf");
assert_parsed_expression_simplify_to("1^(X^inf)", "1^(X^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");