You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by co...@apache.org on 2011/08/20 21:35:40 UTC
svn commit: r1159908 - in
/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools:
chunker/ namefind/ postag/ sentdetect/ tokenize/ util/eval/
Author: colen
Date: Sat Aug 20 19:35:39 2011
New Revision: 1159908
URL: http://svn.apache.org/viewvc?rev=1159908&view=rev
Log:
OPENNLP-226 Evaluators can accept a list of listeners or just one listener. Evaluator makes a copy of the list of listeners.
Modified:
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerEvaluator.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderEvaluator.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSEvaluator.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorEvaluator.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerEvaluator.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/eval/Evaluator.java
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerEvaluator.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerEvaluator.java?rev=1159908&r1=1159907&r2=1159908&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerEvaluator.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerEvaluator.java Sat Aug 20 19:35:39 2011
@@ -18,6 +18,7 @@
package opennlp.tools.chunker;
+import java.util.Collections;
import java.util.List;
import opennlp.tools.util.eval.EvaluationSampleListener;
@@ -66,6 +67,19 @@ public class ChunkerEvaluator extends Ev
}
/**
+ * Initializes the current instance with the given {@link Chunker}.
+ *
+ * @param chunker
+ * the {@link Chunker} to evaluate.
+ * @param listener
+ * a listener
+ */
+ public ChunkerEvaluator(Chunker chunker,
+ EvaluationSampleListener<ChunkSample> listener) {
+ this(chunker, Collections.singletonList(listener));
+ }
+
+ /**
* Evaluates the given reference {@link ChunkSample} object.
*
* This is done by finding the phrases with the
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderEvaluator.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderEvaluator.java?rev=1159908&r1=1159907&r2=1159908&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderEvaluator.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderEvaluator.java Sat Aug 20 19:35:39 2011
@@ -22,6 +22,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.util.Collections;
import java.util.List;
import opennlp.tools.cmdline.PerformanceMonitor;
@@ -75,6 +76,19 @@ public class TokenNameFinderEvaluator ex
}
/**
+ * Initializes the current instance with the given {@link TokenNameFinder}.
+ *
+ * @param nameFinder
+ * the {@link TokenNameFinder} to evaluate.
+ * @param listener
+ * evaluation sample listener
+ */
+ public TokenNameFinderEvaluator(TokenNameFinder nameFinder,
+ EvaluationSampleListener<NameSample> listener) {
+ this(nameFinder, Collections.singletonList(listener));
+ }
+
+ /**
* Evaluates the given reference {@link NameSample} object.
*
* This is done by finding the names with the
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSEvaluator.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSEvaluator.java?rev=1159908&r1=1159907&r2=1159908&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSEvaluator.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSEvaluator.java Sat Aug 20 19:35:39 2011
@@ -18,6 +18,7 @@
package opennlp.tools.postag;
+import java.util.Collections;
import java.util.List;
import opennlp.tools.util.eval.EvaluationSampleListener;
@@ -56,6 +57,18 @@ public class POSEvaluator extends Evalua
}
/**
+ * Initializes the current instance.
+ *
+ * @param tagger
+ * @param listener
+ * a listener
+ */
+ public POSEvaluator(POSTagger tagger,
+ EvaluationSampleListener<POSSample> listener) {
+ this(tagger, Collections.singletonList(listener));
+ }
+
+ /**
* Evaluates the given reference {@link POSSample} object.
*
* This is done by tagging the sentence from the reference
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorEvaluator.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorEvaluator.java?rev=1159908&r1=1159907&r2=1159908&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorEvaluator.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorEvaluator.java Sat Aug 20 19:35:39 2011
@@ -17,6 +17,7 @@
package opennlp.tools.sentdetect;
+import java.util.Collections;
import java.util.List;
import opennlp.tools.util.Span;
@@ -61,6 +62,18 @@ public class SentenceDetectorEvaluator e
super(listeners);
this.sentenceDetector = sentenceDetector;
}
+
+ /**
+ * Initializes the current instance.
+ *
+ * @param sentenceDetector
+ * @param listener
+ * evaluation sample listener
+ */
+ public SentenceDetectorEvaluator(SentenceDetector sentenceDetector,
+ EvaluationSampleListener<SentenceSample> listener) {
+ this(sentenceDetector, Collections.singletonList(listener));
+ }
@Override
protected SentenceSample processSample(SentenceSample sample) {
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerEvaluator.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerEvaluator.java?rev=1159908&r1=1159907&r2=1159908&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerEvaluator.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerEvaluator.java Sat Aug 20 19:35:39 2011
@@ -18,6 +18,7 @@
package opennlp.tools.tokenize;
+import java.util.Collections;
import java.util.List;
import opennlp.tools.util.Span;
@@ -65,6 +66,19 @@ public class TokenizerEvaluator extends
super(listeners);
this.tokenizer = tokenizer;
}
+
+ /**
+ * Initializes the current instance with the given {@link Tokenizer}.
+ *
+ * @param tokenizer
+ * the {@link Tokenizer} to evaluate.
+ * @param listener
+ * evaluation sample listener
+ */
+ public TokenizerEvaluator(Tokenizer tokenizer,
+ EvaluationSampleListener<TokenSample> listener) {
+ this(tokenizer, Collections.singletonList(listener));
+ }
@Override
protected TokenSample processSample(TokenSample reference) {
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/eval/Evaluator.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/eval/Evaluator.java?rev=1159908&r1=1159907&r2=1159908&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/eval/Evaluator.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/eval/Evaluator.java Sat Aug 20 19:35:39 2011
@@ -19,7 +19,7 @@
package opennlp.tools.util.eval;
import java.io.IOException;
-import java.util.Collections;
+import java.util.LinkedList;
import java.util.List;
import opennlp.tools.util.ObjectStream;
@@ -40,7 +40,7 @@ public abstract class Evaluator<T> {
public Evaluator(List<? extends EvaluationSampleListener<T>> listeners) {
if(listeners != null) {
- this.listeners = Collections.unmodifiableList(listeners);
+ this.listeners = new LinkedList<EvaluationSampleListener<T>>(listeners);
}
}