From 25af8b5e92dac7a3f4be1f3f4fb53ecbc4669e71 Mon Sep 17 00:00:00 2001 From: "Shane F. Carr" Date: Mon, 28 Nov 2022 17:21:35 +0100 Subject: [PATCH 1/2] Adopt new algorithm for trailing zeros in rounding priority --- icu4c/source/i18n/number_rounding.cpp | 12 ++------- icu4c/source/test/intltest/numbertest_api.cpp | 25 ++++++++++++++++++- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/icu4c/source/i18n/number_rounding.cpp b/icu4c/source/i18n/number_rounding.cpp index a9b3f16c050..83cd1ce77ac 100644 --- a/icu4c/source/i18n/number_rounding.cpp +++ b/icu4c/source/i18n/number_rounding.cpp @@ -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); diff --git a/icu4c/source/test/intltest/numbertest_api.cpp b/icu4c/source/test/intltest/numbertest_api.cpp index 18ceb194f39..6eac0642a9c 100644 --- a/icu4c/source/test/intltest/numbertest_api.cpp +++ b/icu4c/source/test/intltest/numbertest_api.cpp @@ -3386,6 +3386,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", @@ -3396,7 +3397,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", @@ -3407,6 +3408,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", From 533b334ac129dad6c5d86af9f393e36b67f15f31 Mon Sep 17 00:00:00 2001 From: "Shane F. Carr" Date: Mon, 28 Nov 2022 17:21:46 +0100 Subject: [PATCH 2/2] Make test more interesting --- icu4c/source/test/intltest/numbertest_api.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/icu4c/source/test/intltest/numbertest_api.cpp b/icu4c/source/test/intltest/numbertest_api.cpp index 6eac0642a9c..337972acd9b 100644 --- a/icu4c/source/test/intltest/numbertest_api.cpp +++ b/icu4c/source/test/intltest/numbertest_api.cpp @@ -3862,26 +3862,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) @@ -3905,10 +3906,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);