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] Unit: improve BuildTimeSplit to avoid displaing null sub unit

Browse Source 
in the final addition and to keep the fractional part of the seconds
This commit is contained in:
Émilie Feral
2020-04-29 12:20:32 +02:00
parent 115ae59b5a
commit fe0a858352
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
poincare/src/unit.cpp
View File

@@ -435,8 +435,8 @@ bool Unit::IsISTime(Expression & e) {
Expression Unit::BuildTimeSplit(double seconds) {
assert(!std::isnan(seconds));
if (std::isinf(seconds)) {
return Multiplication::Builder(Infinity::Builder(seconds < 0.0), Unit::Second());
if (std::isinf(seconds) || std::fabs(seconds) < Expression::Epsilon<double>()) {
return Multiplication::Builder(Number::FloatNumber(seconds), Unit::Second());
}
double remain = seconds;
constexpr static int numberOfTimeUnits = 6;
@@ -446,10 +446,16 @@ Expression Unit::BuildTimeSplit(double seconds) {
double valuesPerUnit[numberOfTimeUnits];
Addition a = Addition::Builder();
for (size_t i = 0; i < numberOfTimeUnits; i++) {
valuesPerUnit[i] = std::floor(remain/timeFactors[i]);
valuesPerUnit[i] = remain/timeFactors[i];
// Keep only the floor of the values except for the last unit (seconds)
if (i < numberOfTimeUnits - 1) {
valuesPerUnit[i] = std::floor(valuesPerUnit[i]);
}
remain -= valuesPerUnit[i]*timeFactors[i];
Multiplication m = Multiplication::Builder(Float<double>::Builder(valuesPerUnit[i]), units[i]);
a.addChildAtIndexInPlace(m, a.numberOfChildren(), a.numberOfChildren());
if (std::fabs(valuesPerUnit[i]) > Expression::Epsilon<double>()) {
Multiplication m = Multiplication::Builder(Float<double>::Builder(valuesPerUnit[i]), units[i]);
a.addChildAtIndexInPlace(m, a.numberOfChildren(), a.numberOfChildren());
}
if (std::fabs(remain) < Expression::Epsilon<double>()) {
break;
}