-
-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Added MonthPlausibilityComparator #14457 #14745
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.
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
Closed
keerthansamudrala
wants to merge
6
commits into
JabRef:main
from
keerthansamudrala:task-14457-comparator
Closed
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
c3e2ff2
Added MonthPlausibilityComparator #14457
keerthansamudrala a6415dd
Refactor: removed comments from MonthPlausibilityComparator
keerthansamudrala e2af645
Merge branch 'main' into task-14457-comparator
keerthansamudrala 0e228a1
Merge branch 'main' into task-14457-comparator
keerthansamudrala fa14d5c
added MonthPlausibilityComparator
keerthansamudrala 123e198
Revert javadoc formatting
keerthansamudrala File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
79 changes: 79 additions & 0 deletions
79
...ain/java/org/jabref/logic/bibtex/comparator/plausibility/MonthPlausibilityComparator.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| package org.jabref.logic.bibtex.comparator.plausibility; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| import org.jabref.logic.bibtex.comparator.ComparisonResult; | ||
| import org.jabref.model.entry.Month; | ||
|
|
||
| import org.jspecify.annotations.NullMarked; | ||
|
|
||
| @NullMarked | ||
| public class MonthPlausibilityComparator implements FieldValuePlausibilityComparator { | ||
|
|
||
| @Override | ||
| public ComparisonResult compare(String left, String right) { | ||
| Optional<Month> leftM = Month.parse(left); | ||
| Optional<Month> rightM = Month.parse(right); | ||
|
|
||
| if (leftM.isPresent() && rightM.isEmpty()) { | ||
| return ComparisonResult.LEFT_BETTER; | ||
| } | ||
| if (rightM.isPresent() && leftM.isEmpty()) { | ||
| return ComparisonResult.RIGHT_BETTER; | ||
| } | ||
| if (leftM.isEmpty() && rightM.isEmpty()) { | ||
| return ComparisonResult.UNDETERMINED; | ||
| } | ||
| if (!leftM.equals(rightM)) { | ||
| return ComparisonResult.UNDETERMINED; | ||
| } | ||
|
|
||
| Month leftMonth = leftM.get(); | ||
| Month rightMonth = rightM.get(); | ||
|
|
||
| boolean leftIsJabRef = left.equals(leftMonth.getJabRefFormat()); | ||
| boolean rightIsJabRef = right.equals(rightMonth.getJabRefFormat()); | ||
| if (leftIsJabRef && !rightIsJabRef) { | ||
| return ComparisonResult.LEFT_BETTER; | ||
| } | ||
| if (rightIsJabRef && !leftIsJabRef) { | ||
| return ComparisonResult.RIGHT_BETTER; | ||
| } | ||
|
|
||
| boolean leftIsShort = left.equalsIgnoreCase(leftMonth.getShortName()); | ||
| boolean rightIsShort = right.equalsIgnoreCase(rightMonth.getShortName()); | ||
| if (leftIsShort && !rightIsShort) { | ||
| return ComparisonResult.LEFT_BETTER; | ||
| } | ||
| if (rightIsShort && !leftIsShort) { | ||
| return ComparisonResult.RIGHT_BETTER; | ||
| } | ||
|
|
||
| boolean leftIsSimpleNum; | ||
| try { | ||
| leftIsSimpleNum = Integer.parseInt(left) == leftM.get().getNumber(); | ||
| } catch (NumberFormatException e) { | ||
| leftIsSimpleNum = false; | ||
| } | ||
| boolean rightIsSimpleNum; | ||
| try { | ||
| rightIsSimpleNum = Integer.parseInt(right) == rightM.get().getNumber(); | ||
| } catch (NumberFormatException e) { | ||
| rightIsSimpleNum = false; | ||
| } | ||
| if (leftIsSimpleNum && !rightIsSimpleNum) { | ||
| return ComparisonResult.LEFT_BETTER; | ||
| } | ||
| if (rightIsSimpleNum && !leftIsSimpleNum) { | ||
| return ComparisonResult.RIGHT_BETTER; | ||
| } | ||
| if (left.length() < right.length()) { | ||
| return ComparisonResult.LEFT_BETTER; | ||
| } | ||
| if (right.length() < left.length()) { | ||
| return ComparisonResult.RIGHT_BETTER; | ||
| } | ||
|
|
||
| return ComparisonResult.UNDETERMINED; | ||
| } | ||
| } |
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
18 changes: 18 additions & 0 deletions
18
...java/org/jabref/logic/bibtex/comparator/plausibility/MonthPlausibilityComparatorTest.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package org.jabref.logic.bibtex.comparator.plausibility; | ||
|
|
||
| import org.jabref.logic.bibtex.comparator.ComparisonResult; | ||
|
|
||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.CsvSource; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
|
||
| class MonthPlausibilityComparatorTest { | ||
| private final MonthPlausibilityComparator comparator = new MonthPlausibilityComparator(); | ||
|
|
||
| @ParameterizedTest | ||
| @CsvSource(value = {"{Jun}, jun, RIGHT_BETTER", "Jun, #jun#, RIGHT_BETTER", "June, #jun#, RIGHT_BETTER", "June, 6, RIGHT_BETTER", "June, July, UNDETERMINED", "#jun#, #jul#, UNDETERMINED", "6, #jun#, RIGHT_BETTER", "June, #Apr#, UNDETERMINED", "June, July, UNDETERMINED", "NotAMonth, #jun#, RIGHT_BETTER", "NotAMonth, June, RIGHT_BETTER", ", #jun#, RIGHT_BETTER", "#jun#, , LEFT_BETTER", "06, 6, RIGHT_BETTER", "jan, jan, UNDETERMINED", "#JAN#, #jan#, RIGHT_BETTER"}, nullValues = {"null", "N/A", "EMPTY"}) | ||
| void compare(String left, String right, ComparisonResult expected) { | ||
| assertEquals(expected, comparator.compare(left, right)); | ||
| } | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rever the javadoc formatting here