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] Simplify shallowBeautify

Browse Source
This commit is contained in:
Ruben Dashyan
2020-03-25 17:01:45 +01:00
committed by Émilie Feral
parent 2895d365a6
commit c12ab3a2e2
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
poincare/src/multiplication.cpp
View File

@@ -411,7 +411,25 @@ Expression Multiplication::shallowBeautify(ExpressionNode::ReductionContext redu
}
if (unitsAccu.numberOfChildren() > 0) {
units = Division::Builder(units, unitsAccu.clone()).deepReduce(reductionContext);
units = Multiplication::Builder(unitsAccu, units).shallowReduce(reductionContext);
units = Multiplication::Builder(units);
static_cast<Multiplication &>(units).mergeSameTypeChildrenInPlace();
{
Expression unitsNumer, unitsDenom, unitsUnits;
static_cast<Multiplication&>(units).splitIntoNormalForm(unitsNumer, unitsDenom, unitsUnits, reductionContext);
if (!unitsNumer.isUninitialized()) {
result = Multiplication::Builder(result, unitsNumer);
}
if (!unitsDenom.isUninitialized()) {
result = Division::Builder(result, unitsDenom);
}
units = unitsUnits;
}
if (units.isUninitialized()) {
units = unitsAccu;
} else {
units = Multiplication::Builder(unitsAccu, units);
static_cast<Multiplication &>(units).mergeSameTypeChildrenInPlace();
}
}
/* Turn into 'Float x units'.
@@ -421,20 +439,6 @@ Expression Multiplication::shallowBeautify(ExpressionNode::ReductionContext redu
* we focus on one single factor. The first Unit factor is certainly the
* most relevant.
*/
if (units.type() == ExpressionNode::Type::Multiplication) {
/* First, as step 2 might have introduced non Unit factors in 'units',
* 'units' must be split again.
*/
Expression unitsNumer, unitsDenom, unitsUnits;
static_cast<Multiplication&>(units).splitIntoNormalForm(unitsNumer, unitsDenom, unitsUnits, reductionContext);
if (!unitsNumer.isUninitialized()) {
result = Multiplication::Builder(result, unitsNumer);
}
if (!unitsDenom.isUninitialized()) {
result = Division::Builder(result, unitsDenom);
}
units = unitsUnits;
}
double value = result.approximateToScalar<double>(reductionContext.context(), reductionContext.complexFormat(), reductionContext.angleUnit());
if (std::isnan(value)) {