Return-Path: X-Original-To: apmail-incubator-opennlp-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-opennlp-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5E46B7A32 for ; Fri, 23 Dec 2011 14:08:52 +0000 (UTC) Received: (qmail 55656 invoked by uid 500); 23 Dec 2011 14:08:52 -0000 Delivered-To: apmail-incubator-opennlp-commits-archive@incubator.apache.org Received: (qmail 55631 invoked by uid 500); 23 Dec 2011 14:08:52 -0000 Mailing-List: contact opennlp-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: opennlp-dev@incubator.apache.org Delivered-To: mailing list opennlp-commits@incubator.apache.org Received: (qmail 55624 invoked by uid 99); 23 Dec 2011 14:08:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Dec 2011 14:08:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Dec 2011 14:08:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B40EC23888FD; Fri, 23 Dec 2011 14:08:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1222683 [1/2] - in /incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml: maxent/ maxent/io/ model/ perceptron/ Date: Fri, 23 Dec 2011 14:08:14 -0000 To: opennlp-commits@incubator.apache.org From: joern@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111223140818.B40EC23888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: joern Date: Fri Dec 23 14:08:12 2011 New Revision: 1222683 URL: http://svn.apache.org/viewvc?rev=1222683&view=rev Log: OPENNLP-119 Fixed package declarations. Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/BasicContextGenerator.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/BasicEventStream.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/BinToAscii.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ContextGenerator.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/Counter.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/DataStream.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/DomainToModelMap.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/DoubleStringPair.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/Evalable.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/GIS.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/GISModel.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/GISTrainer.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/IntegerPool.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/Main.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelApplier.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelDomain.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelReplacementManager.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelSetter.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelTrainer.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/PlainTextByLineDataStream.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/RealBasicEventStream.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/TrainEval.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/BinToAscii.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/BinaryGISModelReader.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/BinaryGISModelWriter.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/GISModelReader.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/GISModelWriter.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/ObjectGISModelReader.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/ObjectGISModelWriter.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/OldFormatGISModelReader.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/PlainTextGISModelReader.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/PlainTextGISModelWriter.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/PooledGISModelReader.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/SuffixSensitiveGISModelReader.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/SuffixSensitiveGISModelWriter.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractDataIndexer.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractEventStream.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractModel.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractModelReader.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractModelWriter.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/BinaryFileDataReader.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/ComparableEvent.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/ComparablePredicate.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/Context.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/DataIndexer.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/DataReader.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/DynamicEvalParameters.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/EvalParameters.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/Event.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/EventCollector.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/EventCollectorAsStream.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/EventStream.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/FileEventStream.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/GenericModelReader.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/GenericModelWriter.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/HashSumEventStream.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/IndexHashTable.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/ListEventStream.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/MaxentModel.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/MutableContext.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/ObjectDataReader.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/OnePassDataIndexer.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/OnePassRealValueDataIndexer.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/PlainTextFileDataReader.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/Prior.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/RealValueFileEventStream.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/Sequence.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/SequenceStream.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/SequenceStreamEventStream.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/TrainUtil.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/TwoPassDataIndexer.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/UniformPrior.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/BinaryPerceptronModelReader.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/BinaryPerceptronModelWriter.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PerceptronModel.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PerceptronModelReader.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PerceptronModelWriter.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PerceptronTrainer.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PlainTextPerceptronModelReader.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PlainTextPerceptronModelWriter.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/SimplePerceptronSequenceTrainer.java incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/SuffixSensitivePerceptronModelWriter.java Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/BasicContextGenerator.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/BasicContextGenerator.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/BasicContextGenerator.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/BasicContextGenerator.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.maxent; +package org.apache.opennlp.ml.maxent; /** Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/BasicEventStream.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/BasicEventStream.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/BasicEventStream.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/BasicEventStream.java Fri Dec 23 14:08:12 2011 @@ -17,10 +17,10 @@ * under the License. */ -package opennlp.maxent; +package org.apache.opennlp.ml.maxent; -import opennlp.model.AbstractEventStream; -import opennlp.model.Event; +import org.apache.opennlp.ml.model.AbstractEventStream; +import org.apache.opennlp.ml.model.Event; /** * A object which can deliver a stream of training events assuming Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/BinToAscii.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/BinToAscii.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/BinToAscii.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/BinToAscii.java Fri Dec 23 14:08:12 2011 @@ -18,7 +18,7 @@ */ -package opennlp.maxent; +package org.apache.opennlp.ml.maxent; import java.io.DataInputStream; import java.io.FileInputStream; Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ContextGenerator.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ContextGenerator.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ContextGenerator.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ContextGenerator.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.maxent; +package org.apache.opennlp.ml.maxent; /** * Generate contexts for maxent decisions. Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/Counter.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/Counter.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/Counter.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/Counter.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.maxent; +package org.apache.opennlp.ml.maxent; /** * A simple class which is essentially an Integer which is mutable via Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/DataStream.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/DataStream.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/DataStream.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/DataStream.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.maxent; +package org.apache.opennlp.ml.maxent; /** * A interface for objects which can deliver a stream of training data to be Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/DomainToModelMap.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/DomainToModelMap.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/DomainToModelMap.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/DomainToModelMap.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.maxent; +package org.apache.opennlp.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 org.apache.opennlp.ml.model.MaxentModel; /** * A class which stores a mapping from ModelDomain objects to MaxentModels. Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/DoubleStringPair.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/DoubleStringPair.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/DoubleStringPair.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/DoubleStringPair.java Fri Dec 23 14:08:12 2011 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package opennlp.maxent; +package org.apache.opennlp.ml.maxent; public class DoubleStringPair implements Comparable { Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/Evalable.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/Evalable.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/Evalable.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/Evalable.java Fri Dec 23 14:08:12 2011 @@ -17,12 +17,12 @@ * under the License. */ -package opennlp.maxent; +package org.apache.opennlp.ml.maxent; import java.io.Reader; -import opennlp.model.EventCollector; -import opennlp.model.MaxentModel; +import org.apache.opennlp.ml.model.EventCollector; +import org.apache.opennlp.ml.model.MaxentModel; /** * Interface for components which use maximum entropy models and can evaluate Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/GIS.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/GIS.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/GIS.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/GIS.java Fri Dec 23 14:08:12 2011 @@ -17,14 +17,14 @@ * under the License. */ -package opennlp.maxent; +package org.apache.opennlp.ml.maxent; import java.io.IOException; -import opennlp.model.DataIndexer; -import opennlp.model.EventStream; -import opennlp.model.Prior; -import opennlp.model.UniformPrior; +import org.apache.opennlp.ml.model.DataIndexer; +import org.apache.opennlp.ml.model.EventStream; +import org.apache.opennlp.ml.model.Prior; +import org.apache.opennlp.ml.model.UniformPrior; /** * A Factory class which uses instances of GISTrainer to create and train Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/GISModel.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/GISModel.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/GISModel.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/GISModel.java Fri Dec 23 14:08:12 2011 @@ -17,18 +17,19 @@ * under the License. */ -package opennlp.maxent; +package org.apache.opennlp.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 org.apache.opennlp.ml.model.Context; + +import org.apache.opennlp.ml.model.AbstractModel; +import org.apache.opennlp.ml.model.EvalParameters; +import org.apache.opennlp.ml.model.Prior; +import org.apache.opennlp.ml.model.UniformPrior; /** * A maximum entropy model which has been trained using the Generalized @@ -218,7 +219,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 org.apache.opennlp.ml.maxent.io.SuffixSensitiveGISModelReader( new File(args[0])).getModel(); BufferedReader in = new BufferedReader(new InputStreamReader(System.in)); DecimalFormat df = new java.text.DecimalFormat(".###"); Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/GISTrainer.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/GISTrainer.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/GISTrainer.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/GISTrainer.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.maxent; +package org.apache.opennlp.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 org.apache.opennlp.ml.model.DataIndexer; +import org.apache.opennlp.ml.model.EvalParameters; +import org.apache.opennlp.ml.model.EventStream; +import org.apache.opennlp.ml.model.MutableContext; +import org.apache.opennlp.ml.model.OnePassDataIndexer; +import org.apache.opennlp.ml.model.Prior; +import org.apache.opennlp.ml.model.UniformPrior; /** Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/IntegerPool.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/IntegerPool.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/IntegerPool.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/IntegerPool.java Fri Dec 23 14:08:12 2011 @@ -18,7 +18,7 @@ */ -package opennlp.maxent; +package org.apache.opennlp.ml.maxent; /** * A pool of read-only, unsigned Integer objects within a fixed, Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/Main.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/Main.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/Main.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/Main.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.maxent; +package org.apache.opennlp.ml.maxent; /** * Main file for opennlp.maxent. Right now just tells the user that Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelApplier.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelApplier.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelApplier.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelApplier.java Fri Dec 23 14:08:12 2011 @@ -17,17 +17,17 @@ * under the License. */ -package opennlp.maxent; +package org.apache.opennlp.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 org.apache.opennlp.ml.model.Event; +import org.apache.opennlp.ml.model.EventStream; +import org.apache.opennlp.ml.model.GenericModelReader; +import org.apache.opennlp.ml.model.MaxentModel; +import org.apache.opennlp.ml.model.RealValueFileEventStream; /** * Test the model on some input. Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelDomain.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelDomain.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelDomain.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelDomain.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.maxent; +package org.apache.opennlp.ml.maxent; /** * A simple interface that represents a domain to which a particular maxent Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelReplacementManager.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelReplacementManager.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelReplacementManager.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelReplacementManager.java Fri Dec 23 14:08:12 2011 @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package opennlp.maxent; +package org.apache.opennlp.ml.maxent; -import opennlp.model.MaxentModel; +import org.apache.opennlp.ml.model.MaxentModel; /** * A object which can be used to ensure that a Maxent application can swap the Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelSetter.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelSetter.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelSetter.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelSetter.java Fri Dec 23 14:08:12 2011 @@ -17,9 +17,9 @@ * under the License. */ -package opennlp.maxent; +package org.apache.opennlp.ml.maxent; -import opennlp.model.MaxentModel; +import org.apache.opennlp.ml.model.MaxentModel; /** * A object to facilitate the resetting of a MaxentModel variable to a Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelTrainer.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelTrainer.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelTrainer.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/ModelTrainer.java Fri Dec 23 14:08:12 2011 @@ -17,20 +17,20 @@ * under the License. */ -package opennlp.maxent; +package org.apache.opennlp.ml.maxent; import java.io.File; import java.io.FileReader; -import opennlp.maxent.io.GISModelWriter; -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 org.apache.opennlp.ml.maxent.io.GISModelWriter; +import org.apache.opennlp.ml.maxent.io.SuffixSensitiveGISModelWriter; +import org.apache.opennlp.ml.model.AbstractModel; +import org.apache.opennlp.ml.model.AbstractModelWriter; +import org.apache.opennlp.ml.model.EventStream; +import org.apache.opennlp.ml.model.OnePassDataIndexer; +import org.apache.opennlp.ml.model.OnePassRealValueDataIndexer; +import org.apache.opennlp.ml.perceptron.PerceptronTrainer; +import org.apache.opennlp.ml.perceptron.SuffixSensitivePerceptronModelWriter; /** * Main class which calls the GIS procedure after building the EventStream from Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/PlainTextByLineDataStream.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/PlainTextByLineDataStream.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/PlainTextByLineDataStream.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/PlainTextByLineDataStream.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.maxent; +package org.apache.opennlp.ml.maxent; import java.io.BufferedReader; import java.io.IOException; Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/RealBasicEventStream.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/RealBasicEventStream.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/RealBasicEventStream.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/RealBasicEventStream.java Fri Dec 23 14:08:12 2011 @@ -17,12 +17,12 @@ * under the License. */ -package opennlp.maxent; +package org.apache.opennlp.ml.maxent; -import opennlp.model.AbstractEventStream; -import opennlp.model.Event; -import opennlp.model.EventStream; -import opennlp.model.RealValueFileEventStream; +import org.apache.opennlp.ml.model.AbstractEventStream; +import org.apache.opennlp.ml.model.Event; +import org.apache.opennlp.ml.model.EventStream; +import org.apache.opennlp.ml.model.RealValueFileEventStream; public class RealBasicEventStream extends AbstractEventStream { ContextGenerator cg = new BasicContextGenerator(); Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/TrainEval.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/TrainEval.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/TrainEval.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/TrainEval.java Fri Dec 23 14:08:12 2011 @@ -17,14 +17,14 @@ * under the License. */ -package opennlp.maxent; +package org.apache.opennlp.ml.maxent; import java.io.IOException; import java.io.Reader; -import opennlp.model.Event; -import opennlp.model.EventStream; -import opennlp.model.MaxentModel; +import org.apache.opennlp.ml.model.Event; +import org.apache.opennlp.ml.model.EventStream; +import org.apache.opennlp.ml.model.MaxentModel; /** * Trains or evaluates maxent components which have implemented the Evalable Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/BinToAscii.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/BinToAscii.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/BinToAscii.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/BinToAscii.java Fri Dec 23 14:08:12 2011 @@ -18,7 +18,7 @@ */ -package opennlp.maxent.io; +package org.apache.opennlp.ml.maxent.io; import java.io.DataInputStream; import java.io.FileInputStream; Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/BinaryGISModelReader.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/BinaryGISModelReader.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/BinaryGISModelReader.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/BinaryGISModelReader.java Fri Dec 23 14:08:12 2011 @@ -17,11 +17,11 @@ * under the License. */ -package opennlp.maxent.io; +package org.apache.opennlp.ml.maxent.io; import java.io.DataInputStream; -import opennlp.model.BinaryFileDataReader; +import org.apache.opennlp.ml.model.BinaryFileDataReader; /** * A reader for GIS models stored in binary format. Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/BinaryGISModelWriter.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/BinaryGISModelWriter.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/BinaryGISModelWriter.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/BinaryGISModelWriter.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.maxent.io; +package org.apache.opennlp.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 org.apache.opennlp.ml.model.AbstractModel; /** * Model writer that saves models in binary format. Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/GISModelReader.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/GISModelReader.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/GISModelReader.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/GISModelReader.java Fri Dec 23 14:08:12 2011 @@ -17,16 +17,17 @@ * under the License. */ -package opennlp.maxent.io; +package org.apache.opennlp.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 org.apache.opennlp.ml.model.Context; + +import org.apache.opennlp.ml.maxent.GISModel; +import org.apache.opennlp.ml.model.AbstractModel; +import org.apache.opennlp.ml.model.AbstractModelReader; +import org.apache.opennlp.ml.model.DataReader; /** * Abstract parent class for readers of GISModels. Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/GISModelWriter.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/GISModelWriter.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/GISModelWriter.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/GISModelWriter.java Fri Dec 23 14:08:12 2011 @@ -17,18 +17,19 @@ * under the License. */ -package opennlp.maxent.io; +package org.apache.opennlp.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 org.apache.opennlp.ml.model.Context; + +import org.apache.opennlp.ml.model.AbstractModel; +import org.apache.opennlp.ml.model.AbstractModelWriter; +import org.apache.opennlp.ml.model.ComparablePredicate; +import org.apache.opennlp.ml.model.IndexHashTable; /** * Abstract parent class for GISModel writers. It provides the persist method Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/ObjectGISModelReader.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/ObjectGISModelReader.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/ObjectGISModelReader.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/ObjectGISModelReader.java Fri Dec 23 14:08:12 2011 @@ -17,11 +17,11 @@ * under the License. */ -package opennlp.maxent.io; +package org.apache.opennlp.ml.maxent.io; import java.io.ObjectInputStream; -import opennlp.model.ObjectDataReader; +import org.apache.opennlp.ml.model.ObjectDataReader; public class ObjectGISModelReader extends GISModelReader { Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/ObjectGISModelWriter.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/ObjectGISModelWriter.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/ObjectGISModelWriter.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/ObjectGISModelWriter.java Fri Dec 23 14:08:12 2011 @@ -17,12 +17,12 @@ * under the License. */ -package opennlp.maxent.io; +package org.apache.opennlp.ml.maxent.io; import java.io.IOException; import java.io.ObjectOutputStream; -import opennlp.model.AbstractModel; +import org.apache.opennlp.ml.model.AbstractModel; public class ObjectGISModelWriter extends GISModelWriter { Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/OldFormatGISModelReader.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/OldFormatGISModelReader.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/OldFormatGISModelReader.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/OldFormatGISModelReader.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.maxent.io; +package org.apache.opennlp.ml.maxent.io; import java.io.DataInputStream; import java.io.File; @@ -25,8 +25,9 @@ import java.io.FileInputStream; import java.io.IOException; import java.util.zip.GZIPInputStream; -import opennlp.model.AbstractModelReader; -import opennlp.model.Context; +import org.apache.opennlp.ml.model.Context; + +import org.apache.opennlp.ml.model.AbstractModelReader; /** * A reader for GIS models stored in the format used in v1.0 of Maxent. It Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/PlainTextGISModelReader.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/PlainTextGISModelReader.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/PlainTextGISModelReader.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/PlainTextGISModelReader.java Fri Dec 23 14:08:12 2011 @@ -17,13 +17,13 @@ * under the License. */ -package opennlp.maxent.io; +package org.apache.opennlp.ml.maxent.io; import java.io.BufferedReader; import java.io.File; import java.io.IOException; -import opennlp.model.PlainTextFileDataReader; +import org.apache.opennlp.ml.model.PlainTextFileDataReader; /** * A reader for GIS models stored in plain text format. Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/PlainTextGISModelWriter.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/PlainTextGISModelWriter.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/PlainTextGISModelWriter.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/PlainTextGISModelWriter.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.maxent.io; +package org.apache.opennlp.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 org.apache.opennlp.ml.model.AbstractModel; /** * Model writer that saves models in plain text format. Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/PooledGISModelReader.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/PooledGISModelReader.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/PooledGISModelReader.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/PooledGISModelReader.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.maxent.io; +package org.apache.opennlp.ml.maxent.io; import java.io.File; import java.io.IOException; Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/SuffixSensitiveGISModelReader.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/SuffixSensitiveGISModelReader.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/SuffixSensitiveGISModelReader.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/SuffixSensitiveGISModelReader.java Fri Dec 23 14:08:12 2011 @@ -17,12 +17,12 @@ * under the License. */ -package opennlp.maxent.io; +package org.apache.opennlp.ml.maxent.io; import java.io.File; import java.io.IOException; -import opennlp.model.AbstractModel; +import org.apache.opennlp.ml.model.AbstractModel; /** * A reader for GIS models which inspects the filename and invokes the Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/SuffixSensitiveGISModelWriter.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/SuffixSensitiveGISModelWriter.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/SuffixSensitiveGISModelWriter.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/maxent/io/SuffixSensitiveGISModelWriter.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.maxent.io; +package org.apache.opennlp.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 org.apache.opennlp.ml.model.AbstractModel; /** * A writer for GIS models which inspects the filename and invokes the Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractDataIndexer.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractDataIndexer.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractDataIndexer.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractDataIndexer.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.util.Collections; import java.util.List; Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractEventStream.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractEventStream.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractEventStream.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractEventStream.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; public abstract class AbstractEventStream implements EventStream { Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractModel.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractModel.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractModel.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractModel.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.text.DecimalFormat; Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractModelReader.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractModelReader.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractModelReader.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractModelReader.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.io.File; import java.io.FileInputStream; Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractModelWriter.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractModelWriter.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractModelWriter.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/AbstractModelWriter.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; public abstract class AbstractModelWriter { Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/BinaryFileDataReader.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/BinaryFileDataReader.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/BinaryFileDataReader.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/BinaryFileDataReader.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.io.BufferedInputStream; import java.io.DataInputStream; Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/ComparableEvent.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/ComparableEvent.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/ComparableEvent.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/ComparableEvent.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.util.Arrays; Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/ComparablePredicate.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/ComparablePredicate.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/ComparablePredicate.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/ComparablePredicate.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; /** * A maxent predicate representation which we can use to sort based on the Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/Context.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/Context.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/Context.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/Context.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; /** * Class which associates a real valued parameter or expected value with a particular contextual Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/DataIndexer.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/DataIndexer.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/DataIndexer.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/DataIndexer.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; /** Object which compresses events in memory and performs feature selection. */ Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/DataReader.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/DataReader.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/DataReader.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/DataReader.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.io.IOException; Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/DynamicEvalParameters.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/DynamicEvalParameters.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/DynamicEvalParameters.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/DynamicEvalParameters.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.util.List; Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/EvalParameters.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/EvalParameters.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/EvalParameters.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/EvalParameters.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; /** * This class encapsulates the varibales used in producing probabilities from a model Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/Event.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/Event.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/Event.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/Event.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; /** Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/EventCollector.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/EventCollector.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/EventCollector.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/EventCollector.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; /** * An interface for objects which read events during training. Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/EventCollectorAsStream.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/EventCollectorAsStream.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/EventCollectorAsStream.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/EventCollectorAsStream.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; /** * A wrapper to turn EventCollectors created for Maxent 1.0 into EventStreams Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/EventStream.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/EventStream.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/EventStream.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/EventStream.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.io.IOException; Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/FileEventStream.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/FileEventStream.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/FileEventStream.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/FileEventStream.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.io.BufferedReader; import java.io.File; @@ -27,8 +27,8 @@ import java.io.IOException; import java.io.InputStreamReader; import java.util.StringTokenizer; -import opennlp.maxent.GIS; -import opennlp.maxent.io.SuffixSensitiveGISModelWriter; +import org.apache.opennlp.ml.maxent.GIS; +import org.apache.opennlp.ml.maxent.io.SuffixSensitiveGISModelWriter; /** * Class for using a file of events as an event stream. The format of the file is one event perline with Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/GenericModelReader.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/GenericModelReader.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/GenericModelReader.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/GenericModelReader.java Fri Dec 23 14:08:12 2011 @@ -17,13 +17,13 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.io.File; import java.io.IOException; -import opennlp.maxent.io.GISModelReader; -import opennlp.perceptron.PerceptronModelReader; +import org.apache.opennlp.ml.maxent.io.GISModelReader; +import org.apache.opennlp.ml.perceptron.PerceptronModelReader; public class GenericModelReader extends AbstractModelReader { Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/GenericModelWriter.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/GenericModelWriter.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/GenericModelWriter.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/GenericModelWriter.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.io.BufferedWriter; import java.io.DataOutputStream; @@ -28,11 +28,11 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.util.zip.GZIPOutputStream; -import opennlp.maxent.io.BinaryGISModelWriter; -import opennlp.maxent.io.PlainTextGISModelWriter; -import opennlp.model.AbstractModel.ModelType; -import opennlp.perceptron.BinaryPerceptronModelWriter; -import opennlp.perceptron.PlainTextPerceptronModelWriter; +import org.apache.opennlp.ml.maxent.io.BinaryGISModelWriter; +import org.apache.opennlp.ml.maxent.io.PlainTextGISModelWriter; +import org.apache.opennlp.ml.model.AbstractModel.ModelType; +import org.apache.opennlp.ml.perceptron.BinaryPerceptronModelWriter; +import org.apache.opennlp.ml.perceptron.PlainTextPerceptronModelWriter; public class GenericModelWriter extends AbstractModelWriter { Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/HashSumEventStream.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/HashSumEventStream.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/HashSumEventStream.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/HashSumEventStream.java Fri Dec 23 14:08:12 2011 @@ -15,7 +15,7 @@ * limitations under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -23,8 +23,8 @@ import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import opennlp.model.Event; -import opennlp.model.EventStream; +import org.apache.opennlp.ml.model.Event; +import org.apache.opennlp.ml.model.EventStream; public class HashSumEventStream implements EventStream { Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/IndexHashTable.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/IndexHashTable.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/IndexHashTable.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/IndexHashTable.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; /** * The {@link IndexHashTable} is a hash table which maps entries Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/ListEventStream.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/ListEventStream.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/ListEventStream.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/ListEventStream.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.util.List; Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/MaxentModel.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/MaxentModel.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/MaxentModel.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/MaxentModel.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; /** * Interface for maximum entropy models. Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/MutableContext.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/MutableContext.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/MutableContext.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/MutableContext.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.util.Arrays; Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/ObjectDataReader.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/ObjectDataReader.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/ObjectDataReader.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/ObjectDataReader.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.io.IOException; import java.io.ObjectInputStream; Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/OnePassDataIndexer.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/OnePassDataIndexer.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/OnePassDataIndexer.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/OnePassDataIndexer.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.io.IOException; import java.util.ArrayList; Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/OnePassRealValueDataIndexer.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/OnePassRealValueDataIndexer.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/OnePassRealValueDataIndexer.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/OnePassRealValueDataIndexer.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.io.IOException; import java.util.ArrayList; Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/PlainTextFileDataReader.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/PlainTextFileDataReader.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/PlainTextFileDataReader.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/PlainTextFileDataReader.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.io.BufferedInputStream; import java.io.BufferedReader; Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/Prior.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/Prior.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/Prior.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/Prior.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; /** * This interface allows one to implement a prior distribution for use in Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/RealValueFileEventStream.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/RealValueFileEventStream.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/RealValueFileEventStream.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/RealValueFileEventStream.java Fri Dec 23 14:08:12 2011 @@ -17,13 +17,13 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.io.File; import java.io.IOException; -import opennlp.maxent.GIS; -import opennlp.maxent.io.SuffixSensitiveGISModelWriter; +import org.apache.opennlp.ml.maxent.GIS; +import org.apache.opennlp.ml.maxent.io.SuffixSensitiveGISModelWriter; public class RealValueFileEventStream extends FileEventStream { Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/Sequence.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/Sequence.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/Sequence.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/Sequence.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; /** * Class which models a sequence. Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/SequenceStream.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/SequenceStream.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/SequenceStream.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/SequenceStream.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; /** * Interface for streams of sequences used to train sequence models. Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/SequenceStreamEventStream.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/SequenceStreamEventStream.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/SequenceStreamEventStream.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/SequenceStreamEventStream.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.util.Iterator; Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/TrainUtil.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/TrainUtil.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/TrainUtil.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/TrainUtil.java Fri Dec 23 14:08:12 2011 @@ -17,14 +17,14 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import opennlp.perceptron.PerceptronTrainer; -import opennlp.perceptron.SimplePerceptronSequenceTrainer; +import org.apache.opennlp.ml.perceptron.PerceptronTrainer; +import org.apache.opennlp.ml.perceptron.SimplePerceptronSequenceTrainer; public class TrainUtil { @@ -179,7 +179,7 @@ public class TrainUtil { int threads = getIntParam(trainParams, "Threads", 1, reportMap); - model = opennlp.maxent.GIS.trainModel(iterations, indexer, + model = org.apache.opennlp.ml.maxent.GIS.trainModel(iterations, indexer, true, false, null, 0, threads); } else if (PERCEPTRON_VALUE.equals(algorithmName)) { @@ -195,7 +195,8 @@ public class TrainUtil { double tolerance = getDoubleParam(trainParams, "Tolerance", PerceptronTrainer.TOLERANCE_DEFAULT, reportMap); - opennlp.perceptron.PerceptronTrainer perceptronTrainer = new opennlp.perceptron.PerceptronTrainer(); + org.apache.opennlp.ml.perceptron.PerceptronTrainer perceptronTrainer = + new org.apache.opennlp.ml.perceptron.PerceptronTrainer(); perceptronTrainer.setSkippedAveraging(useSkippedAveraging); if (stepSizeDecrease > 0) Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/TwoPassDataIndexer.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/TwoPassDataIndexer.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/TwoPassDataIndexer.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/TwoPassDataIndexer.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; import java.io.BufferedWriter; import java.io.File; Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/UniformPrior.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/UniformPrior.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/UniformPrior.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/model/UniformPrior.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.model; +package org.apache.opennlp.ml.model; /** * Provide a maximum entropy model with a uniform prior. Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/BinaryPerceptronModelReader.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/BinaryPerceptronModelReader.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/BinaryPerceptronModelReader.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/BinaryPerceptronModelReader.java Fri Dec 23 14:08:12 2011 @@ -17,13 +17,13 @@ * under the License. */ -package opennlp.perceptron; +package org.apache.opennlp.ml.perceptron; import java.io.DataInputStream; import java.io.File; import java.io.IOException; -import opennlp.model.BinaryFileDataReader; +import org.apache.opennlp.ml.model.BinaryFileDataReader; public class BinaryPerceptronModelReader extends PerceptronModelReader { Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/BinaryPerceptronModelWriter.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/BinaryPerceptronModelWriter.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/BinaryPerceptronModelWriter.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/BinaryPerceptronModelWriter.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.perceptron; +package org.apache.opennlp.ml.perceptron; 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 org.apache.opennlp.ml.model.AbstractModel; /** * Model writer that saves models in binary format. Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PerceptronModel.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PerceptronModel.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PerceptronModel.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PerceptronModel.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.perceptron; +package org.apache.opennlp.ml.perceptron; import java.io.BufferedReader; import java.io.File; @@ -25,10 +25,10 @@ import java.io.InputStreamReader; import java.text.DecimalFormat; import java.util.Map; -import opennlp.model.AbstractModel; -import opennlp.model.Context; -import opennlp.model.EvalParameters; -import opennlp.model.IndexHashTable; +import org.apache.opennlp.ml.model.AbstractModel; +import org.apache.opennlp.ml.model.Context; +import org.apache.opennlp.ml.model.EvalParameters; +import org.apache.opennlp.ml.model.IndexHashTable; public class PerceptronModel extends AbstractModel { Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PerceptronModelReader.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PerceptronModelReader.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PerceptronModelReader.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PerceptronModelReader.java Fri Dec 23 14:08:12 2011 @@ -17,15 +17,15 @@ * under the License. */ -package opennlp.perceptron; +package org.apache.opennlp.ml.perceptron; import java.io.File; import java.io.IOException; -import opennlp.model.AbstractModel; -import opennlp.model.AbstractModelReader; -import opennlp.model.Context; -import opennlp.model.DataReader; +import org.apache.opennlp.ml.model.AbstractModel; +import org.apache.opennlp.ml.model.AbstractModelReader; +import org.apache.opennlp.ml.model.Context; +import org.apache.opennlp.ml.model.DataReader; /** * Abstract parent class for readers of Perceptron. Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PerceptronModelWriter.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PerceptronModelWriter.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PerceptronModelWriter.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PerceptronModelWriter.java Fri Dec 23 14:08:12 2011 @@ -17,18 +17,18 @@ * under the License. */ -package opennlp.perceptron; +package org.apache.opennlp.ml.perceptron; 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 org.apache.opennlp.ml.model.AbstractModel; +import org.apache.opennlp.ml.model.AbstractModelWriter; +import org.apache.opennlp.ml.model.ComparablePredicate; +import org.apache.opennlp.ml.model.Context; +import org.apache.opennlp.ml.model.IndexHashTable; /** * Abstract parent class for Perceptron writers. It provides the persist method Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PerceptronTrainer.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PerceptronTrainer.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PerceptronTrainer.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PerceptronTrainer.java Fri Dec 23 14:08:12 2011 @@ -17,12 +17,12 @@ * under the License. */ -package opennlp.perceptron; +package org.apache.opennlp.ml.perceptron; -import opennlp.model.AbstractModel; -import opennlp.model.DataIndexer; -import opennlp.model.EvalParameters; -import opennlp.model.MutableContext; +import org.apache.opennlp.ml.model.AbstractModel; +import org.apache.opennlp.ml.model.DataIndexer; +import org.apache.opennlp.ml.model.EvalParameters; +import org.apache.opennlp.ml.model.MutableContext; /** * Trains models using the perceptron algorithm. Each outcome is represented as Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PlainTextPerceptronModelReader.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PlainTextPerceptronModelReader.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PlainTextPerceptronModelReader.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PlainTextPerceptronModelReader.java Fri Dec 23 14:08:12 2011 @@ -17,13 +17,13 @@ * under the License. */ -package opennlp.perceptron; +package org.apache.opennlp.ml.perceptron; import java.io.BufferedReader; import java.io.File; import java.io.IOException; -import opennlp.model.PlainTextFileDataReader; +import org.apache.opennlp.ml.model.PlainTextFileDataReader; public class PlainTextPerceptronModelReader extends PerceptronModelReader { Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PlainTextPerceptronModelWriter.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PlainTextPerceptronModelWriter.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PlainTextPerceptronModelWriter.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/PlainTextPerceptronModelWriter.java Fri Dec 23 14:08:12 2011 @@ -17,7 +17,7 @@ * under the License. */ -package opennlp.perceptron; +package org.apache.opennlp.ml.perceptron; 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 org.apache.opennlp.ml.model.AbstractModel; /** * Model writer that saves models in plain text format. Modified: incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/SimplePerceptronSequenceTrainer.java URL: http://svn.apache.org/viewvc/incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/SimplePerceptronSequenceTrainer.java?rev=1222683&r1=1222682&r2=1222683&view=diff ============================================================================== --- incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/SimplePerceptronSequenceTrainer.java (original) +++ incubator/opennlp/sandbox/opennlp-ml/src/main/java/org/apache/opennlp/ml/perceptron/SimplePerceptronSequenceTrainer.java Fri Dec 23 14:08:12 2011 @@ -17,22 +17,22 @@ * under the License. */ -package opennlp.perceptron; +package org.apache.opennlp.ml.perceptron; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import opennlp.model.AbstractModel; -import opennlp.model.DataIndexer; -import opennlp.model.Event; -import opennlp.model.IndexHashTable; -import opennlp.model.MutableContext; -import opennlp.model.OnePassDataIndexer; -import opennlp.model.Sequence; -import opennlp.model.SequenceStream; -import opennlp.model.SequenceStreamEventStream; -import opennlp.model.TwoPassDataIndexer; +import org.apache.opennlp.ml.model.AbstractModel; +import org.apache.opennlp.ml.model.DataIndexer; +import org.apache.opennlp.ml.model.Event; +import org.apache.opennlp.ml.model.IndexHashTable; +import org.apache.opennlp.ml.model.MutableContext; +import org.apache.opennlp.ml.model.OnePassDataIndexer; +import org.apache.opennlp.ml.model.Sequence; +import org.apache.opennlp.ml.model.SequenceStream; +import org.apache.opennlp.ml.model.SequenceStreamEventStream; +import org.apache.opennlp.ml.model.TwoPassDataIndexer; /** * Trains models for sequences using the perceptron algorithm. Each outcome is represented as