Skip to content

Add boolean similarity to built in similarity types #26613

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.

Sign up for GitHub

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

Merged
jpountz merged 3 commits into from
Sep 13, 2017
Merged

Add boolean similarity to built in similarity types #26613

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5006f7
Add boolean similarity to built in similarity types
Sep 12, 2017
b4832c4
Rename buildIn -> builtIn
Sep 12, 2017
56306b4
Builtin similarities include all the default similarities by default …
Sep 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions core/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,30 +46,27 @@ public final class SimilarityService extends AbstractIndexComponent {
public static final Map<String, SimilarityProvider.Factory> BUILT_IN;
static {
Map<String, SimilarityProvider.Factory> defaults = new HashMap<>();
Map<String, SimilarityProvider.Factory> buildIn = new HashMap<>();
defaults.put("classic",
(name, settings, indexSettings, scriptService) -> new ClassicSimilarityProvider(name, settings, indexSettings));
defaults.put("BM25",
(name, settings, indexSettings, scriptService) -> new BM25SimilarityProvider(name, settings, indexSettings));
defaults.put("boolean",
(name, settings, indexSettings, scriptService) -> new BooleanSimilarityProvider(name, settings, indexSettings));
buildIn.put("classic",
(name, settings, indexSettings, scriptService) -> new ClassicSimilarityProvider(name, settings, indexSettings));
buildIn.put("BM25",
(name, settings, indexSettings, scriptService) -> new BM25SimilarityProvider(name, settings, indexSettings));
buildIn.put("DFR",

Map<String, SimilarityProvider.Factory> builtIn = new HashMap<>(defaults);
builtIn.put("DFR",
(name, settings, indexSettings, scriptService) -> new DFRSimilarityProvider(name, settings, indexSettings));
buildIn.put("IB",
builtIn.put("IB",
(name, settings, indexSettings, scriptService) -> new IBSimilarityProvider(name, settings, indexSettings));
buildIn.put("LMDirichlet",
builtIn.put("LMDirichlet",
(name, settings, indexSettings, scriptService) -> new LMDirichletSimilarityProvider(name, settings, indexSettings));
buildIn.put("LMJelinekMercer",
builtIn.put("LMJelinekMercer",
(name, settings, indexSettings, scriptService) -> new LMJelinekMercerSimilarityProvider(name, settings, indexSettings));
buildIn.put("DFI",
builtIn.put("DFI",
(name, settings, indexSettings, scriptService) -> new DFISimilarityProvider(name, settings, indexSettings));
buildIn.put("scripted", ScriptedSimilarityProvider::new);
builtIn.put("scripted", ScriptedSimilarityProvider::new);
DEFAULTS = Collections.unmodifiableMap(defaults);
BUILT_IN = Collections.unmodifiableMap(buildIn);
BUILT_IN = Collections.unmodifiableMap(builtIn);
}

public SimilarityService(IndexSettings indexSettings, ScriptService scriptService,
Expand Down