diff --git a/server/src/main/java/org/elasticsearch/search/suggest/phrase/Laplace.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/Laplace.java index c4a6f15e03ced..4ca2483c6aed5 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/phrase/Laplace.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/phrase/Laplace.java @@ -119,7 +119,7 @@ public static SmoothingModel fromXContent(XContentParser parser) throws IOExcept @Override public WordScorerFactory buildWordScorerFactory() { - return (IndexReader reader, Terms terms, String field, double realWordLikelyhood, BytesRef separator) - -> new LaplaceScorer(reader, terms, field, realWordLikelyhood, separator, alpha); + return (IndexReader reader, Terms terms, String field, double realWordLikelihood, BytesRef separator) + -> new LaplaceScorer(reader, terms, field, realWordLikelihood, separator, alpha); } } diff --git a/server/src/main/java/org/elasticsearch/search/suggest/phrase/LaplaceScorer.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/LaplaceScorer.java index 52157a0fe8bde..25539b00163b1 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/phrase/LaplaceScorer.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/phrase/LaplaceScorer.java @@ -29,8 +29,8 @@ final class LaplaceScorer extends WordScorer { private double alpha; LaplaceScorer(IndexReader reader, Terms terms, String field, - double realWordLikelyhood, BytesRef separator, double alpha) throws IOException { - super(reader, terms, field, realWordLikelyhood, separator); + double realWordLikelihood, BytesRef separator, double alpha) throws IOException { + super(reader, terms, field, realWordLikelihood, separator); this.alpha = alpha; } diff --git a/server/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolatingScorer.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolatingScorer.java index b0c9552f8a8d6..aca226ea41671 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolatingScorer.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolatingScorer.java @@ -32,9 +32,9 @@ public final class LinearInterpolatingScorer extends WordScorer { private final double bigramLambda; private final double trigramLambda; - public LinearInterpolatingScorer(IndexReader reader, Terms terms, String field, double realWordLikelyhood, BytesRef separator, + public LinearInterpolatingScorer(IndexReader reader, Terms terms, String field, double realWordLikelihood, BytesRef separator, double trigramLambda, double bigramLambda, double unigramLambda) throws IOException { - super(reader, terms, field, realWordLikelyhood, separator); + super(reader, terms, field, realWordLikelihood, separator); double sum = unigramLambda + bigramLambda + trigramLambda; this.unigramLambda = unigramLambda / sum; this.bigramLambda = bigramLambda / sum; diff --git a/server/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolation.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolation.java index e609be1d77c18..d38b34f50eeb7 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolation.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/phrase/LinearInterpolation.java @@ -168,8 +168,8 @@ public static LinearInterpolation fromXContent(XContentParser parser) throws IOE @Override public WordScorerFactory buildWordScorerFactory() { - return (IndexReader reader, Terms terms, String field, double realWordLikelyhood, BytesRef separator) -> - new LinearInterpolatingScorer(reader, terms, field, realWordLikelyhood, separator, trigramLambda, bigramLambda, + return (IndexReader reader, Terms terms, String field, double realWordLikelihood, BytesRef separator) -> + new LinearInterpolatingScorer(reader, terms, field, realWordLikelihood, separator, trigramLambda, bigramLambda, unigramLambda); } } diff --git a/server/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java index 635fa64c59b53..7f225f1c3ea73 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellChecker.java @@ -38,14 +38,14 @@ //TODO public for tests public final class NoisyChannelSpellChecker { - public static final double REAL_WORD_LIKELYHOOD = 0.95d; + public static final double REAL_WORD_LIKELIHOOD = 0.95d; public static final int DEFAULT_TOKEN_LIMIT = 10; private final double realWordLikelihood; private final boolean requireUnigram; private final int tokenLimit; public NoisyChannelSpellChecker() { - this(REAL_WORD_LIKELYHOOD); + this(REAL_WORD_LIKELIHOOD); } public NoisyChannelSpellChecker(double nonErrorLikelihood) { diff --git a/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java index 10112ad2f43dd..413afd155d45b 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java @@ -69,7 +69,7 @@ private PhraseSuggester() {} @Override public Suggestion> innerExecute(String name, PhraseSuggestionContext suggestion, IndexSearcher searcher, CharsRefBuilder spare) throws IOException { - double realWordErrorLikelihood = suggestion.realworldErrorLikelyhood(); + double realWordErrorLikelihood = suggestion.realworldErrorLikelihood(); final PhraseSuggestion response = new PhraseSuggestion(name, suggestion.getSize()); final IndexReader indexReader = searcher.getIndexReader(); List generators = suggestion.generators(); diff --git a/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java index 4fd37d01ca5ee..84987f30e87f7 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java @@ -40,8 +40,8 @@ class PhraseSuggestionContext extends SuggestionContext { static final float DEFAULT_RWE_ERRORLIKELIHOOD = 0.95f; static final float DEFAULT_MAX_ERRORS = 0.5f; static final String DEFAULT_SEPARATOR = " "; - static final WordScorer.WordScorerFactory DEFAULT_SCORER = (IndexReader reader, Terms terms, String field, double realWordLikelyhood, - BytesRef separator) -> new StupidBackoffScorer(reader, terms, field, realWordLikelyhood, separator, 0.4f); + static final WordScorer.WordScorerFactory DEFAULT_SCORER = (IndexReader reader, Terms terms, String field, double realWordLikelihood, + BytesRef separator) -> new StupidBackoffScorer(reader, terms, field, realWordLikelihood, separator, 0.4f); private float maxErrors = DEFAULT_MAX_ERRORS; private BytesRef separator = new BytesRef(DEFAULT_SEPARATOR); @@ -78,7 +78,7 @@ public void setSeparator(BytesRef separator) { this.separator = separator; } - public Float realworldErrorLikelyhood() { + public Float realworldErrorLikelihood() { return realworldErrorLikelihood; } diff --git a/server/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoff.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoff.java index c7edde8bbaf76..29d03890b2791 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoff.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoff.java @@ -122,7 +122,7 @@ public static SmoothingModel fromXContent(XContentParser parser) throws IOExcept @Override public WordScorerFactory buildWordScorerFactory() { - return (IndexReader reader, Terms terms, String field, double realWordLikelyhood, BytesRef separator) - -> new StupidBackoffScorer(reader, terms, field, realWordLikelyhood, separator, discount); + return (IndexReader reader, Terms terms, String field, double realWordLikelihood, BytesRef separator) + -> new StupidBackoffScorer(reader, terms, field, realWordLikelihood, separator, discount); } } diff --git a/server/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java index d6862f384bebf..54493acf8a592 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/phrase/StupidBackoffScorer.java @@ -29,8 +29,8 @@ class StupidBackoffScorer extends WordScorer { private final double discount; StupidBackoffScorer(IndexReader reader, Terms terms,String field, - double realWordLikelyhood, BytesRef separator, double discount) throws IOException { - super(reader, terms, field, realWordLikelyhood, separator); + double realWordLikelihood, BytesRef separator, double discount) throws IOException { + super(reader, terms, field, realWordLikelihood, separator); this.discount = discount; } diff --git a/server/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java b/server/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java index b13f33f76394b..cc4a44590e79e 100644 --- a/server/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java +++ b/server/src/main/java/org/elasticsearch/search/suggest/phrase/WordScorer.java @@ -37,18 +37,18 @@ public abstract class WordScorer { protected final String field; protected final Terms terms; protected final long vocabluarySize; - protected final double realWordLikelyhood; + protected final double realWordLikelihood; protected final BytesRefBuilder spare = new BytesRefBuilder(); protected final BytesRef separator; protected final long numTerms; private final TermsEnum termsEnum; private final boolean useTotalTermFreq; - public WordScorer(IndexReader reader, String field, double realWordLikelyHood, BytesRef separator) throws IOException { - this(reader, MultiTerms.getTerms(reader, field), field, realWordLikelyHood, separator); + public WordScorer(IndexReader reader, String field, double realWordLikelihood, BytesRef separator) throws IOException { + this(reader, MultiTerms.getTerms(reader, field), field, realWordLikelihood, separator); } - public WordScorer(IndexReader reader, Terms terms, String field, double realWordLikelyHood, BytesRef separator) throws IOException { + public WordScorer(IndexReader reader, Terms terms, String field, double realWordLikelihood, BytesRef separator) throws IOException { this.field = field; if (terms == null) { throw new IllegalArgumentException("Field: [" + field + "] does not exist"); @@ -65,7 +65,7 @@ public WordScorer(IndexReader reader, Terms terms, String field, double realWord this.termsEnum = new FreqTermsEnum(reader, field, !useTotalTermFreq, useTotalTermFreq, null, BigArrays.NON_RECYCLING_INSTANCE); // non recycling for now this.reader = reader; - this.realWordLikelyhood = realWordLikelyHood; + this.realWordLikelihood = realWordLikelihood; this.separator = separator; } @@ -78,7 +78,7 @@ public long frequency(BytesRef term) throws IOException { protected double channelScore(Candidate candidate, Candidate original) throws IOException { if (candidate.stringDistance == 1.0d) { - return realWordLikelyhood; + return realWordLikelihood; } return candidate.stringDistance; } @@ -117,6 +117,6 @@ public static BytesRef join(BytesRef separator, BytesRefBuilder result, BytesRef public interface WordScorerFactory { WordScorer newScorer(IndexReader reader, Terms terms, - String field, double realWordLikelyhood, BytesRef separator) throws IOException; + String field, double realWordLikelihood, BytesRef separator) throws IOException; } } diff --git a/server/src/test/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilderTests.java b/server/src/test/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilderTests.java index d54a20f66dbbd..bb579c5a743b9 100644 --- a/server/src/test/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilderTests.java @@ -195,7 +195,7 @@ protected void assertSuggestionContext(PhraseSuggestionBuilder builder, Suggesti assertOptionalEquals(builder.confidence(), phraseSuggesterCtx.confidence(), PhraseSuggestionContext.DEFAULT_CONFIDENCE); assertOptionalEquals(builder.collatePrune(), phraseSuggesterCtx.collatePrune(), PhraseSuggestionContext.DEFAULT_COLLATE_PRUNE); assertEquals(builder.separator(), phraseSuggesterCtx.separator().utf8ToString()); - assertOptionalEquals(builder.realWordErrorLikelihood(), phraseSuggesterCtx.realworldErrorLikelyhood(), + assertOptionalEquals(builder.realWordErrorLikelihood(), phraseSuggesterCtx.realworldErrorLikelihood(), PhraseSuggestionContext.DEFAULT_RWE_ERRORLIKELIHOOD); assertOptionalEquals(builder.maxErrors(), phraseSuggesterCtx.maxErrors(), PhraseSuggestionContext.DEFAULT_MAX_ERRORS); assertOptionalEquals(builder.forceUnigrams(), phraseSuggesterCtx.getRequireUnigram(),