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/multiplication] Change signature of ExponentsOfBaseUnits

Browse Source
This commit is contained in:
Ruben Dashyan
2020-02-19 14:05:51 +01:00
committed by Émilie Feral
parent 0eb6df27dc
commit 2f6770cd69
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
poincare/src/multiplication.cpp
View File

@@ -314,7 +314,8 @@ static void ExponentsMetrics(const Unit::Dimension::Vector<Integer> &exponents,
}
}
static void ExponentsOfBaseUnits(const Expression units, Unit::Dimension::Vector<Integer> &exponents) {
static Unit::Dimension::Vector<Integer> ExponentsOfBaseUnits(const Expression units) {
Unit::Dimension::Vector<Integer> exponents;
// Make sure the provided Expression is a Multiplication
Expression u = units;
if (u.type() == ExpressionNode::Type::Unit || u.type() == ExpressionNode::Type::Power) {
@@ -343,6 +344,7 @@ static void ExponentsOfBaseUnits(const Expression units, Unit::Dimension::Vector
assert(0 <= indexInTable && indexInTable < Unit::NumberOfBaseUnits);
exponents.setCoefficientAtIndex(indexInTable, exponent);
}
return exponents;
}
static bool CanSimplifyUnitProduct(
@@ -404,8 +406,7 @@ Expression Multiplication::shallowBeautify(ExpressionNode::ReductionContext redu
* - Repeat those steps until no more simplification is possible.
*/
Multiplication unitsAccu = Multiplication::Builder();
Unit::Dimension::Vector<Integer> unitsExponents;
ExponentsOfBaseUnits(units, unitsExponents);
Unit::Dimension::Vector<Integer> unitsExponents = ExponentsOfBaseUnits(units);
size_t unitsSupportSize = 0;
Integer unitsNorm(0);
ExponentsMetrics(unitsExponents, unitsSupportSize, unitsNorm);
@@ -417,10 +418,9 @@ Expression Multiplication::shallowBeautify(ExpressionNode::ReductionContext redu
Integer bestRemainderNorm = unitsNorm;
for (const Unit::Dimension * dim = Unit::DimensionTable + Unit::NumberOfBaseUnits; dim < Unit::DimensionTableUpperBound; dim++) {
Unit entryUnit = Unit::Builder(dim, dim->stdRepresentative(), dim->stdRepresentativePrefix());
Unit::Dimension::Vector<Integer> entryUnitExponents;
Unit::Dimension::Vector<Integer> entryUnitExponents = ExponentsOfBaseUnits(entryUnit.clone().shallowReduce(reductionContext));
Integer entryUnitNorm(0);
size_t entryUnitSupportSize = 0;
ExponentsOfBaseUnits(entryUnit.clone().shallowReduce(reductionContext), entryUnitExponents);
ExponentsMetrics(entryUnitExponents, entryUnitSupportSize, entryUnitNorm);
CanSimplifyUnitProduct(
unitsExponents, entryUnitExponents, entryUnitNorm, entryUnit,