You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/04/11 19:23:00 UTC
[1/2] lucene-solr:master: LUCENE-7776: change javadocs default
mention from Classic to BM25
Repository: lucene-solr
Updated Branches:
refs/heads/master e30cc70fd -> 57c583718
LUCENE-7776: change javadocs default mention from Classic to BM25
(Also kinda added missing javadoc for new method to fix 'ant precommit'.)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5c525434
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5c525434
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5c525434
Branch: refs/heads/master
Commit: 5c5254341e4158c24f3fc6ef3a54f6da6f667120
Parents: e30cc70
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Apr 11 19:36:44 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue Apr 11 19:36:44 2017 +0100
----------------------------------------------------------------------
.../lucene/classification/KNearestNeighborClassifier.java | 5 ++++-
.../document/KNearestNeighborDocumentClassifier.java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5c525434/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
index 6ed51e0..f0391f4 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
@@ -86,7 +86,7 @@ public class KNearestNeighborClassifier implements Classifier<BytesRef> {
* @param indexReader the reader on the index to be used for classification
* @param analyzer an {@link Analyzer} used to analyze unseen text
* @param similarity the {@link Similarity} to be used by the underlying {@link IndexSearcher} or {@code null}
- * (defaults to {@link org.apache.lucene.search.similarities.ClassicSimilarity})
+ * (defaults to {@link org.apache.lucene.search.similarities.BM25Similarity})
* @param query a {@link Query} to eventually filter the docs used for training the classifier, or {@code null}
* if all the indexed docs should be used
* @param k the no. of docs to select in the MLT results to find the nearest neighbor
@@ -127,6 +127,9 @@ public class KNearestNeighborClassifier implements Classifier<BytesRef> {
return classifyFromTopDocs(knnSearch(text));
}
+ /**
+ * TODO
+ */
protected ClassificationResult<BytesRef> classifyFromTopDocs(TopDocs knnResults) throws IOException {
List<ClassificationResult<BytesRef>> assignedClasses = buildListFromTopDocs(knnResults);
ClassificationResult<BytesRef> assignedClass = null;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5c525434/lucene/classification/src/java/org/apache/lucene/classification/document/KNearestNeighborDocumentClassifier.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/java/org/apache/lucene/classification/document/KNearestNeighborDocumentClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/document/KNearestNeighborDocumentClassifier.java
index adcb13b..88d41fc 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/document/KNearestNeighborDocumentClassifier.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/document/KNearestNeighborDocumentClassifier.java
@@ -56,7 +56,7 @@ public class KNearestNeighborDocumentClassifier extends KNearestNeighborClassifi
*
* @param indexReader the reader on the index to be used for classification
* @param similarity the {@link Similarity} to be used by the underlying {@link IndexSearcher} or {@code null}
- * (defaults to {@link org.apache.lucene.search.similarities.ClassicSimilarity})
+ * (defaults to {@link org.apache.lucene.search.similarities.BM25Similarity})
* @param query a {@link org.apache.lucene.search.Query} to eventually filter the docs used for training the classifier, or {@code null}
* if all the indexed docs should be used
* @param k the no. of docs to select in the MLT results to find the nearest neighbor
[2/2] lucene-solr:master: Removed two unused imports.
Posted by cp...@apache.org.
Removed two unused imports.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/57c58371
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/57c58371
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/57c58371
Branch: refs/heads/master
Commit: 57c5837183d4b3d1aa67380560c186780d6203b0
Parents: 5c52543
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Apr 11 20:01:05 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue Apr 11 20:11:12 2017 +0100
----------------------------------------------------------------------
.../test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java | 1 -
.../java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java | 1 -
2 files changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/57c58371/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java
index 839a44b..007bb18 100644
--- a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrJmxReporterTest.java
@@ -21,7 +21,6 @@ import javax.management.ObjectInstance;
import javax.management.ObjectName;
import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
import java.util.HashMap;
import java.util.Map;
import java.util.Random;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/57c58371/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
index 0a06d78..48f7670 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
@@ -19,7 +19,6 @@ package org.apache.solr.cloud;
import java.io.File;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
-import java.net.ServerSocket;
import java.net.URI;
import java.net.URL;
import java.nio.file.Path;