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/07/18 23:16:11 UTC
svn commit: r1148052 - in
/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect:
SentenceDetectorCrossValidatorTool.java SentenceDetectorTrainerTool.java
TrainingParameters.java TrainingParams.java
Author: colen
Date: Mon Jul 18 21:16:04 2011
New Revision: 1148052
URL: http://svn.apache.org/viewvc?rev=1148052&view=rev
Log:
OPENNLP-227 Updated Sentence Detector trainer and cv tools
Added:
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/TrainingParams.java (with props)
Removed:
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/TrainingParameters.java
Modified:
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorCrossValidatorTool.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorTrainerTool.java
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorCrossValidatorTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorCrossValidatorTool.java?rev=1148052&r1=1148051&r2=1148052&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorCrossValidatorTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorCrossValidatorTool.java Mon Jul 18 21:16:04 2011
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.nio.charset.Charset;
import opennlp.tools.cmdline.ArgumentParser;
-import opennlp.tools.cmdline.CVParams;
import opennlp.tools.cmdline.CLI;
+import opennlp.tools.cmdline.CVParams;
import opennlp.tools.cmdline.CmdLineTool;
import opennlp.tools.cmdline.CmdLineUtil;
import opennlp.tools.cmdline.TerminateToolException;
@@ -33,6 +33,10 @@ import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.eval.FMeasure;
public final class SentenceDetectorCrossValidatorTool implements CmdLineTool {
+
+ interface CVToolParams extends TrainingParams, CVParams {
+
+ }
public String getName() {
return "SentenceDetectorCrossValidator";
@@ -48,12 +52,12 @@ public final class SentenceDetectorCross
public void run(String[] args) {
- if (!ArgumentParser.validateArguments(args, CVParams.class)) {
+ if (!ArgumentParser.validateArguments(args, CVToolParams.class)) {
System.err.println(getHelp());
throw new TerminateToolException(1);
}
- CVParams params = ArgumentParser.parse(args, CVParams.class);
+ CVToolParams params = ArgumentParser.parse(args, CVToolParams.class);
opennlp.tools.util.TrainingParameters mlParams =
CmdLineUtil.loadTrainingParameters(params.getParams(), false);
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorTrainerTool.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorTrainerTool.java?rev=1148052&r1=1148051&r2=1148052&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorTrainerTool.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorTrainerTool.java Mon Jul 18 21:16:04 2011
@@ -28,6 +28,7 @@ import opennlp.tools.cmdline.CLI;
import opennlp.tools.cmdline.CmdLineTool;
import opennlp.tools.cmdline.CmdLineUtil;
import opennlp.tools.cmdline.TerminateToolException;
+import opennlp.tools.cmdline.TrainingToolParams;
import opennlp.tools.sentdetect.SentenceDetectorME;
import opennlp.tools.sentdetect.SentenceModel;
import opennlp.tools.sentdetect.SentenceSample;
@@ -36,6 +37,10 @@ import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.PlainTextByLineStream;
public final class SentenceDetectorTrainerTool implements CmdLineTool {
+
+ interface TrainerToolParams extends TrainingParams, TrainingToolParams{
+
+ }
public String getName() {
return "SentenceDetectorTrainer";
@@ -46,7 +51,8 @@ public final class SentenceDetectorTrain
}
public String getHelp() {
- return "Usage: " + CLI.CMD + " " + getName() + " " + ArgumentParser.createUsage(TrainingParametersI.class);
+ return "Usage: " + CLI.CMD + " " + getName() + " "
+ + ArgumentParser.createUsage(TrainerToolParams.class);
}
static ObjectStream<SentenceSample> openSampleData(String sampleDataName,
@@ -62,19 +68,13 @@ public final class SentenceDetectorTrain
}
public void run(String[] args) {
- if (args.length < 8) {
- System.out.println(getHelp());
- throw new TerminateToolException(1);
- }
-
- TrainingParameters parameters = new TrainingParameters(args);
-
- if (!ArgumentParser.validateArguments(args, TrainingParametersI.class)) {
+ if (!ArgumentParser.validateArguments(args, TrainerToolParams.class)) {
System.err.println(getHelp());
throw new TerminateToolException(1);
}
- TrainingParametersI params = ArgumentParser.parse(args, TrainingParametersI.class);
+ TrainerToolParams params = ArgumentParser.parse(args,
+ TrainerToolParams.class);
opennlp.tools.util.TrainingParameters mlParams =
@@ -88,20 +88,20 @@ public final class SentenceDetectorTrain
}
File trainingDataInFile = params.getData();
- File modelOutFile = params.getData();// FIX IT
+ File modelOutFile = params.getModel();
CmdLineUtil.checkOutputFile("sentence detector model", modelOutFile);
ObjectStream<SentenceSample> sampleStream =
- openSampleData("Training", trainingDataInFile, parameters.getEncoding());
+ openSampleData("Training", trainingDataInFile, params.getEncoding());
SentenceModel model;
try {
if (mlParams == null) {
- model = SentenceDetectorME.train(parameters.getLanguage(), sampleStream, true, null,
- parameters.getCutoff(), parameters.getNumberOfIterations());
+ model = SentenceDetectorME.train(params.getLang(), sampleStream, true, null,
+ params.getCutoff(), params.getIterations());
}
else {
- model = SentenceDetectorME.train(parameters.getLanguage(), sampleStream, true, null,
+ model = SentenceDetectorME.train(params.getLang(), sampleStream, true, null,
mlParams);
}
} catch (IOException e) {
Added: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/TrainingParams.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/TrainingParams.java?rev=1148052&view=auto
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/TrainingParams.java (added)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/TrainingParams.java Mon Jul 18 21:16:04 2011
@@ -0,0 +1,30 @@
+/*
+ * 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.cmdline.sentdetect;
+
+import opennlp.tools.cmdline.BasicTrainingParams;
+
+/**
+ * TrainingParams for Sentence Detector.
+ *
+ * Note: Do not use this class, internal use only!
+ */
+interface TrainingParams extends BasicTrainingParams {
+
+
+}
Propchange: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/TrainingParams.java
------------------------------------------------------------------------------
svn:mime-type = text/plain