You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by jo...@apache.org on 2013/05/31 18:23:38 UTC
svn commit: r1488299 [1/3] - in /opennlp/trunk: opennlp-maxent/
opennlp-tools/ opennlp-tools/src/main/java/opennlp/tools/chunker/
opennlp-tools/src/main/java/opennlp/tools/cmdline/
opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ opennlp-tools...
Author: joern
Date: Fri May 31 16:23:35 2013
New Revision: 1488299
URL: http://svn.apache.org/r1488299
Log:
OPENNLP-581 Moved the maxent library to opennlp.tools.ml
Added:
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/
- copied from r1488030, opennlp/trunk/opennlp-maxent/src/main/java/opennlp/maxent/
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/
- copied from r1488030, opennlp/trunk/opennlp-maxent/src/main/java/opennlp/model/
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/
- copied from r1488030, opennlp/trunk/opennlp-maxent/src/main/java/opennlp/perceptron/
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/PrepAttachDataUtil.java
- copied, changed from r1488030, opennlp/trunk/opennlp-maxent/src/test/java/opennlp/PrepAttachDataUtil.java
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/
- copied from r1488030, opennlp/trunk/opennlp-maxent/src/test/java/opennlp/maxent/
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/model/
- copied from r1488030, opennlp/trunk/opennlp-maxent/src/test/java/opennlp/model/
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/perceptron/
- copied from r1488030, opennlp/trunk/opennlp-maxent/src/test/java/opennlp/perceptron/
opennlp/trunk/opennlp-tools/src/test/resources/data/
- copied from r1488030, opennlp/trunk/opennlp-maxent/src/test/resources/data/
Removed:
opennlp/trunk/opennlp-maxent/
Modified:
opennlp/trunk/opennlp-tools/pom.xml
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerEventStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerME.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerModel.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/BuildModelUpdaterTool.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/CheckModelUpdaterTool.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTrainerTool.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTrainerTool.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorTrainerTool.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerTrainerTool.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/doccat/DoccatModel.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerEventStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerME.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/lang/spanish/TokenChunker.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BasicContextGenerator.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BasicEventStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BinToAscii.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ContextGenerator.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/Counter.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/DataStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/DomainToModelMap.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/DoubleStringPair.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/Evalable.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GIS.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISModel.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISTrainer.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/IntegerPool.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/Main.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelApplier.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelDomain.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelReplacementManager.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelSetter.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelTrainer.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/PlainTextByLineDataStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/RealBasicEventStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/TrainEval.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinToAscii.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinaryGISModelReader.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinaryGISModelWriter.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinaryQNModelReader.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinaryQNModelWriter.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/GISModelReader.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/GISModelWriter.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectGISModelReader.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectGISModelWriter.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectQNModelReader.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectQNModelWriter.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/OldFormatGISModelReader.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PlainTextGISModelReader.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PlainTextGISModelWriter.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PooledGISModelReader.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/QNModelReader.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/QNModelWriter.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/SuffixSensitiveGISModelReader.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/SuffixSensitiveGISModelWriter.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/ArrayMath.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/DifferentiableFunction.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/Function.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/LineSearch.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/LineSearchResult.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/LogLikelihoodFunction.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNModel.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNTrainer.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractDataIndexer.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractEventStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModel.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModelReader.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModelWriter.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/BinaryFileDataReader.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ComparableEvent.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ComparablePredicate.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/Context.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/DataIndexer.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/DataReader.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/DynamicEvalParameters.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/EvalParameters.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/Event.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/EventCollector.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/EventCollectorAsStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/EventStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/FileEventStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/GenericModelReader.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/GenericModelWriter.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/HashSumEventStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/IndexHashTable.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ListEventStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/MaxentModel.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/MutableContext.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ObjectDataReader.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/OnePassDataIndexer.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/OnePassRealValueDataIndexer.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/PlainTextFileDataReader.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/Prior.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/RealValueFileEventStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/Sequence.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/SequenceStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/SequenceStreamEventStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/TrainUtil.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/TwoPassDataIndexer.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/UniformPrior.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/BinaryPerceptronModelReader.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/BinaryPerceptronModelWriter.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronModel.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronModelReader.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronModelWriter.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronTrainer.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PlainTextPerceptronModelReader.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PlainTextPerceptronModelWriter.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SimplePerceptronSequenceTrainer.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SuffixSensitivePerceptronModelWriter.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderEventStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameSampleDataStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameSampleSequenceStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderModel.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractParserEventStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/ParserModel.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/Parser.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/ParserEventStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/Parser.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/ParserEventStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSModel.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleEventStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleSequenceStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerFactory.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerME.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerTrainer.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/AbstractEndOfSentenceScanner.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/DefaultEndOfSentenceScanner.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SDEventStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorME.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceModel.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokSpanEventStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerME.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerModel.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/AbstractEventStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/BeamSearch.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/CollectionEventStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/EventTraceStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/HashSumEventStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/GenericModelSerializer.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/ModelUtil.java
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/MaxentPrepAttachTest.java
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/RealValueModelTest.java
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/ScaleDoesntMatterTest.java
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/io/RealValueFileEventStreamTest.java
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/quasinewton/LineSearchTest.java
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/quasinewton/LogLikelihoodFunctionTest.java
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/quasinewton/QNTrainerTest.java
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/quasinewton/QuadraticFunction.java
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/quasinewton/QuadraticFunction02.java
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/model/IndexHashTableTest.java
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/perceptron/PerceptronPrepAttachTest.java
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/namefind/NameFinderEventStreamTest.java
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/namefind/NameFinderMETest.java
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/postag/POSSampleEventStreamTest.java
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/sentdetect/SDEventStreamTest.java
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/tokenize/TokSpanEventStreamTest.java
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/util/AbstractEventStreamTest.java
opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/util/BeamSearchTest.java
opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/chunker/ChunkerTrainer.java
opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/doccat/DocumentCategorizerTrainer.java
opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/namefind/NameFinderTrainer.java
opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/postag/POSTaggerTrainer.java
opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/sentdetect/SentenceDetectorTrainer.java
opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/tokenize/TokenizerTrainer.java
opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/util/OpennlpUtil.java
Modified: opennlp/trunk/opennlp-tools/pom.xml
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/pom.xml?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/pom.xml (original)
+++ opennlp/trunk/opennlp-tools/pom.xml Fri May 31 16:23:35 2013
@@ -35,13 +35,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.opennlp</groupId>
- <artifactId>opennlp-maxent</artifactId>
- <version>3.0.4-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.2.0</version>
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerEventStream.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerEventStream.java Fri May 31 16:23:35 2013
@@ -19,13 +19,13 @@ package opennlp.tools.chunker;
import java.io.IOException;
-import opennlp.model.Event;
+import opennlp.tools.ml.model.Event;
import opennlp.tools.util.ObjectStream;
/**
* Class for creating an event stream out of data files for training a chunker.
*/
-public class ChunkerEventStream extends opennlp.model.AbstractEventStream {
+public class ChunkerEventStream extends opennlp.tools.ml.model.AbstractEventStream {
private ChunkerContextGenerator cg;
private ObjectStream<ChunkSample> data;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerME.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerME.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerME.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerME.java Fri May 31 16:23:35 2013
@@ -23,10 +23,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import opennlp.model.AbstractModel;
-import opennlp.model.EventStream;
-import opennlp.model.MaxentModel;
-import opennlp.model.TrainUtil;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.EventStream;
+import opennlp.tools.ml.model.MaxentModel;
+import opennlp.tools.ml.model.TrainUtil;
import opennlp.tools.util.BeamSearch;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.Sequence;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerModel.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerModel.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerModel.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/chunker/ChunkerModel.java Fri May 31 16:23:35 2013
@@ -27,9 +27,9 @@ import java.io.InputStream;
import java.net.URL;
import java.util.Map;
-import opennlp.model.AbstractModel;
-import opennlp.model.BinaryFileDataReader;
-import opennlp.model.GenericModelReader;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.BinaryFileDataReader;
+import opennlp.tools.ml.model.GenericModelReader;
import opennlp.tools.util.BaseToolFactory;
import opennlp.tools.util.InvalidFormatException;
import opennlp.tools.util.model.BaseModel;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/CmdLineUtil.java Fri May 31 16:23:35 2013
@@ -30,7 +30,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Locale;
-import opennlp.model.TrainUtil;
+import opennlp.tools.ml.model.TrainUtil;
import opennlp.tools.util.TrainingParameters;
import opennlp.tools.util.model.BaseModel;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/BuildModelUpdaterTool.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/BuildModelUpdaterTool.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/BuildModelUpdaterTool.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/BuildModelUpdaterTool.java Fri May 31 16:23:35 2013
@@ -19,7 +19,7 @@ package opennlp.tools.cmdline.parser;
import java.io.IOException;
-import opennlp.model.AbstractModel;
+import opennlp.tools.ml.model.AbstractModel;
import opennlp.tools.dictionary.Dictionary;
import opennlp.tools.parser.Parse;
import opennlp.tools.parser.ParserEventTypeEnum;
@@ -46,7 +46,7 @@ public final class BuildModelUpdaterTool
// TODO: training individual models should be in the chunking parser, not here
// Training build
System.out.println("Training builder");
- opennlp.model.EventStream bes = new ParserEventStream(parseSamples,
+ opennlp.tools.ml.model.EventStream bes = new ParserEventStream(parseSamples,
originalModel.getHeadRules(), ParserEventTypeEnum.BUILD, mdict);
AbstractModel buildModel = Parser.train(bes,
parameters.getIterations(), parameters.getCutoff());
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/CheckModelUpdaterTool.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/CheckModelUpdaterTool.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/CheckModelUpdaterTool.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/CheckModelUpdaterTool.java Fri May 31 16:23:35 2013
@@ -19,7 +19,7 @@ package opennlp.tools.cmdline.parser;
import java.io.IOException;
-import opennlp.model.AbstractModel;
+import opennlp.tools.ml.model.AbstractModel;
import opennlp.tools.dictionary.Dictionary;
import opennlp.tools.parser.Parse;
import opennlp.tools.parser.ParserEventTypeEnum;
@@ -47,7 +47,7 @@ public final class CheckModelUpdaterTool
// TODO: Maybe that should be part of the ChunkingParser ...
// Training build
System.out.println("Training check model");
- opennlp.model.EventStream bes = new ParserEventStream(parseSamples,
+ opennlp.tools.ml.model.EventStream bes = new ParserEventStream(parseSamples,
originalModel.getHeadRules(), ParserEventTypeEnum.CHECK, mdict);
AbstractModel checkModel = Parser.train(bes,
parameters.getIterations(), parameters.getCutoff());
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTrainerTool.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTrainerTool.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTrainerTool.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/parser/ParserTrainerTool.java Fri May 31 16:23:35 2013
@@ -22,7 +22,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
-import opennlp.model.TrainUtil;
+import opennlp.tools.ml.model.TrainUtil;
import opennlp.tools.cmdline.AbstractTrainerTool;
import opennlp.tools.cmdline.CmdLineUtil;
import opennlp.tools.cmdline.TerminateToolException;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTrainerTool.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTrainerTool.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTrainerTool.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/postag/POSTaggerTrainerTool.java Fri May 31 16:23:35 2013
@@ -20,7 +20,7 @@ package opennlp.tools.cmdline.postag;
import java.io.File;
import java.io.IOException;
-import opennlp.model.TrainUtil;
+import opennlp.tools.ml.model.TrainUtil;
import opennlp.tools.cmdline.AbstractTrainerTool;
import opennlp.tools.cmdline.CmdLineUtil;
import opennlp.tools.cmdline.TerminateToolException;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorTrainerTool.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorTrainerTool.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorTrainerTool.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/sentdetect/SentenceDetectorTrainerTool.java Fri May 31 16:23:35 2013
@@ -21,7 +21,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import opennlp.model.TrainUtil;
+import opennlp.tools.ml.model.TrainUtil;
import opennlp.tools.cmdline.AbstractTrainerTool;
import opennlp.tools.cmdline.CmdLineUtil;
import opennlp.tools.cmdline.TerminateToolException;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerTrainerTool.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerTrainerTool.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerTrainerTool.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/cmdline/tokenizer/TokenizerTrainerTool.java Fri May 31 16:23:35 2013
@@ -21,7 +21,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import opennlp.model.TrainUtil;
+import opennlp.tools.ml.model.TrainUtil;
import opennlp.tools.cmdline.AbstractTrainerTool;
import opennlp.tools.cmdline.CmdLineUtil;
import opennlp.tools.cmdline.TerminateToolException;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/doccat/DoccatModel.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/doccat/DoccatModel.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/doccat/DoccatModel.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/doccat/DoccatModel.java Fri May 31 16:23:35 2013
@@ -23,7 +23,7 @@ import java.io.InputStream;
import java.net.URL;
import java.util.Map;
-import opennlp.model.AbstractModel;
+import opennlp.tools.ml.model.AbstractModel;
import opennlp.tools.util.InvalidFormatException;
import opennlp.tools.util.model.BaseModel;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerEventStream.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerEventStream.java Fri May 31 16:23:35 2013
@@ -20,7 +20,7 @@ package opennlp.tools.doccat;
import java.util.Iterator;
-import opennlp.model.Event;
+import opennlp.tools.ml.model.Event;
import opennlp.tools.util.AbstractEventStream;
import opennlp.tools.util.ObjectStream;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerME.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerME.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerME.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/doccat/DocumentCategorizerME.java Fri May 31 16:23:35 2013
@@ -23,11 +23,11 @@ import java.io.ObjectStreamException;
import java.util.HashMap;
import java.util.Map;
-import opennlp.maxent.GIS;
-import opennlp.model.AbstractModel;
-import opennlp.model.MaxentModel;
-import opennlp.model.TrainUtil;
-import opennlp.model.TwoPassDataIndexer;
+import opennlp.tools.ml.maxent.GIS;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.MaxentModel;
+import opennlp.tools.ml.model.TrainUtil;
+import opennlp.tools.ml.model.TwoPassDataIndexer;
import opennlp.tools.tokenize.SimpleTokenizer;
import opennlp.tools.tokenize.Tokenizer;
import opennlp.tools.util.ObjectStream;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/lang/spanish/TokenChunker.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/lang/spanish/TokenChunker.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/lang/spanish/TokenChunker.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/lang/spanish/TokenChunker.java Fri May 31 16:23:35 2013
@@ -21,7 +21,7 @@ import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
-import opennlp.maxent.io.SuffixSensitiveGISModelReader;
+import opennlp.tools.ml.maxent.io.SuffixSensitiveGISModelReader;
import opennlp.tools.namefind.NameFinderEventStream;
import opennlp.tools.namefind.NameFinderME;
import opennlp.tools.util.Span;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BasicContextGenerator.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BasicContextGenerator.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BasicContextGenerator.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BasicContextGenerator.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
/**
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BasicEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BasicEventStream.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BasicEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BasicEventStream.java Fri May 31 16:23:35 2013
@@ -17,10 +17,10 @@
* under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
-import opennlp.model.AbstractEventStream;
-import opennlp.model.Event;
+import opennlp.tools.ml.model.AbstractEventStream;
+import opennlp.tools.ml.model.Event;
/**
* A object which can deliver a stream of training events assuming
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BinToAscii.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BinToAscii.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BinToAscii.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/BinToAscii.java Fri May 31 16:23:35 2013
@@ -18,7 +18,7 @@
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
import java.io.DataInputStream;
import java.io.FileInputStream;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ContextGenerator.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ContextGenerator.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ContextGenerator.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ContextGenerator.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
/**
* Generate contexts for maxent decisions.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/Counter.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/Counter.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/Counter.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/Counter.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
/**
* A simple class which is essentially an Integer which is mutable via
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/DataStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/DataStream.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/DataStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/DataStream.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
/**
* A interface for objects which can deliver a stream of training data to be
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/DomainToModelMap.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/DomainToModelMap.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/DomainToModelMap.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/DomainToModelMap.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
import java.util.Collections;
import java.util.HashMap;
@@ -25,7 +25,7 @@ import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set;
-import opennlp.model.MaxentModel;
+import opennlp.tools.ml.model.MaxentModel;
/**
* A class which stores a mapping from ModelDomain objects to MaxentModels.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/DoubleStringPair.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/DoubleStringPair.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/DoubleStringPair.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/DoubleStringPair.java Fri May 31 16:23:35 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
public class DoubleStringPair implements Comparable<DoubleStringPair> {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/Evalable.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/Evalable.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/Evalable.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/Evalable.java Fri May 31 16:23:35 2013
@@ -17,12 +17,12 @@
* under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
import java.io.Reader;
-import opennlp.model.EventCollector;
-import opennlp.model.MaxentModel;
+import opennlp.tools.ml.model.EventCollector;
+import opennlp.tools.ml.model.MaxentModel;
/**
* Interface for components which use maximum entropy models and can evaluate
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GIS.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GIS.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GIS.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GIS.java Fri May 31 16:23:35 2013
@@ -17,14 +17,14 @@
* under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
import java.io.IOException;
-import opennlp.model.DataIndexer;
-import opennlp.model.EventStream;
-import opennlp.model.Prior;
-import opennlp.model.UniformPrior;
+import opennlp.tools.ml.model.DataIndexer;
+import opennlp.tools.ml.model.EventStream;
+import opennlp.tools.ml.model.Prior;
+import opennlp.tools.ml.model.UniformPrior;
/**
* A Factory class which uses instances of GISTrainer to create and train
@@ -53,7 +53,7 @@ public class GIS {
* The EventStream holding the data on which this model will be
* trained.
* @return The newly trained model, which can be used immediately or saved to
- * disk using an opennlp.maxent.io.GISModelWriter object.
+ * disk using an opennlp.tools.ml.maxent.io.GISModelWriter object.
*/
public static GISModel trainModel(EventStream eventStream) throws IOException {
return trainModel(eventStream, 100, 0, false, PRINT_MESSAGES);
@@ -70,7 +70,7 @@ public class GIS {
* Defines whether the created trainer will use smoothing while
* training the model.
* @return The newly trained model, which can be used immediately or saved to
- * disk using an opennlp.maxent.io.GISModelWriter object.
+ * disk using an opennlp.tools.ml.maxent.io.GISModelWriter object.
*/
public static GISModel trainModel(EventStream eventStream, boolean smoothing)
throws IOException {
@@ -89,7 +89,7 @@ public class GIS {
* The number of times a feature must be seen in order to be relevant
* for training.
* @return The newly trained model, which can be used immediately or saved to
- * disk using an opennlp.maxent.io.GISModelWriter object.
+ * disk using an opennlp.tools.ml.maxent.io.GISModelWriter object.
*/
public static GISModel trainModel(EventStream eventStream, int iterations,
int cutoff) throws IOException {
@@ -113,7 +113,7 @@ public class GIS {
* @param printMessagesWhileTraining
* Determines whether training status messages are written to STDOUT.
* @return The newly trained model, which can be used immediately or saved to
- * disk using an opennlp.maxent.io.GISModelWriter object.
+ * disk using an opennlp.tools.ml.maxent.io.GISModelWriter object.
*/
public static GISModel trainModel(EventStream eventStream, int iterations,
int cutoff, boolean smoothing, boolean printMessagesWhileTraining)
@@ -138,7 +138,7 @@ public class GIS {
* @param sigma
* The standard deviation for the gaussian smoother.
* @return The newly trained model, which can be used immediately or saved to
- * disk using an opennlp.maxent.io.GISModelWriter object.
+ * disk using an opennlp.tools.ml.maxent.io.GISModelWriter object.
*/
public static GISModel trainModel(EventStream eventStream, int iterations,
int cutoff, double sigma) throws IOException {
@@ -159,7 +159,7 @@ public class GIS {
* Defines whether the created trainer will use smoothing while
* training the model.
* @return The newly trained model, which can be used immediately or saved to
- * disk using an opennlp.maxent.io.GISModelWriter object.
+ * disk using an opennlp.tools.ml.maxent.io.GISModelWriter object.
*/
public static GISModel trainModel(int iterations, DataIndexer indexer,
boolean smoothing) {
@@ -174,7 +174,7 @@ public class GIS {
* @param indexer
* The object which will be used for event compilation.
* @return The newly trained model, which can be used immediately or saved to
- * disk using an opennlp.maxent.io.GISModelWriter object.
+ * disk using an opennlp.tools.ml.maxent.io.GISModelWriter object.
*/
public static GISModel trainModel(int iterations, DataIndexer indexer) {
return trainModel(iterations, indexer, true, false, null, 0);
@@ -191,7 +191,7 @@ public class GIS {
* @param modelPrior
* The prior distribution for the model.
* @return The newly trained model, which can be used immediately or saved to
- * disk using an opennlp.maxent.io.GISModelWriter object.
+ * disk using an opennlp.tools.ml.maxent.io.GISModelWriter object.
*/
public static GISModel trainModel(int iterations, DataIndexer indexer,
Prior modelPrior, int cutoff) {
@@ -215,7 +215,7 @@ public class GIS {
* @param cutoff
* The number of times a predicate must occur to be used in a model.
* @return The newly trained model, which can be used immediately or saved to
- * disk using an opennlp.maxent.io.GISModelWriter object.
+ * disk using an opennlp.tools.ml.maxent.io.GISModelWriter object.
*/
public static GISModel trainModel(int iterations, DataIndexer indexer,
boolean printMessagesWhileTraining, boolean smoothing, Prior modelPrior,
@@ -241,7 +241,7 @@ public class GIS {
* @param cutoff
* The number of times a predicate must occur to be used in a model.
* @return The newly trained model, which can be used immediately or saved to
- * disk using an opennlp.maxent.io.GISModelWriter object.
+ * disk using an opennlp.tools.ml.maxent.io.GISModelWriter object.
*/
public static GISModel trainModel(int iterations, DataIndexer indexer,
boolean printMessagesWhileTraining, boolean smoothing, Prior modelPrior,
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISModel.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISModel.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISModel.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISModel.java Fri May 31 16:23:35 2013
@@ -17,18 +17,18 @@
* under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
import java.io.BufferedReader;
import java.io.File;
import java.io.InputStreamReader;
import java.text.DecimalFormat;
-import opennlp.model.AbstractModel;
-import opennlp.model.Context;
-import opennlp.model.EvalParameters;
-import opennlp.model.Prior;
-import opennlp.model.UniformPrior;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.Context;
+import opennlp.tools.ml.model.EvalParameters;
+import opennlp.tools.ml.model.Prior;
+import opennlp.tools.ml.model.UniformPrior;
/**
* A maximum entropy model which has been trained using the Generalized
@@ -218,7 +218,7 @@ public final class GISModel extends Abst
System.err.println("Usage: GISModel modelname < contexts");
System.exit(1);
}
- AbstractModel m = new opennlp.maxent.io.SuffixSensitiveGISModelReader(
+ AbstractModel m = new opennlp.tools.ml.maxent.io.SuffixSensitiveGISModelReader(
new File(args[0])).getModel();
BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
DecimalFormat df = new java.text.DecimalFormat(".###");
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISTrainer.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISTrainer.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISTrainer.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISTrainer.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
import java.io.IOException;
import java.util.ArrayList;
@@ -28,13 +28,13 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import opennlp.model.DataIndexer;
-import opennlp.model.EvalParameters;
-import opennlp.model.EventStream;
-import opennlp.model.MutableContext;
-import opennlp.model.OnePassDataIndexer;
-import opennlp.model.Prior;
-import opennlp.model.UniformPrior;
+import opennlp.tools.ml.model.DataIndexer;
+import opennlp.tools.ml.model.EvalParameters;
+import opennlp.tools.ml.model.EventStream;
+import opennlp.tools.ml.model.MutableContext;
+import opennlp.tools.ml.model.OnePassDataIndexer;
+import opennlp.tools.ml.model.Prior;
+import opennlp.tools.ml.model.UniformPrior;
/**
@@ -230,7 +230,7 @@ class GISTrainer {
* @param iterations The number of GIS iterations to perform.
* @param di The data indexer used to compress events in memory.
* @return The newly trained model, which can be used immediately or saved
- * to disk using an opennlp.maxent.io.GISModelWriter object.
+ * to disk using an opennlp.tools.ml.maxent.io.GISModelWriter object.
*/
public GISModel trainModel(int iterations, DataIndexer di, int cutoff) {
return trainModel(iterations,di,new UniformPrior(),cutoff,1);
@@ -243,7 +243,7 @@ class GISTrainer {
* @param di The data indexer used to compress events in memory.
* @param modelPrior The prior distribution used to train this model.
* @return The newly trained model, which can be used immediately or saved
- * to disk using an opennlp.maxent.io.GISModelWriter object.
+ * to disk using an opennlp.tools.ml.maxent.io.GISModelWriter object.
*/
public GISModel trainModel(int iterations, DataIndexer di, Prior modelPrior, int cutoff, int threads) {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/IntegerPool.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/IntegerPool.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/IntegerPool.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/IntegerPool.java Fri May 31 16:23:35 2013
@@ -18,7 +18,7 @@
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
/**
* A pool of read-only, unsigned Integer objects within a fixed,
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/Main.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/Main.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/Main.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/Main.java Fri May 31 16:23:35 2013
@@ -17,10 +17,10 @@
* under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
/**
- * Main file for opennlp.maxent. Right now just tells the user that
+ * Main file for opennlp.tools.ml.maxent. Right now just tells the user that
* the executable jar doesn't actually execute anything but the
* message telling the user that the jar doesn't execute anything
* but...
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelApplier.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelApplier.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelApplier.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelApplier.java Fri May 31 16:23:35 2013
@@ -17,17 +17,17 @@
* under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
import java.io.File;
import java.io.FileReader;
import java.text.DecimalFormat;
-import opennlp.model.Event;
-import opennlp.model.EventStream;
-import opennlp.model.GenericModelReader;
-import opennlp.model.MaxentModel;
-import opennlp.model.RealValueFileEventStream;
+import opennlp.tools.ml.model.Event;
+import opennlp.tools.ml.model.EventStream;
+import opennlp.tools.ml.model.GenericModelReader;
+import opennlp.tools.ml.model.MaxentModel;
+import opennlp.tools.ml.model.RealValueFileEventStream;
/**
* Test the model on some input.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelDomain.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelDomain.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelDomain.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelDomain.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
/**
* A simple interface that represents a domain to which a particular maxent
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelReplacementManager.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelReplacementManager.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelReplacementManager.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelReplacementManager.java Fri May 31 16:23:35 2013
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
-import opennlp.model.MaxentModel;
+import opennlp.tools.ml.model.MaxentModel;
/**
* A object which can be used to ensure that a Maxent application can swap the
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelSetter.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelSetter.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelSetter.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelSetter.java Fri May 31 16:23:35 2013
@@ -17,9 +17,9 @@
* under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
-import opennlp.model.MaxentModel;
+import opennlp.tools.ml.model.MaxentModel;
/**
* A object to facilitate the resetting of a MaxentModel variable to a
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelTrainer.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelTrainer.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelTrainer.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/ModelTrainer.java Fri May 31 16:23:35 2013
@@ -17,19 +17,19 @@
* under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
import java.io.File;
import java.io.FileReader;
-import opennlp.maxent.io.SuffixSensitiveGISModelWriter;
-import opennlp.model.AbstractModel;
-import opennlp.model.AbstractModelWriter;
-import opennlp.model.EventStream;
-import opennlp.model.OnePassDataIndexer;
-import opennlp.model.OnePassRealValueDataIndexer;
-import opennlp.perceptron.PerceptronTrainer;
-import opennlp.perceptron.SuffixSensitivePerceptronModelWriter;
+import opennlp.tools.ml.maxent.io.SuffixSensitiveGISModelWriter;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.AbstractModelWriter;
+import opennlp.tools.ml.model.EventStream;
+import opennlp.tools.ml.model.OnePassDataIndexer;
+import opennlp.tools.ml.model.OnePassRealValueDataIndexer;
+import opennlp.tools.ml.perceptron.PerceptronTrainer;
+import opennlp.tools.ml.perceptron.SuffixSensitivePerceptronModelWriter;
/**
* Main class which calls the GIS procedure after building the EventStream from
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/PlainTextByLineDataStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/PlainTextByLineDataStream.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/PlainTextByLineDataStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/PlainTextByLineDataStream.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
import java.io.BufferedReader;
import java.io.IOException;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/RealBasicEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/RealBasicEventStream.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/RealBasicEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/RealBasicEventStream.java Fri May 31 16:23:35 2013
@@ -17,12 +17,12 @@
* under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
-import opennlp.model.AbstractEventStream;
-import opennlp.model.Event;
-import opennlp.model.EventStream;
-import opennlp.model.RealValueFileEventStream;
+import opennlp.tools.ml.model.AbstractEventStream;
+import opennlp.tools.ml.model.Event;
+import opennlp.tools.ml.model.EventStream;
+import opennlp.tools.ml.model.RealValueFileEventStream;
public class RealBasicEventStream extends AbstractEventStream {
ContextGenerator cg = new BasicContextGenerator();
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/TrainEval.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/TrainEval.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/TrainEval.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/TrainEval.java Fri May 31 16:23:35 2013
@@ -17,14 +17,14 @@
* under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
import java.io.IOException;
import java.io.Reader;
-import opennlp.model.Event;
-import opennlp.model.EventStream;
-import opennlp.model.MaxentModel;
+import opennlp.tools.ml.model.Event;
+import opennlp.tools.ml.model.EventStream;
+import opennlp.tools.ml.model.MaxentModel;
/**
* Trains or evaluates maxent components which have implemented the Evalable
@@ -105,7 +105,7 @@ public class TrainEval {
//
// int lastIndex = g.getOptind();
// if (lastIndex >= args.length) {
-// System.out.println("This is a usage message from opennlp.maxent.TrainEval. You have called the training procedure for a maxent application with the incorrect arguments. These are the options:");
+// System.out.println("This is a usage message from opennlp.tools.ml.maxent.TrainEval. You have called the training procedure for a maxent application with the incorrect arguments. These are the options:");
//
// System.out.println("\nOptions for defining the model location and name:");
// System.out.println(" -d <directoryName>");
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinToAscii.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinToAscii.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinToAscii.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinToAscii.java Fri May 31 16:23:35 2013
@@ -18,7 +18,7 @@
*/
-package opennlp.maxent.io;
+package opennlp.tools.ml.maxent.io;
import java.io.DataInputStream;
import java.io.FileInputStream;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinaryGISModelReader.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinaryGISModelReader.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinaryGISModelReader.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinaryGISModelReader.java Fri May 31 16:23:35 2013
@@ -17,11 +17,11 @@
* under the License.
*/
-package opennlp.maxent.io;
+package opennlp.tools.ml.maxent.io;
import java.io.DataInputStream;
-import opennlp.model.BinaryFileDataReader;
+import opennlp.tools.ml.model.BinaryFileDataReader;
/**
* A reader for GIS models stored in binary format.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinaryGISModelWriter.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinaryGISModelWriter.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinaryGISModelWriter.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinaryGISModelWriter.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.maxent.io;
+package opennlp.tools.ml.maxent.io;
import java.io.DataOutputStream;
import java.io.File;
@@ -25,7 +25,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.util.zip.GZIPOutputStream;
-import opennlp.model.AbstractModel;
+import opennlp.tools.ml.model.AbstractModel;
/**
* Model writer that saves models in binary format.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinaryQNModelReader.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinaryQNModelReader.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinaryQNModelReader.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinaryQNModelReader.java Fri May 31 16:23:35 2013
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package opennlp.maxent.io;
+package opennlp.tools.ml.maxent.io;
import java.io.DataInputStream;
-import opennlp.model.BinaryFileDataReader;
+import opennlp.tools.ml.model.BinaryFileDataReader;
/**
* A reader for quasi-newton models stored in binary format.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinaryQNModelWriter.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinaryQNModelWriter.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinaryQNModelWriter.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/BinaryQNModelWriter.java Fri May 31 16:23:35 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package opennlp.maxent.io;
+package opennlp.tools.ml.maxent.io;
import java.io.DataOutputStream;
import java.io.File;
@@ -24,7 +24,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.util.zip.GZIPOutputStream;
-import opennlp.model.AbstractModel;
+import opennlp.tools.ml.model.AbstractModel;
public class BinaryQNModelWriter extends QNModelWriter {
protected DataOutputStream output;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/GISModelReader.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/GISModelReader.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/GISModelReader.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/GISModelReader.java Fri May 31 16:23:35 2013
@@ -17,16 +17,16 @@
* under the License.
*/
-package opennlp.maxent.io;
+package opennlp.tools.ml.maxent.io;
import java.io.File;
import java.io.IOException;
-import opennlp.maxent.GISModel;
-import opennlp.model.AbstractModel;
-import opennlp.model.AbstractModelReader;
-import opennlp.model.Context;
-import opennlp.model.DataReader;
+import opennlp.tools.ml.maxent.GISModel;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.AbstractModelReader;
+import opennlp.tools.ml.model.Context;
+import opennlp.tools.ml.model.DataReader;
/**
* Abstract parent class for readers of GISModels.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/GISModelWriter.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/GISModelWriter.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/GISModelWriter.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/GISModelWriter.java Fri May 31 16:23:35 2013
@@ -17,18 +17,18 @@
* under the License.
*/
-package opennlp.maxent.io;
+package opennlp.tools.ml.maxent.io;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import opennlp.model.AbstractModel;
-import opennlp.model.AbstractModelWriter;
-import opennlp.model.ComparablePredicate;
-import opennlp.model.Context;
-import opennlp.model.IndexHashTable;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.AbstractModelWriter;
+import opennlp.tools.ml.model.ComparablePredicate;
+import opennlp.tools.ml.model.Context;
+import opennlp.tools.ml.model.IndexHashTable;
/**
* Abstract parent class for GISModel writers. It provides the persist method
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectGISModelReader.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectGISModelReader.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectGISModelReader.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectGISModelReader.java Fri May 31 16:23:35 2013
@@ -17,11 +17,11 @@
* under the License.
*/
-package opennlp.maxent.io;
+package opennlp.tools.ml.maxent.io;
import java.io.ObjectInputStream;
-import opennlp.model.ObjectDataReader;
+import opennlp.tools.ml.model.ObjectDataReader;
public class ObjectGISModelReader extends GISModelReader {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectGISModelWriter.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectGISModelWriter.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectGISModelWriter.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectGISModelWriter.java Fri May 31 16:23:35 2013
@@ -17,12 +17,12 @@
* under the License.
*/
-package opennlp.maxent.io;
+package opennlp.tools.ml.maxent.io;
import java.io.IOException;
import java.io.ObjectOutputStream;
-import opennlp.model.AbstractModel;
+import opennlp.tools.ml.model.AbstractModel;
public class ObjectGISModelWriter extends GISModelWriter {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectQNModelReader.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectQNModelReader.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectQNModelReader.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectQNModelReader.java Fri May 31 16:23:35 2013
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package opennlp.maxent.io;
+package opennlp.tools.ml.maxent.io;
import java.io.ObjectInputStream;
-import opennlp.model.ObjectDataReader;
+import opennlp.tools.ml.model.ObjectDataReader;
public class ObjectQNModelReader extends QNModelReader {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectQNModelWriter.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectQNModelWriter.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectQNModelWriter.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/ObjectQNModelWriter.java Fri May 31 16:23:35 2013
@@ -1,4 +1,4 @@
-package opennlp.maxent.io;
+package opennlp.tools.ml.maxent.io;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package opennlp.maxent.io;
import java.io.IOException;
import java.io.ObjectOutputStream;
-import opennlp.model.AbstractModel;
+import opennlp.tools.ml.model.AbstractModel;
public class ObjectQNModelWriter extends QNModelWriter {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/OldFormatGISModelReader.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/OldFormatGISModelReader.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/OldFormatGISModelReader.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/OldFormatGISModelReader.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.maxent.io;
+package opennlp.tools.ml.maxent.io;
import java.io.DataInputStream;
import java.io.File;
@@ -25,8 +25,8 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.util.zip.GZIPInputStream;
-import opennlp.model.AbstractModelReader;
-import opennlp.model.Context;
+import opennlp.tools.ml.model.AbstractModelReader;
+import opennlp.tools.ml.model.Context;
/**
* A reader for GIS models stored in the format used in v1.0 of Maxent. It
@@ -88,7 +88,7 @@ public class OldFormatGISModelReader ext
* Convert a model created with Maxent 1.0 to a format used with Maxent 1.2.
*
* <p>
- * Usage: java opennlp.maxent.io.OldFormatGISModelReader model_name_prefix
+ * Usage: java opennlp.tools.ml.maxent.io.OldFormatGISModelReader model_name_prefix
* (new_model_name)");
*
* <p>
@@ -98,7 +98,7 @@ public class OldFormatGISModelReader ext
public static void main(String[] args) throws IOException {
if (args.length < 1) {
System.out
- .println("Usage: java opennlp.maxent.io.OldFormatGISModelReader model_name_prefix (new_model_name)");
+ .println("Usage: java opennlp.tools.ml.maxent.io.OldFormatGISModelReader model_name_prefix (new_model_name)");
System.exit(0);
}
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PlainTextGISModelReader.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PlainTextGISModelReader.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PlainTextGISModelReader.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PlainTextGISModelReader.java Fri May 31 16:23:35 2013
@@ -17,13 +17,13 @@
* under the License.
*/
-package opennlp.maxent.io;
+package opennlp.tools.ml.maxent.io;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
-import opennlp.model.PlainTextFileDataReader;
+import opennlp.tools.ml.model.PlainTextFileDataReader;
/**
* A reader for GIS models stored in plain text format.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PlainTextGISModelWriter.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PlainTextGISModelWriter.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PlainTextGISModelWriter.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PlainTextGISModelWriter.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.maxent.io;
+package opennlp.tools.ml.maxent.io;
import java.io.BufferedWriter;
import java.io.File;
@@ -28,7 +28,7 @@ import java.io.IOException;
import java.io.OutputStreamWriter;
import java.util.zip.GZIPOutputStream;
-import opennlp.model.AbstractModel;
+import opennlp.tools.ml.model.AbstractModel;
/**
* Model writer that saves models in plain text format.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PooledGISModelReader.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PooledGISModelReader.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PooledGISModelReader.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/PooledGISModelReader.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.maxent.io;
+package opennlp.tools.ml.maxent.io;
import java.io.File;
import java.io.IOException;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/QNModelReader.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/QNModelReader.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/QNModelReader.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/QNModelReader.java Fri May 31 16:23:35 2013
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package opennlp.maxent.io;
+package opennlp.tools.ml.maxent.io;
import java.io.File;
import java.io.IOException;
-import opennlp.maxent.quasinewton.QNModel;
-import opennlp.model.AbstractModel;
-import opennlp.model.AbstractModelReader;
-import opennlp.model.Context;
-import opennlp.model.DataReader;
+import opennlp.tools.ml.maxent.quasinewton.QNModel;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.AbstractModelReader;
+import opennlp.tools.ml.model.Context;
+import opennlp.tools.ml.model.DataReader;
public class QNModelReader extends AbstractModelReader {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/QNModelWriter.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/QNModelWriter.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/QNModelWriter.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/QNModelWriter.java Fri May 31 16:23:35 2013
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package opennlp.maxent.io;
+package opennlp.tools.ml.maxent.io;
import java.io.IOException;
-import opennlp.maxent.quasinewton.QNModel;
-import opennlp.model.AbstractModel;
-import opennlp.model.AbstractModelWriter;
-import opennlp.model.Context;
-import opennlp.model.IndexHashTable;
+import opennlp.tools.ml.maxent.quasinewton.QNModel;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.AbstractModelWriter;
+import opennlp.tools.ml.model.Context;
+import opennlp.tools.ml.model.IndexHashTable;
public abstract class QNModelWriter extends AbstractModelWriter {
protected String[] outcomeNames;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/SuffixSensitiveGISModelReader.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/SuffixSensitiveGISModelReader.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/SuffixSensitiveGISModelReader.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/SuffixSensitiveGISModelReader.java Fri May 31 16:23:35 2013
@@ -17,12 +17,12 @@
* under the License.
*/
-package opennlp.maxent.io;
+package opennlp.tools.ml.maxent.io;
import java.io.File;
import java.io.IOException;
-import opennlp.model.AbstractModel;
+import opennlp.tools.ml.model.AbstractModel;
/**
* A reader for GIS models which inspects the filename and invokes the
@@ -58,7 +58,7 @@ public class SuffixSensitiveGISModelRead
* To convert between different formats of the new style.
*
* <p>
- * java opennlp.maxent.io.SuffixSensitiveGISModelReader old_model_name
+ * java opennlp.tools.ml.maxent.io.SuffixSensitiveGISModelReader old_model_name
* new_model_name
*
* <p>
@@ -66,7 +66,7 @@ public class SuffixSensitiveGISModelRead
* in gzipped binary format) to one in (unzipped) text format:
*
* <p>
- * java opennlp.maxent.io.SuffixSensitiveGISModelReader model.bin.gz model.txt
+ * java opennlp.tools.ml.maxent.io.SuffixSensitiveGISModelReader model.bin.gz model.txt
*
* <p>
* This particular example would of course be useful when you generally want
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/SuffixSensitiveGISModelWriter.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/SuffixSensitiveGISModelWriter.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/SuffixSensitiveGISModelWriter.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/io/SuffixSensitiveGISModelWriter.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.maxent.io;
+package opennlp.tools.ml.maxent.io;
import java.io.BufferedWriter;
import java.io.DataOutputStream;
@@ -28,7 +28,7 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.util.zip.GZIPOutputStream;
-import opennlp.model.AbstractModel;
+import opennlp.tools.ml.model.AbstractModel;
/**
* A writer for GIS models which inspects the filename and invokes the
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/ArrayMath.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/ArrayMath.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/ArrayMath.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/ArrayMath.java Fri May 31 16:23:35 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package opennlp.maxent.quasinewton;
+package opennlp.tools.ml.maxent.quasinewton;
/**
* utility class for simple vector arithmetics.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/DifferentiableFunction.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/DifferentiableFunction.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/DifferentiableFunction.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/DifferentiableFunction.java Fri May 31 16:23:35 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package opennlp.maxent.quasinewton;
+package opennlp.tools.ml.maxent.quasinewton;
/**
* interface for a function that can be differentiated once.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/Function.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/Function.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/Function.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/Function.java Fri May 31 16:23:35 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package opennlp.maxent.quasinewton;
+package opennlp.tools.ml.maxent.quasinewton;
/**
* interface for a function.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/LineSearch.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/LineSearch.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/LineSearch.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/LineSearch.java Fri May 31 16:23:35 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package opennlp.maxent.quasinewton;
+package opennlp.tools.ml.maxent.quasinewton;
/**
* class that performs line search.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/LineSearchResult.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/LineSearchResult.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/LineSearchResult.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/LineSearchResult.java Fri May 31 16:23:35 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package opennlp.maxent.quasinewton;
+package opennlp.tools.ml.maxent.quasinewton;
/**
* class to store lineSearch result
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/LogLikelihoodFunction.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/LogLikelihoodFunction.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/LogLikelihoodFunction.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/LogLikelihoodFunction.java Fri May 31 16:23:35 2013
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package opennlp.maxent.quasinewton;
+package opennlp.tools.ml.maxent.quasinewton;
import java.util.ArrayList;
import java.util.Arrays;
-import opennlp.model.DataIndexer;
-import opennlp.model.OnePassRealValueDataIndexer;
+import opennlp.tools.ml.model.DataIndexer;
+import opennlp.tools.ml.model.OnePassRealValueDataIndexer;
/**
* Evaluate log likelihood and its gradient from DataIndexer.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNModel.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNModel.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNModel.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNModel.java Fri May 31 16:23:35 2013
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package opennlp.maxent.quasinewton;
+package opennlp.tools.ml.maxent.quasinewton;
-import opennlp.model.AbstractModel;
-import opennlp.model.Context;
-import opennlp.model.EvalParameters;
-import opennlp.model.UniformPrior;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.Context;
+import opennlp.tools.ml.model.EvalParameters;
+import opennlp.tools.ml.model.UniformPrior;
public class QNModel extends AbstractModel {
private static final double SMOOTHING_VALUE = 0.1;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNTrainer.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNTrainer.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNTrainer.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNTrainer.java Fri May 31 16:23:35 2013
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package opennlp.maxent.quasinewton;
+package opennlp.tools.ml.maxent.quasinewton;
import java.util.Arrays;
-import opennlp.model.DataIndexer;
+import opennlp.tools.ml.model.DataIndexer;
/**
* maxent model trainer using l-bfgs algorithm.