mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* misc: strict-mode for matcher

This commit is contained in:
Reinhard Pointner 2011-08-10 04:02:41 +00:00
parent dd97fe35ee
commit e90f970b80
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/net/sourceforge/filebot/similarity/Matcher.java
View File

@ -23,15 +23,17 @@ public class Matcher<V, C> {
private final List<V> values; private final List<V> values;
private final List<C> candidates; private final List<C> candidates;
private final boolean strict;
private final SimilarityMetric[] metrics; private final SimilarityMetric[] metrics;
private final DisjointMatchCollection<V, C> disjointMatchCollection; private final DisjointMatchCollection<V, C> disjointMatchCollection;
public Matcher(Collection<? extends V> values, Collection<? extends C> candidates, SimilarityMetric[] metrics) { public Matcher(Collection<? extends V> values, Collection<? extends C> candidates, boolean strict, SimilarityMetric[] metrics) {
this.values = new LinkedList<V>(values); this.values = new LinkedList<V>(values);
this.candidates = new LinkedList<C>(candidates); this.candidates = new LinkedList<C>(candidates);
this.strict = strict;
this.metrics = metrics.clone(); this.metrics = metrics.clone();
this.disjointMatchCollection = new DisjointMatchCollection<V, C>(); this.disjointMatchCollection = new DisjointMatchCollection<V, C>();
@ -88,8 +90,12 @@ public class Matcher<V, C> {
protected void deepMatch(Collection<Match<V, C>> possibleMatches, int level) throws InterruptedException { protected void deepMatch(Collection<Match<V, C>> possibleMatches, int level) throws InterruptedException {
if (level >= metrics.length || possibleMatches.isEmpty()) { if (level >= metrics.length || possibleMatches.isEmpty()) {
// add the first possible match if non-strict, otherwise ignore ambiguous matches
if (!strict) {
disjointMatchCollection.addAll(possibleMatches);
}
// no further refinement possible // no further refinement possible
disjointMatchCollection.addAll(possibleMatches);
return; return;
} }

2
source/net/sourceforge/filebot/ui/panel/rename/MatchAction.java
View File

@ -98,7 +98,7 @@ class MatchAction extends AbstractAction {
public BackgroundMatcher(MatchModel<Object, File> model, SimilarityMetric[] metrics) { public BackgroundMatcher(MatchModel<Object, File> model, SimilarityMetric[] metrics) {
// match names against files // match names against files
this.matcher = new Matcher<Object, File>(model.values(), model.candidates(), metrics); this.matcher = new Matcher<Object, File>(model.values(), model.candidates(), false, metrics);
} }