Suggest works

Author: glorieux-f

common/src/java/com/github/oeuvres/alix/lucene/terms/FieldStats.java

@@ -162,7 +162,7 @@ public final class FieldStats
     private volatile double[] termWeights;
 
     /** The scorer used to calculate {@link #termWeights}. */
-    private volatile TermScorer termWeightsScorer;
+    private volatile IdfTermScorer termWeightsScorer;
 
     /**
      * Creates an immutable statistics object from already-loaded arrays and derived scalars.
@@ -301,7 +301,7 @@ public static void build(final IndexReader reader, final Path sideDir, final Str
      * <p>
      * When {@code focusDocs} is non-null, the focus subset's token total and document
      * count are derived from the bitset and {@link #docTokens}, then passed to
-     * {@link TermScorer#focus}. Each posting visit then tells the scorer whether the
+     * {@link IdfTermScorer#focus}. Each posting visit then tells the scorer whether the
      * document is in focus, and the scorer accumulates into focus or rest separately.
      * </p>
      *
@@ -312,7 +312,7 @@ public static void build(final IndexReader reader, final Path sideDir, final Str
      * @throws IOException           if term or postings iteration fails
      * @throws IllegalStateException if the field has no terms or no frequencies
      */
-    public double[] buildTermWeights(final IndexReader reader, final TermScorer scorer)
+    public double[] buildTermWeights(final IndexReader reader, final IdfTermScorer scorer)
         throws IOException
     {
         Objects.requireNonNull(reader, "reader");
@@ -917,7 +917,7 @@ public static TermStats termStats(final IndexReader reader, final String field,
      *
      * @param termId dense term id in {@code [0, vocabSize)}
      * @return cached weight, or {@code 0.0} for the absent-term sentinel (id 0)
-     * @throws IllegalStateException    if {@link #termWeights(IndexReader, TermScorer)} has not been called
+     * @throws IllegalStateException    if {@link #termWeights(IndexReader, IdfTermScorer)} has not been called
      * @throws IllegalArgumentException if {@code termId} is out of range
      */
     public double termWeight(final int termId)
@@ -951,7 +951,7 @@ public double[] termWeightsRef()
      * @return weight vector indexed by dense term id
      * @throws IOException if term iteration fails
      */
-    public double[] termWeights(final IndexReader reader, final TermScorer scorer) throws IOException
+    public double[] termWeights(final IndexReader reader, final IdfTermScorer scorer) throws IOException
     {
         Objects.requireNonNull(reader, "reader");
         Objects.requireNonNull(scorer, "scorer");

…euvres/alix/lucene/terms/TermScorer.java …res/alix/lucene/terms/IdfTermScorer.javacommon/src/java/com/github/oeuvres/alix/lucene/terms/TermScorer.java renamed to common/src/java/com/github/oeuvres/alix/lucene/terms/IdfTermScorer.java common/src/java/com/github/oeuvres/alix/lucene/terms/TermScorer.java renamed to common/src/java/com/github/oeuvres/alix/lucene/terms/IdfTermScorer.java

@@ -30,7 +30,7 @@
  * Stateful. One instance must not be reused concurrently.
  * </p>
  */
-public abstract class TermScorer
+public abstract class IdfTermScorer
 {
 
     /** Total token count of the full corpus/field. */
@@ -191,7 +191,7 @@ public int hashCode()
      * {@code 2 × docTermFreq × ln(docTermFreq / expected)}.
      * Positive when over-represented, negative when under-represented.
      */
-    public static class G extends TermScorer
+    public static class G extends IdfTermScorer
     {
         @Override
         public double termDocAdd(final long docTermFreq, final long docTokens, final boolean inFocus)
@@ -214,7 +214,7 @@ public double termDocAdd(final long docTermFreq, final long docTokens, final boo
     /**
      * Count-form Jaccard: {@code docTermFreq / (docTokens + corpusTermFreq - docTermFreq)}.
      */
-    public static class Jaccard extends TermScorer
+    public static class Jaccard extends IdfTermScorer
     {
         @Override
         public double termDocAdd(final long docTermFreq, final long docTokens, final boolean inFocus)
@@ -252,7 +252,7 @@ public double termDocAdd(final long docTermFreq, final long docTokens, final boo
      * a matter of editing {@code result()} to the alternative formula.
      * </p>
      */
-    public static class BM25 extends TermScorer
+    public static class BM25 extends IdfTermScorer
     {
         /** Term frequency saturation. */
         protected double k1 = 1.2d;
@@ -429,7 +429,7 @@ public int hashCode()
         }
     }
 
-    public static class DklContrast extends TermScorer
+    public static class DklContrast extends IdfTermScorer
     {
         /** Σ tf_i on focus side for current term. */
         protected long focusTermFreqAcc;

common/src/java/com/github/oeuvres/alix/lucene/terms/TermSuggest.java

@@ -160,7 +160,7 @@ public TopTerms suggest(
 
         final String foldedQuery = Char.toAscii(infix);
         if (foldedQuery.isEmpty()) {
-            return source.setRanking(new int[0], null, null);
+            return source.rank(limit);
         }
 
         final boolean prefixOnly = foldedQuery.length() < INFIX_THRESHOLD;