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

precisely calculates the number of digits of the source and compute the number of significant digits of the result based on that.

Browse source
This commit is contained in:
Rudy Huyn 2019-05-10 01:36:29 -07:00
commit 7edc584d5b
1 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/CalcManager/UnitConverter.cpp
View file

@ -848,8 +848,7 @@ void UnitConverter::Calculate()
} }
unordered_map<Unit, ConversionData, UnitHash> conversionTable = m_ratioMap[m_fromType]; unordered_map<Unit, ConversionData, UnitHash> conversionTable = m_ratioMap[m_fromType];
double returnValue = stod(m_currentDisplay); if (AnyUnitIsEmpty() || (conversionTable[m_toType].ratio == 1.0 && conversionTable[m_toType].offset == 0.0))
if (conversionTable[m_toType].ratio == 1.0 && conversionTable[m_toType].offset == 0.0)
{ {
m_returnDisplay = m_currentDisplay; m_returnDisplay = m_currentDisplay;
m_returnHasDecimal = m_currentHasDecimal; m_returnHasDecimal = m_currentHasDecimal;
@ -857,7 +856,8 @@ void UnitConverter::Calculate()
} }
else else
{ {
returnValue = Convert(returnValue, conversionTable[m_toType]); double currentValue = stod(m_currentDisplay);
double returnValue = Convert(currentValue, conversionTable[m_toType]);
m_returnDisplay = RoundSignificant(returnValue, MAXIMUMDIGITSALLOWED); m_returnDisplay = RoundSignificant(returnValue, MAXIMUMDIGITSALLOWED);
TrimString(m_returnDisplay); TrimString(m_returnDisplay);
int numPreDecimal = (int)m_returnDisplay.size(); int numPreDecimal = (int)m_returnDisplay.size();
@ -879,16 +879,26 @@ void UnitConverter::Calculate()
else else
{ {
returnValue = stod(m_returnDisplay); returnValue = stod(m_returnDisplay);
wstring returnString;
if (m_currentDisplay.size() <= OPTIMALDIGITSALLOWED && abs(returnValue) >= OPTIMALDECIMALALLOWED) auto currentDisplayTrimmed = m_currentDisplay;
TrimString(currentDisplayTrimmed);
int currentNumberSignificantDigits = currentDisplayTrimmed.size();
if (currentDisplayTrimmed.find(L'.') != currentDisplayTrimmed.npos)
--currentNumberSignificantDigits;
if (currentValue < 0)
--currentNumberSignificantDigits;
int precision = 0;
if (abs(returnValue) < OPTIMALDECIMALALLOWED)
{ {
returnString = RoundSignificant(returnValue, OPTIMALDIGITSALLOWED - min(numPreDecimal, OPTIMALDIGITSALLOWED)); precision = MAXIMUMDIGITSALLOWED;
} }
else else
{ {
returnString = RoundSignificant(returnValue, MAXIMUMDIGITSALLOWED - min(numPreDecimal, MAXIMUMDIGITSALLOWED)); precision = max(0, max(OPTIMALDIGITSALLOWED, min(MAXIMUMDIGITSALLOWED, currentNumberSignificantDigits)) - numPreDecimal);
} }
m_returnDisplay = returnString;
m_returnDisplay = RoundSignificant(returnValue, precision);
TrimString(m_returnDisplay); TrimString(m_returnDisplay);
} }
m_returnHasDecimal = (m_returnDisplay.find(L'.') != m_returnDisplay.npos); m_returnHasDecimal = (m_returnDisplay.find(L'.') != m_returnDisplay.npos);