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/multiplication] Make sure a Multiplication is not made of (Power of) Units only

Browse Source
This commit is contained in:
Ruben Dashyan
2020-03-20 15:08:43 +01:00
committed by Émilie Feral
parent 4d1129b0db
commit 2895d365a6
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
poincare/src/multiplication.cpp
View File

@@ -360,6 +360,7 @@ Expression Multiplication::shallowBeautify(ExpressionNode::ReductionContext redu
if (!denom.isUninitialized()) {
result = Division::Builder(result.isUninitialized() ? Rational::Builder(1) : result, denom);
}
assert(!result.isUninitialized());
/* Step 3: Handle the units
*/
@@ -427,18 +428,15 @@ Expression Multiplication::shallowBeautify(ExpressionNode::ReductionContext redu
Expression unitsNumer, unitsDenom, unitsUnits;
static_cast<Multiplication&>(units).splitIntoNormalForm(unitsNumer, unitsDenom, unitsUnits, reductionContext);
if (!unitsNumer.isUninitialized()) {
result = result.isUninitialized() ? unitsNumer : Multiplication::Builder(result, unitsNumer);
result = Multiplication::Builder(result, unitsNumer);
}
if (!unitsDenom.isUninitialized()) {
result = Division::Builder(result.isUninitialized() ? Rational::Builder(1) : result, unitsDenom);
result = Division::Builder(result, unitsDenom);
}
units = unitsUnits;
}
double value = 1.0;
if (!result.isUninitialized()) {
value = result.approximateToScalar<double>(reductionContext.context(), reductionContext.complexFormat(), reductionContext.angleUnit());
}
double value = result.approximateToScalar<double>(reductionContext.context(), reductionContext.complexFormat(), reductionContext.angleUnit());
if (std::isnan(value)) {
// If the value is undefined, return "undef" without any unit
result = Undefined::Builder();
@@ -701,11 +699,15 @@ Expression Multiplication::privateShallowReduce(ExpressionNode::ReductionContext
* If the first child is 1, we remove it if there are other children. */
{
const Expression c = childAtIndex(0);
if (c.type() != ExpressionNode::Type::Rational) {
if (hasUnit()) {
// Make sure a Multiplication is not made of (Power of) Units only
if (!c.isNumber()) {
addChildAtIndexInPlace(Rational::Builder(1), 0, numberOfChildren());
}
} else if (c.type() != ExpressionNode::Type::Rational) {
} else if (static_cast<const Rational &>(c).isZero()) {
// Check that other children don't match inf or unit
bool infiniteOrUnitFactor = recursivelyMatches([](const Expression e, Context * context) { return Expression::IsInfinity(e,context) || e.type() == ExpressionNode::Type::Unit; }, context);
if (!infiniteOrUnitFactor) {
if (!recursivelyMatches(IsInfinity, context)) {
replaceWithInPlace(c);
return c;
}