Author: joern
Date: Wed May 13 12:15:53 2015
New Revision: 1679189
URL: http://svn.apache.org/r1679189
Log:
OPENNLP-768 Renamed ParserCrossEvaluator to ParserCrossValidator to fit into
naming scheme
Added:
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/ParserCrossValidator.java
Removed:
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/ParserCrossEvaluator.java
Modified:
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4ParserEval.java
Added:
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/ParserCrossValidator.java
URL:
http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/ParserCrossValidator.java?rev=1679189&view=auto
==============================================================================
---
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/ParserCrossValidator.java
(added)
+++
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/ParserCrossValidator.java
Wed May 13 12:15:53 2015
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package opennlp.tools.parser;
+
+import java.io.IOException;
+
+import opennlp.tools.util.ObjectStream;
+import opennlp.tools.util.TrainingParameters;
+import opennlp.tools.util.eval.CrossValidationPartitioner;
+import opennlp.tools.util.eval.FMeasure;
+
+public class ParserCrossValidator {
+
+ private final String languageCode;
+
+ private final TrainingParameters params;
+
+ private final HeadRules rules;
+
+ private final FMeasure fmeasure = new FMeasure();
+
+ private ParserType parserType;
+
+ private ParserEvaluationMonitor[] monitors;
+
+ public ParserCrossValidator(String languageCode, TrainingParameters params,
HeadRules rules, ParserType parserType,
+ ParserEvaluationMonitor... monitors) {
+ this.languageCode = languageCode;
+ this.params = params;
+ this.rules = rules;
+ this.parserType = parserType;
+ }
+
+ public void evaluate(ObjectStream<Parse> samples, int nFolds) throws
IOException {
+
+ CrossValidationPartitioner<Parse> partitioner = new
CrossValidationPartitioner<Parse>(
+ samples, nFolds);
+
+ while (partitioner.hasNext()) {
+ CrossValidationPartitioner.TrainingSampleStream<Parse>
trainingSampleStream = partitioner
+ .next();
+
+ ParserModel model;
+
+ if (ParserType.CHUNKING.equals(parserType)) {
+ model = opennlp.tools.parser.chunking.Parser.train(languageCode,
samples, rules, params);
+ }
+ else if (ParserType.TREEINSERT.equals(parserType)) {
+ model = opennlp.tools.parser.treeinsert.Parser.train(languageCode,
samples, rules, params);
+ }
+ else {
+ throw new IllegalStateException("Unexpected parser type: " +
parserType);
+ }
+
+ ParserEvaluator evaluator = new
ParserEvaluator(ParserFactory.create(model), monitors);
+
+ evaluator.evaluate(trainingSampleStream.getTestSampleStream());
+
+ fmeasure.mergeInto(evaluator.getFMeasure());
+ }
+ }
+
+ public FMeasure getFMeasure() {
+ return fmeasure;
+ }
+}
Modified:
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4ParserEval.java
URL:
http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4ParserEval.java?rev=1679189&r1=1679188&r2=1679189&view=diff
==============================================================================
---
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4ParserEval.java
(original)
+++
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/eval/OntoNotes4ParserEval.java
Wed May 13 12:15:53 2015
@@ -32,7 +32,7 @@ import opennlp.tools.formats.convert.Fil
import opennlp.tools.formats.ontonotes.DocumentToLineStream;
import opennlp.tools.formats.ontonotes.OntoNotesParseSampleStream;
import opennlp.tools.parser.HeadRules;
-import opennlp.tools.parser.ParserCrossEvaluator;
+import opennlp.tools.parser.ParserCrossValidator;
import opennlp.tools.parser.ParserType;
import opennlp.tools.parser.lang.en.HeadRulesTest;
import opennlp.tools.util.ObjectStream;
@@ -60,7 +60,7 @@ public class OntoNotes4ParserEval {
new DocumentToLineStream(new FileToStringSampleStream(
documentStream, Charset.forName("UTF-8"))));
- ParserCrossEvaluator cv = new ParserCrossEvaluator("en", params, rules,
ParserType.CHUNKING);
+ ParserCrossValidator cv = new ParserCrossValidator("en", params, rules,
ParserType.CHUNKING);
cv.evaluate(samples, 10);
