You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by to...@apache.org on 2015/04/30 16:13:46 UTC
svn commit: r1676998 - in
/lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification:
BooleanPerceptronClassifier.java CachingNaiveBayesClassifier.java
KNearestNeighborClassifier.java SimpleNaiveBayesClassifier.java
Author: tommaso
Date: Thu Apr 30 14:13:45 2015
New Revision: 1676998
URL: http://svn.apache.org/r1676998
Log:
LUCENE-6045 - removed train exceptions
Modified:
lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/BooleanPerceptronClassifier.java
lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/CachingNaiveBayesClassifier.java
lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java
Modified: lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/BooleanPerceptronClassifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/BooleanPerceptronClassifier.java?rev=1676998&r1=1676997&r2=1676998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/BooleanPerceptronClassifier.java (original)
+++ lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/BooleanPerceptronClassifier.java Thu Apr 30 14:13:45 2015
@@ -187,9 +187,6 @@ public class BooleanPerceptronClassifier
@Override
public ClassificationResult<Boolean> assignClass(String text)
throws IOException {
- if (textTerms == null) {
- throw new IOException("You must first call Classifier#train");
- }
Long output = 0l;
try (TokenStream tokenStream = analyzer.tokenStream(textFieldName, text)) {
CharTermAttribute charTermAttribute = tokenStream
Modified: lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/CachingNaiveBayesClassifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/CachingNaiveBayesClassifier.java?rev=1676998&r1=1676997&r2=1676998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/CachingNaiveBayesClassifier.java (original)
+++ lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/CachingNaiveBayesClassifier.java Thu Apr 30 14:13:45 2015
@@ -74,10 +74,6 @@ public class CachingNaiveBayesClassifier
private List<ClassificationResult<BytesRef>> assignClassNormalizedList(String inputDocument) throws IOException {
- if (leafReader == null) {
- throw new IOException("You must first call Classifier#train");
- }
-
String[] tokenizedDoc = tokenizeDoc(inputDocument);
List<ClassificationResult<BytesRef>> dataList = calculateLogLikelihood(tokenizedDoc);
Modified: lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java?rev=1676998&r1=1676997&r2=1676998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java (original)
+++ lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java Thu Apr 30 14:13:45 2015
@@ -113,9 +113,6 @@ public class KNearestNeighborClassifier
}
private TopDocs knnSearch(String text) throws IOException {
- if (mlt == null) {
- throw new IOException("You must first call Classifier#train");
- }
BooleanQuery mltQuery = new BooleanQuery();
for (String textFieldName : textFieldNames) {
mltQuery.add(new BooleanClause(mlt.like(textFieldName, new StringReader(text)), BooleanClause.Occur.SHOULD));
Modified: lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java?rev=1676998&r1=1676997&r2=1676998&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java (original)
+++ lucene/dev/trunk/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java Thu Apr 30 14:13:45 2015
@@ -129,9 +129,6 @@ public class SimpleNaiveBayesClassifier
}
private List<ClassificationResult<BytesRef>> assignClassNormalizedList(String inputDocument) throws IOException {
- if (leafReader == null) {
- throw new IOException("You must first call Classifier#train");
- }
List<ClassificationResult<BytesRef>> dataList = new ArrayList<>();
Terms terms = MultiFields.getTerms(leafReader, classFieldName);