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

Make FINEST matcher logging options available to end users

This commit is contained in:
Reinhard Pointner 2016-03-02 18:36:46 +00:00
parent cb79fe71b5
commit a5fba63043
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/net/filebot/media/MediaDetection.java
View File

@ -3,6 +3,7 @@ package net.filebot.media;
import static java.util.Collections.*; import static java.util.Collections.*;
import static java.util.regex.Pattern.*; import static java.util.regex.Pattern.*;
import static java.util.stream.Collectors.*; import static java.util.stream.Collectors.*;
import static net.filebot.Logging.*;
import static net.filebot.MediaTypes.*; import static net.filebot.MediaTypes.*;
import static net.filebot.Settings.*; import static net.filebot.Settings.*;
import static net.filebot.similarity.CommonSequenceMatcher.*; import static net.filebot.similarity.CommonSequenceMatcher.*;
@ -729,11 +730,14 @@ public class MediaDetection {
// similarity comparator with multi-value support // similarity comparator with multi-value support
SimilarityComparator<SearchResult, String> comparator = new SimilarityComparator<SearchResult, String>(metric, terms, mapper); SimilarityComparator<SearchResult, String> comparator = new SimilarityComparator<SearchResult, String>(metric, terms, mapper);
// sort by ranking and remove duplicate entries
List<T> ranking = options.stream().sorted(comparator).distinct().collect(toList());
// DEBUG // DEBUG
// System.out.format("sortBySimilarity %s => %s%n", terms, options.stream().sorted(comparator).distinct().collect(toList())); debug.finest(format("%s => %s", terms, ranking));
// sort by ranking and remove duplicate entries // sort by ranking and remove duplicate entries
return options.stream().sorted(comparator).distinct().collect(toList()); return ranking;
} }
public static List<Movie> sortMoviesBySimilarity(Collection<Movie> options, Collection<String> terms) throws IOException { public static List<Movie> sortMoviesBySimilarity(Collection<Movie> options, Collection<String> terms) throws IOException {
@ -940,7 +944,7 @@ public class MediaDetection {
querySet = getUniqueQuerySet(emptySet(), stripBlacklistedTerms(querySet)); querySet = getUniqueQuerySet(emptySet(), stripBlacklistedTerms(querySet));
// DEBUG // DEBUG
// System.out.format("Query %s: %s%n", queryLookupService.getName(), querySet); debug.finest(format("%s => %s", queryLookupService.getName(), querySet));
final Map<Movie, Float> probabilityMap = new LinkedHashMap<Movie, Float>(); final Map<Movie, Float> probabilityMap = new LinkedHashMap<Movie, Float>();
final SimilarityMetric metric = getMovieMatchMetric(); final SimilarityMetric metric = getMovieMatchMetric();

2
source/net/filebot/similarity/Matcher.java
View File

@ -140,7 +140,7 @@ public class Matcher<V, C> {
float similarity = metric.getSimilarity(possibleMatch.getValue(), possibleMatch.getCandidate()); float similarity = metric.getSimilarity(possibleMatch.getValue(), possibleMatch.getCandidate());
// DEBUG // DEBUG
debug.finest(format("%s: %.04f: %s", metric, similarity, possibleMatch)); debug.finest(format("%s %.04f => %s", metric, similarity, possibleMatch));
Set<Match<V, C>> matchSet = similarityMap.get(similarity); Set<Match<V, C>> matchSet = similarityMap.get(similarity);
if (matchSet == null) { if (matchSet == null) {