Inflection-66 Fix --ignore-entries-with-grammemes in dictionary-parser and improve language variant handling #67
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…r and improve language variant handling
grhoten
commented
Jan 24, 2025
Comment on lines
+508
to
+522
| int qVariantIdx = currentLemmaLanguage.indexOf(VARIANT_SEPARATOR); | ||
| if (qVariantIdx >= 0) { | ||
| // The languages can have wierd Q entry after the desired language. | ||
| // A spelling variant is informative. Most of the rest are irrelevant. | ||
| var additionalCategory = currentLemmaLanguage.substring(qVariantIdx + VARIANT_SEPARATOR.length()); | ||
| currentLemmaLanguage = currentLemmaLanguage.substring(0, qVariantIdx); | ||
| var variant = Grammar.getMappedGrammemes(additionalCategory); | ||
| if (variant == null) { | ||
| if (parserOptions.debug) { | ||
| System.err.println("Line " + lineNumber + ": " + additionalCategory + " is not a known grammeme for the language variant " + lexeme.id + "(" + lemma.value + ")"); | ||
| } | ||
| continue; | ||
| } | ||
| lemma.grammemes.addAll(variant); | ||
| } |
There was a problem hiding this comment.
This chunk helps with ignoring some of the variants. This might need to be extended further for the inflections.
Comment on lines
+291
to
+317
| void setIgnoreProperty(String[] grammemes, Ignorable ignorable) { | ||
| var ignorableSet = EnumSet.of(ignorable); | ||
| for (String grammeme : grammemes) { | ||
| if (grammeme.matches("Q\\d*")) { | ||
| TYPEMAP.put(grammeme, ignorableSet); | ||
| } | ||
| else { | ||
| for (Map.Entry<String, Set<? extends Enum<?>>> entry : TYPEMAP.entrySet()) { | ||
| for (var grammemeEnum : entry.getValue()) { | ||
| String name = grammemeEnum.name(); | ||
| if (name.equalsIgnoreCase(grammeme)) { | ||
| if (entry.getValue().size() == 1) { | ||
| entry.setValue(ignorableSet); | ||
| } | ||
| else { | ||
| entry.getValue().remove(grammemeEnum); | ||
| ArrayList<Enum<?>> clone = new ArrayList<>(entry.getValue()); | ||
| clone.add(ignorable); | ||
| entry.setValue(new HashSet<>(clone)); | ||
| } | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
This fixes the ignorable properties and ignorable inflections, which tend to include a lot of irrelevant information.
| } | ||
|
|
||
| static final Map<SortedSet<String>, Set<? extends Enum<?>>> TYPEMAP = new HashMap<>(1021); | ||
| static final Map<String, Set<? extends Enum<?>>> TYPEMAP = new HashMap<>(1021); |
There was a problem hiding this comment.
I changed the key type, since Wikidata doesn't include a key set. This is a simplification.
nciric
approved these changes
Jan 24, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #66
These changes reduce the failures for English, but it doesn't fully fix the issues yet. It's an improvement and a step in the right direction.