espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-07-15 00:52:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add printing for large numbers in exponential format

Browse Source 
Delete old method for printing
This commit is contained in:
jsalling
2016-10-04 23:18:08 -05:00
parent 9653fbf7ac
commit 30ba118c47
1 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/unity.c
View File

@ -278,19 +278,10 @@ void UnityPrintFloat(_UD number)
number = -number; number = -number;
} }
if (isinf(number)) UnityPrintLen(UnityStrInf, 3); if (isinf(number)) UnityPrintLen(UnityStrInf, 3);
else /* Small numbers as "%.6f" format string, but uses scientific notation for larger numbers */ else if (number < 4294967296.0f) /* Fits in an integer */
{ {
_UD divisor = 1.0f; _UU32 integer_part = (_UU32)number;
_U_UINT exponent = 0; _UD fraction_part = number - integer_part;
int scifmt;
_U_UINT i;
_UU32 integer_part;
_UD fraction_part;
// if (number <= 0xFFFFFFFF) /* Fits in an integer */
{
integer_part = (_UU32)number;
fraction_part = number - integer_part;
}
_U_UINT fraction_bits = (_U_UINT)(fraction_part * 1000000.0f + 0.5f); _U_UINT fraction_bits = (_U_UINT)(fraction_part * 1000000.0f + 0.5f);
if (fraction_bits == 1000000) if (fraction_bits == 1000000)
@ -310,29 +301,33 @@ void UnityPrintFloat(_UD number)
if (fraction_bits == 0) break; // Truncate trailing 0's if (fraction_bits == 0) break; // Truncate trailing 0's
divisor_int /= 10; divisor_int /= 10;
} while (divisor_int > 0); } while (divisor_int > 0);
UNITY_OUTPUT_CHAR(' ');
while (number / divisor >= 10.0f)
}
else /* Won't fit in an integer type */
{
_UU32 integer_part;
_UD divide = 10.0f;
_U_UINT exponent = 7;
while (number / divide >= 10000000.0f)
{ {
divisor *= 10; divide *= 10;
exponent++; exponent++;
} }
integer_part = (_UU32)(number / divide + 0.5f);
_UU32 divisor_int = 1000000;
do
{
UNITY_OUTPUT_CHAR((char)('0' + (integer_part / divisor_int)));
number = number + 0.5f/(1000000/divisor); /* Rounding to 6 figures */ integer_part %= divisor_int;
/* Print in scientific format: 1.123456e38 */ divisor_int /= 10;
scifmt = exponent > 3; if (divisor_int == 100000) UNITY_OUTPUT_CHAR('.');
for (i = 0; i < 7; i++) /* Always print 7 digits total */ } while (divisor_int > 0);
{ UNITY_OUTPUT_CHAR('e');
UNITY_OUTPUT_CHAR('0' + (int)(number / divisor) % 10); UNITY_OUTPUT_CHAR('+');
if ((scifmt && i == 0) || (!scifmt && i == exponent)) UNITY_OUTPUT_CHAR('.'); UnityPrintNumberUnsigned(exponent);
divisor /= 10.0f;
}
if (scifmt)
{
UNITY_OUTPUT_CHAR('e');
UNITY_OUTPUT_CHAR('+');
UnityPrintNumberUnsigned(exponent);
}
} }
} }
#endif /* UNITY_FLOAT_VERBOSE */ #endif /* UNITY_FLOAT_VERBOSE */