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/print_float] Fix computations

Browse Source 
To fix tests
This commit is contained in:
Léa Saviot
2019-08-07 16:45:39 +02:00
committed by Émilie Feral
parent 3e71d1d6e4
commit a2f1cef60f
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
poincare/include/poincare/print_float.h
View File

@@ -53,7 +53,7 @@ private:
private:
constexpr static int64_t k_base = 1000000000;
constexpr static int k_numberOfDigits = 2;
constexpr static int k_maxNumberOfCharsForDigit = 8;
constexpr static int k_maxNumberOfCharsForDigit = 9;
bool m_negative;
uint32_t m_digits[k_numberOfDigits];

16
poincare/src/print_float.cpp
View File

@@ -28,12 +28,10 @@ PrintFloat::Long::Long(int64_t i) :
m_digits[0] = (nonNegativeI - m_digits[1]) / k_base;
}
PrintFloat::Long::Long(uint32_t d1, uint32_t d2, bool negative) :
m_negative(negative)
{
PrintFloat::Long::Long(uint32_t d1, uint32_t d2, bool negative) {
m_digits[1] = d2;
m_digits[0] = d1;
assert((!negative) || (!isZero()));
m_negative = negative && !isZero();
}
void PrintFloat::Long::DivisionByTen(const Long & longToDivide, Long * quotient, Long * digit) {
@@ -62,8 +60,8 @@ int PrintFloat::Long::serialize(char * buffer, int bufferSize) const {
if (bufferSize == 0) {
return -1;
}
buffer[bufferSize-1] = 0;
if (bufferSize == 1) {
buffer[0] = 0;
return 0;
}
int numberOfChars = m_negative ? 1 : 0; // 1 for the minus sign char
@@ -173,7 +171,6 @@ template <class T>
int PrintFloat::ConvertFloatToTextPrivate(T f, char * buffer, int bufferSize, int numberOfSignificantDigits, Preferences::PrintFloatMode mode, int * numberOfRemovedZeros, bool returnTrueRequiredLength) {
assert(numberOfSignificantDigits > 0);
assert(bufferSize > 0);
buffer[bufferSize - 1] = 0;
if (std::isinf(f)) {
// Infinity
bool writeMinusSign = f < 0;
@@ -323,20 +320,21 @@ int PrintFloat::ConvertFloatToTextPrivate(T f, char * buffer, int bufferSize, in
assert(UTF8Decoder::CharSizeOfCodePoint('-') == 1);
// Print mantissa
int neededNumberOfChars = numberOfCharsForMantissaWithSign + (numberOfCharExponent == 0 ? 0 : UTF8Decoder::CharSizeOfCodePoint(UCodePointLatinLetterSmallCapitalE) + numberOfCharExponent);
bool doNotWriteExponent = (mode == Preferences::PrintFloatMode::Decimal) || (exponentInBase10 == 0);
int neededNumberOfChars = numberOfCharsForMantissaWithSign + (doNotWriteExponent ? 0 : UTF8Decoder::CharSizeOfCodePoint(UCodePointLatinLetterSmallCapitalE) + numberOfCharExponent);
if (neededNumberOfChars > bufferSize - 1) {
// Exception 3: We are about to overflow the buffer.
return neededNumberOfChars;
}
PrintLongWithDecimalMarker(buffer, numberOfCharsForMantissaWithSign, dividend, decimalMarkerPosition);
if (mode == Preferences::PrintFloatMode::Decimal || exponentInBase10 == 0) {
if (doNotWriteExponent) {
buffer[numberOfCharsForMantissaWithSign] = 0;
return numberOfCharsForMantissaWithSign;
}
// Print exponent
assert(numberOfCharsForMantissaWithSign < bufferSize);
int currentNumberOfChar = numberOfCharsForMantissaWithSign;
currentNumberOfChar+= SerializationHelper::CodePoint(buffer + currentNumberOfChar, bufferSize - currentNumberOfChar, UCodePointLatinLetterSmallCapitalE);
currentNumberOfChar+= UTF8Decoder::CodePointToChars(UCodePointLatinLetterSmallCapitalE, buffer + currentNumberOfChar, bufferSize - currentNumberOfChar);
dividend = Long(exponentInBase10); // reuse dividend as it is not needed anymore
PrintLongWithDecimalMarker(buffer + currentNumberOfChar, numberOfCharExponent, dividend, -1);
buffer[currentNumberOfChar + numberOfCharExponent] = 0;