github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-20 21:33:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix how we calculate the precision in Unit converter and update GetNumberDigitsWholeNumberPart (#1256)

Browse source 
* Fix 1255

* optimization

* spacing
This commit is contained in:
Rudy Huyn 2020-06-01 16:50:45 -07:00 • committed by GitHub
commit 75fde82f46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CalcManager/NumberFormattingUtils.cpp
View file

@ -50,7 +50,7 @@ namespace CalcManager::NumberFormattingUtils
/// <param name="value">the number</param> /// <param name="value">the number</param>
unsigned int GetNumberDigitsWholeNumberPart(double value) unsigned int GetNumberDigitsWholeNumberPart(double value)
{ {
return value == 0 ? 1 : (1 + static_cast<unsigned int>(log10(abs(value)))); return value == 0 ? 1u : static_cast<unsigned int>(1 + max(0.0, log10(abs(value))));
} }
/// <summary> /// <summary>

3
src/CalcManager/UnitConverter.cpp
View file

@ -905,7 +905,8 @@ void UnitConverter::Calculate()
{ {
// Fewer digits are needed following the decimal if the number is large, // Fewer digits are needed following the decimal if the number is large,
// we calculate the number of decimals necessary based on the number of digits in the integer part. // we calculate the number of decimals necessary based on the number of digits in the integer part.
precision = max(0U, max(OPTIMALDIGITSALLOWED, min(MAXIMUMDIGITSALLOWED, currentNumberSignificantDigits)) - numPreDecimal); auto numberDigits = max(OPTIMALDIGITSALLOWED, min(MAXIMUMDIGITSALLOWED, currentNumberSignificantDigits));
precision = numberDigits > numPreDecimal ? numberDigits - numPreDecimal : 0;
} }
m_returnDisplay = RoundSignificantDigits(returnValue, precision); m_returnDisplay = RoundSignificantDigits(returnValue, precision);

4
src/CalculatorUnitTests/CalculatorManagerTest.cpp
View file

@ -970,6 +970,10 @@ namespace CalculatorManagerTest
VERIFY_ARE_EQUAL(digitsCount, 15); VERIFY_ARE_EQUAL(digitsCount, 15);
digitsCount = GetNumberDigitsWholeNumberPart(324328412837382.232213214324234); digitsCount = GetNumberDigitsWholeNumberPart(324328412837382.232213214324234);
VERIFY_ARE_EQUAL(digitsCount, 15); VERIFY_ARE_EQUAL(digitsCount, 15);
digitsCount = GetNumberDigitsWholeNumberPart(0.032);
VERIFY_ARE_EQUAL(digitsCount, 1);
digitsCount = GetNumberDigitsWholeNumberPart(0.00000000000000000001);
VERIFY_ARE_EQUAL(digitsCount, 1);
} }
void CalculatorManagerTest::CalculatorManagerNumberFormattingUtils_RoundSignificantDigits() void CalculatorManagerTest::CalculatorManagerNumberFormattingUtils_RoundSignificantDigits()