espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-06-24 08:37:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor to delete smaller number decimal format

Browse Source 
Generalize loop to print decimal format and exponential
 Add '+' to exponent when printing larger floats
This commit is contained in:
jsalling
2016-09-04 21:18:25 -05:00
parent 6ec7c78b66
commit d4a35f0949
1 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/unity.c
View File

@ -277,47 +277,38 @@ void UnityPrintFloat(_UD number)
UNITY_OUTPUT_CHAR('-'); UNITY_OUTPUT_CHAR('-');
number = -number; number = -number;
} }
if (isinf(number)) UnityPrintLen(UnityStrInf, 3); if (isinf(number)) UnityPrintLen(UnityStrInf, 3);
else else /* Small numbers as "%.6f" format string, but uses scientific notation for larger numbers */
{ {
_UD divisor = 1; _UD divisor = 1.0f;
_U_UINT exponent = 0; _U_UINT exponent = 0;
int scifmt;
_U_UINT i;
while (number / divisor >= 10.0f) while (number / divisor >= 10.0f)
{ {
divisor *= 10; divisor *= 10;
exponent++; exponent++;
} }
/* 10000000 < 2^24, max integer cast to a float without truncation */
#define FLOAT_SCI_FORMAT_MINIMUM 10000000 number = number + 0.5f/(1000000/divisor); /* Rounding to 6 figures */
if (number >= FLOAT_SCI_FORMAT_MINIMUM) /* Print in scientific format: 1.123456e38 */
{ /* Print in scientific format: 1.123456e38 */ scifmt = exponent > 3;
int i; for (i = 0; i < 7; i++) /* Always print 7 digits total */
for (i = 0; i < 7; i++)
{ {
UNITY_OUTPUT_CHAR('0' + (int)(number / divisor) % 10); UNITY_OUTPUT_CHAR('0' + (int)(number / divisor) % 10);
if (i == 0) UNITY_OUTPUT_CHAR('.'); if ((scifmt && i == 0) || (!scifmt && i == exponent)) UNITY_OUTPUT_CHAR('.');
divisor /= 10.0f; divisor /= 10.0f;
} }
UNITY_OUTPUT_CHAR('e'); if (scifmt)
UnityPrintNumberUnsigned(exponent);
}
else
{ /* Print up to 9 characters, 6 after the decimal max */
_UD decimals = FLOAT_SCI_FORMAT_MINIMUM/divisor;
if (decimals > 1000000) decimals = 1000000;
number = number + 0.5f/decimals; /* Rounding */
while (decimals >= 1)
{ {
UNITY_OUTPUT_CHAR('0' + (int)(number / divisor) % 10); UNITY_OUTPUT_CHAR('e');
if (divisor == 1.0f) UNITY_OUTPUT_CHAR('.'); UNITY_OUTPUT_CHAR('+');
if (divisor <= 1.0f) decimals /= 10; UnityPrintNumberUnsigned(exponent);
divisor /= 10;
}
} }
} }
} }
#endif #endif /* UNITY_FLOAT_VERBOSE */
/*-----------------------------------------------*/ /*-----------------------------------------------*/