organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-04 21:15:35 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 8

Merge 533b334ac1 into 770c4b8042

Browse source
This commit is contained in:
Shane F. Carr 2025-04-03 16:04:43 -07:00 • committed by GitHub
commit 4170673dec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 36 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
icu4c/source/i18n/number_rounding.cpp
View file

@ -483,18 +483,10 @@ void RoundingImpl::apply(impl::DecimalQuantity &value, UErrorCode& status) const
// withMinDigits + withMaxDigits
displayMag = uprv_min(displayMag1, displayMag2);
} else if (fPrecision.fUnion.fracSig.fPriority == UNUM_ROUNDING_PRIORITY_RELAXED) {
if (roundingMag2 <= roundingMag1) {
displayMag = displayMag2;
} else {
displayMag = displayMag1;
}
displayMag = uprv_min(displayMag1, displayMag2);
} else {
U_ASSERT(fPrecision.fUnion.fracSig.fPriority == UNUM_ROUNDING_PRIORITY_STRICT);
if (roundingMag2 <= roundingMag1) {
displayMag = displayMag1;
} else {
displayMag = displayMag2;
}
displayMag = uprv_max(displayMag1, displayMag2);
}
resolvedMinFraction = uprv_max(0, -displayMag);

44
icu4c/source/test/intltest/numbertest_api.cpp
View file

@ -3397,6 +3397,7 @@ void NumberFormatterApiTest::roundingFractionFigures() {
u"0",
u"0");
// Keep the result having more trailing zeros
assertFormatSingle(
u"FracSig withSignificantDigits Trailing Zeros RELAXED",
u".0/@@@r",
@ -3407,7 +3408,7 @@ void NumberFormatterApiTest::roundingFractionFigures() {
1,
u"1.00");
// Trailing zeros follow the strategy that was chosen:
// Keep the result having fewer trailing zeros
assertFormatSingle(
u"FracSig withSignificantDigits Trailing Zeros STRICT",
u".0/@@@s",
@ -3418,6 +3419,28 @@ void NumberFormatterApiTest::roundingFractionFigures() {
1,
u"1.0");
// Keep the result having more trailing zeros
assertFormatSingle(
u"FracSig withSignificantDigits Trailing Zeros RELAXED",
u".00#/@@####r",
u".00#/@@####r",
NumberFormatter::with().precision(Precision::minMaxFraction(2, 3)
.withSignificantDigits(2, 6, UNUM_ROUNDING_PRIORITY_RELAXED)),
Locale::getEnglish(),
1,
u"1.00");
// Keep the result having fewer trailing zeros
assertFormatSingle(
u"FracSig withSignificantDigits Trailing Zeros STRICT",
u".00#/@@####s",
u".00#/@@####s",
NumberFormatter::with().precision(Precision::minMaxFraction(2, 3)
.withSignificantDigits(2, 6, UNUM_ROUNDING_PRIORITY_STRICT)),
Locale::getEnglish(),
1,
u"1.0");
assertFormatSingle(
u"FracSig withSignificantDigits at rounding boundary",
u"precision-integer/@@@s",
@ -3850,26 +3873,27 @@ void NumberFormatterApiTest::roundingPriorityCoverageTest() {
IcuTestErrorCode status(*this, "roundingPriorityCoverageTest");
struct TestCase {
double input;
const char16_t* expectedRelaxed0113;
const char16_t* expectedStrict0113;
const char16_t* expectedRelaxed0123;
const char16_t* expectedStrict0123;
const char16_t* expectedRelaxed1133;
const char16_t* expectedStrict1133;
} cases[] = {
{ 0.9999, u"1", u"1", u"1.00", u"1.0" },
{ 0.1000, u"0.10", u"0.1", u"0.100", u"0.1" },
{ 0.9999, u"1.0", u"1", u"1.00", u"1.0" },
{ 9.9999, u"10", u"10", u"10.0", u"10.0" },
{ 99.999, u"100", u"100", u"100.0", u"100" },
{ 999.99, u"1000", u"1000", u"1000.0", u"1000" },
{ 0, u"0", u"0", u"0.00", u"0.0" },
{ 0, u"0.0", u"0", u"0.00", u"0.0" },
{ 9.876, u"9.88", u"9.9", u"9.88", u"9.9" },
{ 9.001, u"9", u"9", u"9.00", u"9.0" },
{ 9.001, u"9.0", u"9", u"9.00", u"9.0" },
};
for (const auto& cas : cases) {
auto precisionRelaxed0113 = Precision::minMaxFraction(0, 1)
.withSignificantDigits(1, 3, UNUM_ROUNDING_PRIORITY_RELAXED);
.withSignificantDigits(2, 3, UNUM_ROUNDING_PRIORITY_RELAXED);
auto precisionStrict0113 = Precision::minMaxFraction(0, 1)
.withSignificantDigits(1, 3, UNUM_ROUNDING_PRIORITY_STRICT);
.withSignificantDigits(2, 3, UNUM_ROUNDING_PRIORITY_STRICT);
auto precisionRelaxed1133 = Precision::minMaxFraction(1, 1)
.withSignificantDigits(3, 3, UNUM_ROUNDING_PRIORITY_RELAXED);
auto precisionStrict1133 = Precision::minMaxFraction(1, 1)
@ -3893,10 +3917,10 @@ void NumberFormatterApiTest::roundingPriorityCoverageTest() {
);
};
check(u" Relaxed 0113", cas.expectedRelaxed0113, precisionRelaxed0113);
check(u" Relaxed 0123", cas.expectedRelaxed0123, precisionRelaxed0113);
if (status.errIfFailureAndReset()) continue;
check(u" Strict 0113", cas.expectedStrict0113, precisionStrict0113);
check(u" Strict 0123", cas.expectedStrict0123, precisionStrict0113);
if (status.errIfFailureAndReset()) continue;
check(u" Relaxed 1133", cas.expectedRelaxed1133, precisionRelaxed1133);