[BUGS#1251] FindMatches always search separate segment match without penalty: add regression test, fix it, make configurable, show where comes from in FuzzyMatch pane, and refactor #963

miurahr · 2024-02-17T00:36:48Z

Pull request type

Please mark GitHub LABEL of the type of change your PR introduces:

Bug fix → [bug]

Which ticket is resolved?

FindMatcher always search separate segment match without penalty
https://sourceforge.net/p/omegat/bugs/1251/

What does this PR change?

Add regression test for BUGS#1248 and 1251 against both FindMatches and FindMatchesThread classes, that is failed by the bug reported.
Add internal FindMatches#search method which change behavior by argument flag, segmentation support, and remove boolean allowSeparateSegmentMatch argument from constructor.
make the feature "paragraph from separated segment matches on sentence level TMX" configurable
Update manual document to add explanation of preference > TM matches - paragraph from separated segment
Show fuzzy match result comes from "Project/Sub-segment match/External TM" on the fuzzy match pane

Other information

ref: https://sourceforge.net/p/omegat/bugs/1248/

github-actions · 2024-02-17T06:29:41Z

❌ Run Gradle test failed:

github-actions · 2024-02-17T06:38:25Z

❌ Run Gradle test failed:

miurahr · 2024-03-09T02:38:15Z

A topic branch here waiting a realization of GUI behavior acceptance test #964 is accepted.

miurahr · 2024-08-14T12:20:52Z

A topic branch here waiting a realization of GUI behavior acceptance test #964 is accepted.

GUI testing is not stable to be integrated. So we should merge it now.

miurahr · 2024-11-04T01:45:55Z

#1172 enables acceptance test.

- Add FindMatchesThreadTest to reproduce BUGS#1251 - Add a test case to test FindMatches with the case of BUGS#1251. Signed-off-by: Hiroshi Miura <[email protected]>

- add internal search method to handle normal and segmented search conditions, also use for test purpose - drop threshold arguments for CalcMatchStatistics usage - FindMatchesThread.finderSearch to take threshold argument for testing. - update search() callers accordingly. Signed-off-by: Hiroshi Miura <[email protected]>

- update expectation not affected by OS path delimiter Signed-off-by: Hiroshi Miura <[email protected]>

- Change default fuzzy match pane template with matchSource - Add method MatchesVarExpansion#expandMatchSource - Extend NearString.MATCH_SOURCE to have TM_SUBSEG - Update test expectations of MatchesTextAreaTest, and FindMatchesTest - FindMatches to handle FuzzyMark of segmented match - FindMatches to store tmx file path of segmented matches - Fix MatchesVarExpansionTest which causes NPE - Add human-readable names of MATCH_SOURCE in Bundle.properties Signed-off-by: Hiroshi Miura <[email protected]>

github-actions · 2024-11-30T02:53:21Z

❌ Quality checks failed.

Please look a Gradle Scan page for details:
https://gradle.com/s/5jugeswutt4eq

- Improve javadoc - Improve switch syntax style - Improve indentation Signed-off-by: Hiroshi Miura <[email protected]>

Signed-off-by: Hiroshi Miura <[email protected]>

miurahr · 2024-12-05T02:22:32Z

@t-cordonnier now plans to propose further improvements, I would like to merge here then go to his proposal when ready.

brandelune

Documentation modifications need review.

brandelune · 2024-12-05T02:28:14Z

doc_src/en/Dialogs_ProjectProperties.xml

@Kazephil we need your review in the 3 documentation files below. Thank you in advance.

miurahr · 2024-12-16T09:00:03Z

src/org/omegat/core/matching/NearString.java

+        /** From files */
+        FILES,
+        /** From sub-segmented match */
+        TM_SUBSEG;


Suggested change

TM_SUBSEG;

TM_SUBSEG

no need semicolon

miurahr · 2024-12-18T00:51:18Z

As discussed in dev-ML, I split changes to a handful of PRs.
@Kazephil @brandelune pls review #1217 and #1218 for documentation and UI labels.

miurahr changed the title ~~[BUGS#1248] feat: add regression test~~ [BUGS#1248,1251] feat: add regression test Feb 17, 2024

miurahr added the bug label Feb 17, 2024

miurahr force-pushed the topic/miurahr/matches/fix-separate-segmented branch from bc9c2cd to e42b6d3 Compare February 17, 2024 00:43

miurahr changed the title ~~[BUGS#1248,1251] feat: add regression test~~ [BUGS#1248,1251] add regression test and refactor FindMatches class Feb 17, 2024

miurahr added the refactoring label Feb 17, 2024

This comment was marked as outdated.

Sign in to view

miurahr mentioned this pull request Feb 17, 2024

feat: separate segment matcher configurable #961

Closed

miurahr force-pushed the topic/miurahr/matches/fix-separate-segmented branch 2 times, most recently from bc92bea to 4665a8e Compare February 17, 2024 07:23

omegat-org deleted a comment from github-actions bot Feb 17, 2024

miurahr marked this pull request as ready for review July 28, 2024 01:19

miurahr changed the title ~~[BUGS#1248,1251] add regression test and refactor FindMatches class~~ [BUGS#1251] add regression test and refactor FindMatches class Nov 4, 2024

miurahr added this to the 6.1.0 (Require Java 11) milestone Nov 4, 2024

This was referenced Nov 12, 2024

refactor: FindMatches to split looong method into multiple private method, use lambda, and relax suppression of checkstyle #1174

Merged

Add FindMatches class test with segmented #1188

Merged

miurahr added 2 commits November 26, 2024 09:19

[BUGS#1251] feat: add regression test

711f747

- Add FindMatchesThreadTest to reproduce BUGS#1251 - Add a test case to test FindMatches with the case of BUGS#1251. Signed-off-by: Hiroshi Miura <[email protected]>

miurahr force-pushed the topic/miurahr/matches/fix-separate-segmented branch from 1e4afdb to f049239 Compare November 26, 2024 04:08

This comment was marked as resolved.

Sign in to view

miurahr marked this pull request as ready for review November 29, 2024 03:57

miurahr requested review from Kazephil, brandelune and kosivantsov as code owners November 29, 2024 03:57

fix: test expectation

f850d1b

- update expectation not affected by OS path delimiter Signed-off-by: Hiroshi Miura <[email protected]>

This comment was marked as outdated.

Sign in to view

miurahr requested a review from t-cordonnier November 30, 2024 02:56

miurahr added the enhancement label Nov 30, 2024

style: NearString, MatchesVarExpansion and FindMatchesThreadTest

c1bec8b

- Improve javadoc - Improve switch syntax style - Improve indentation Signed-off-by: Hiroshi Miura <[email protected]>

This comment was marked as resolved.

Sign in to view

feat: gather all the combined files

0878d1b

Signed-off-by: Hiroshi Miura <[email protected]>

miurahr force-pushed the topic/miurahr/matches/fix-separate-segmented branch from ebb7da2 to 0878d1b Compare November 30, 2024 12:43

brandelune requested changes Dec 5, 2024

View reviewed changes

doc_src/en/Dialogs_ProjectProperties.xml

Copy link

Contributor

brandelune Dec 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Kazephil we need your review in the 3 documentation files below. Thank you in advance.

miurahr commented Dec 16, 2024

View reviewed changes

miurahr marked this pull request as draft December 18, 2024 00:49

This was referenced Dec 18, 2024

refactor: FindMatches class #1222

Merged

feat: show files used for segmented match in fuzzy match pane #1226

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[BUGS#1251] FindMatches always search separate segment match without penalty: add regression test, fix it, make configurable, show where comes from in FuzzyMatch pane, and refactor #963

[BUGS#1251] FindMatches always search separate segment match without penalty: add regression test, fix it, make configurable, show where comes from in FuzzyMatch pane, and refactor #963

miurahr commented Feb 17, 2024 •

edited

Loading

This comment was marked as outdated.

github-actions bot commented Feb 17, 2024

github-actions bot commented Feb 17, 2024

miurahr commented Mar 9, 2024

miurahr commented Aug 14, 2024

miurahr commented Nov 4, 2024

This comment was marked as resolved.

This comment was marked as outdated.

github-actions bot commented Nov 30, 2024

This comment was marked as resolved.

This comment was marked as resolved.

miurahr commented Dec 5, 2024

brandelune left a comment

brandelune Dec 5, 2024

miurahr Dec 16, 2024

miurahr commented Dec 18, 2024

[BUGS#1251] FindMatches always search separate segment match without penalty: add regression test, fix it, make configurable, show where comes from in FuzzyMatch pane, and refactor #963

Are you sure you want to change the base?

[BUGS#1251] FindMatches always search separate segment match without penalty: add regression test, fix it, make configurable, show where comes from in FuzzyMatch pane, and refactor #963

Conversation

miurahr commented Feb 17, 2024 • edited Loading

Pull request type

Which ticket is resolved?

What does this PR change?

Other information

This comment was marked as outdated.

github-actions bot commented Feb 17, 2024

github-actions bot commented Feb 17, 2024

miurahr commented Mar 9, 2024

miurahr commented Aug 14, 2024

miurahr commented Nov 4, 2024

This comment was marked as resolved.

This comment was marked as outdated.

github-actions bot commented Nov 30, 2024

This comment was marked as resolved.

This comment was marked as resolved.

miurahr commented Dec 5, 2024

brandelune left a comment

Choose a reason for hiding this comment

brandelune Dec 5, 2024

Choose a reason for hiding this comment

miurahr Dec 16, 2024

Choose a reason for hiding this comment

miurahr commented Dec 18, 2024

miurahr commented Feb 17, 2024 •

edited

Loading