Skip to content

CLDR-16668 Improve unit ordering #5820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
macchiati wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

CLDR-16668 Improve unit ordering #5820

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 43 additions & 6 deletions tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestUnits.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,14 @@ public class TestUnits extends TestFmwkPlus {
/** Flag for generating test: TODO move to separate file */
private static final boolean GENERATE_TESTS = getFlag("TestUnits:GENERATE_TESTS");

private static final Validity VALIDITY = Validity.getInstance();
private static final Map<Status, Set<String>> UNIT_STATUS_TO_CODES =
VALIDITY.getStatusToCodes(LstrType.unit);

private static final Set<String> VALID_REGULAR_UNITS =
Validity.getInstance().getStatusToCodes(LstrType.unit).get(Validity.Status.regular);
UNIT_STATUS_TO_CODES.get(Validity.Status.regular);
private static final Set<String> DEPRECATED_REGULAR_UNITS =
Validity.getInstance().getStatusToCodes(LstrType.unit).get(Validity.Status.deprecated);
UNIT_STATUS_TO_CODES.get(Validity.Status.deprecated);
public static final CLDRConfig CLDR_CONFIG = CLDRConfig.getInstance();
private static final Factory CLDR_FACTORY = CLDR_CONFIG.getCldrFactory();
private static final Integer INTEGER_ONE = 1;
Expand Down Expand Up @@ -836,8 +840,7 @@ public void TestRationalParse() {
static final Multimap<String, String> TYPE_TO_CORE;

static {
Set<String> VALID_UNITS =
Validity.getInstance().getStatusToCodes(LstrType.unit).get(Status.regular);
Set<String> VALID_UNITS = UNIT_STATUS_TO_CODES.get(Status.regular);

Map<String, String> coreToType = new TreeMap<>();
TreeMultimap<String, String> typeToCore = TreeMultimap.create();
Expand Down Expand Up @@ -3396,8 +3399,7 @@ public void TestUnitsToTranslate() {
final UnitConverter converter = config.getSupplementalDataInfo().getUnitConverter();
Map<String, TranslationStatus> shortUnitToTranslationStatus40 =
new TreeMap<>(converter.getShortUnitIdComparator());
for (String longUnit :
Validity.getInstance().getStatusToCodes(LstrType.unit).get(Status.regular)) {
for (String longUnit : UNIT_STATUS_TO_CODES.get(Status.regular)) {
String shortUnit = converter.getShortId(longUnit);
shortUnitToTranslationStatus40.put(shortUnit, TranslationStatus.skip_trans);
}
Expand Down Expand Up @@ -4936,4 +4938,39 @@ public void testComposedNames() {
}
}
}

public void testOrder() {
MapComparator<String> canonicalOrder = (MapComparator) converter.getLongUnitIdComparator();
TreeSet<String> ordered = new TreeSet<String>(canonicalOrder);

ordered.addAll(VALID_REGULAR_UNITS);
Map<String, String> normalizedToDenormalizedLong = new TreeMap<>();
for (String denormalized : DEPRECATED_REGULAR_UNITS) {
String fixed = converter.fixDenormalized(converter.getShortId(denormalized));
normalizedToDenormalizedLong.put(
converter.getLongId(fixed), converter.getLongId(denormalized));
}
MapComparator<String> dtdOrder = DtdData.getUnitOrder();
Set<List<?>> differences = new LinkedHashSet<>();
for (String longUnit : ordered) {
Integer cOrder = canonicalOrder.getNumericOrder(longUnit);
Integer dOrder = dtdOrder.getNumericOrder(longUnit);
if (!Objects.equals(cOrder, dOrder)) {
differences.add(List.of(cOrder, dOrder, longUnit));
}
}
if (!differences.isEmpty()) {
warnln("DtdData order is not canonical. Use -DTestUnits:SHOW_UNITS to see replacement");
if (SHOW_UNITS) {
System.out.println("Replacement for DtdData.UnitOrderHolder list:");
for (String norm : ordered) {
System.out.println("\t\"" + norm + "\",");
String denorm = normalizedToDenormalizedLong.get(norm);
if (denorm != null) {
System.out.println("\t\"" + denorm + "\",\t// deprecated");
}
}
}
}
}
}
Loading