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 [2/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...
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractDataIndexer.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractDataIndexer.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractDataIndexer.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractDataIndexer.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
import java.util.Collections;
import java.util.List;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractEventStream.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractEventStream.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
public abstract class AbstractEventStream implements EventStream {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModel.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModel.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModel.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModel.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
import java.text.DecimalFormat;
@@ -141,7 +141,7 @@ public abstract class AbstractModel impl
* GISModelWriters. The following values are held in the Object array
* which is returned by this method:
*
- * <li>index 0: opennlp.maxent.Context[] containing the model
+ * <li>index 0: opennlp.tools.ml.maxent.Context[] containing the model
* parameters
* <li>index 1: java.util.Map containing the mapping of model predicates
* to unique integers
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModelReader.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModelReader.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModelReader.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModelReader.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
import java.io.File;
import java.io.FileInputStream;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModelWriter.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModelWriter.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModelWriter.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModelWriter.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
public abstract class AbstractModelWriter {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/BinaryFileDataReader.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/BinaryFileDataReader.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/BinaryFileDataReader.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/BinaryFileDataReader.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
import java.io.BufferedInputStream;
import java.io.DataInputStream;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ComparableEvent.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ComparableEvent.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ComparableEvent.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ComparableEvent.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
import java.util.Arrays;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ComparablePredicate.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ComparablePredicate.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ComparablePredicate.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ComparablePredicate.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
/**
* A maxent predicate representation which we can use to sort based on the
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/Context.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/Context.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/Context.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/Context.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
/**
* Class which associates a real valued parameter or expected value with a particular contextual
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/DataIndexer.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/DataIndexer.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/DataIndexer.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/DataIndexer.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
/** Object which compresses events in memory and performs feature selection.
*/
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/DataReader.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/DataReader.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/DataReader.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/DataReader.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
import java.io.IOException;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/DynamicEvalParameters.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/DynamicEvalParameters.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/DynamicEvalParameters.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/DynamicEvalParameters.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
import java.util.List;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/EvalParameters.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/EvalParameters.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/EvalParameters.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/EvalParameters.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
/**
* This class encapsulates the varibales used in producing probabilities from a model
@@ -59,14 +59,14 @@ public class EvalParameters {
}
/* (non-Javadoc)
- * @see opennlp.model.EvalParameters#getParams()
+ * @see opennlp.tools.ml.model.EvalParameters#getParams()
*/
public Context[] getParams() {
return params;
}
/* (non-Javadoc)
- * @see opennlp.model.EvalParameters#getNumOutcomes()
+ * @see opennlp.tools.ml.model.EvalParameters#getNumOutcomes()
*/
public int getNumOutcomes() {
return numOutcomes;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/Event.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/Event.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/Event.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/Event.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
/**
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/EventCollector.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/EventCollector.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/EventCollector.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/EventCollector.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
/**
* An interface for objects which read events during training.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/EventCollectorAsStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/EventCollectorAsStream.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/EventCollectorAsStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/EventCollectorAsStream.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
/**
* A wrapper to turn EventCollectors created for Maxent 1.0 into EventStreams
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/EventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/EventStream.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/EventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/EventStream.java Fri May 31 16:23:35 2013
@@ -17,14 +17,14 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
import java.io.IOException;
/**
* A object which can deliver a stream of training events for the GIS procedure
* (or others such as IIS if and when they are implemented). EventStreams don't
- * need to use opennlp.maxent.DataStreams, but doing so would provide greater
+ * need to use opennlp.tools.ml.maxent.DataStreams, but doing so would provide greater
* flexibility for producing events from data stored in different formats.
*/
public interface EventStream {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/FileEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/FileEventStream.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/FileEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/FileEventStream.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
import java.io.BufferedReader;
import java.io.Closeable;
@@ -28,8 +28,8 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.util.StringTokenizer;
-import opennlp.maxent.GIS;
-import opennlp.maxent.io.SuffixSensitiveGISModelWriter;
+import opennlp.tools.ml.maxent.GIS;
+import opennlp.tools.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: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/GenericModelReader.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/GenericModelReader.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/GenericModelReader.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/GenericModelReader.java Fri May 31 16:23:35 2013
@@ -17,14 +17,14 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
import java.io.File;
import java.io.IOException;
-import opennlp.maxent.io.GISModelReader;
-import opennlp.maxent.io.QNModelReader;
-import opennlp.perceptron.PerceptronModelReader;
+import opennlp.tools.ml.maxent.io.GISModelReader;
+import opennlp.tools.ml.maxent.io.QNModelReader;
+import opennlp.tools.ml.perceptron.PerceptronModelReader;
public class GenericModelReader extends AbstractModelReader {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/GenericModelWriter.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/GenericModelWriter.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/GenericModelWriter.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/GenericModelWriter.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
import java.io.BufferedWriter;
import java.io.DataOutputStream;
@@ -28,12 +28,12 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.util.zip.GZIPOutputStream;
-import opennlp.maxent.io.BinaryGISModelWriter;
-import opennlp.maxent.io.BinaryQNModelWriter;
-import opennlp.maxent.io.PlainTextGISModelWriter;
-import opennlp.model.AbstractModel.ModelType;
-import opennlp.perceptron.BinaryPerceptronModelWriter;
-import opennlp.perceptron.PlainTextPerceptronModelWriter;
+import opennlp.tools.ml.maxent.io.BinaryGISModelWriter;
+import opennlp.tools.ml.maxent.io.BinaryQNModelWriter;
+import opennlp.tools.ml.maxent.io.PlainTextGISModelWriter;
+import opennlp.tools.ml.model.AbstractModel.ModelType;
+import opennlp.tools.ml.perceptron.BinaryPerceptronModelWriter;
+import opennlp.tools.ml.perceptron.PlainTextPerceptronModelWriter;
public class GenericModelWriter extends AbstractModelWriter {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/HashSumEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/HashSumEventStream.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/HashSumEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/HashSumEventStream.java Fri May 31 16:23:35 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package opennlp.model;
+package opennlp.tools.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 opennlp.tools.ml.model.Event;
+import opennlp.tools.ml.model.EventStream;
public class HashSumEventStream implements EventStream {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/IndexHashTable.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/IndexHashTable.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/IndexHashTable.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/IndexHashTable.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
/**
* The {@link IndexHashTable} is a hash table which maps entries
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ListEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ListEventStream.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ListEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ListEventStream.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
import java.util.List;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/MaxentModel.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/MaxentModel.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/MaxentModel.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/MaxentModel.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
/**
* Interface for maximum entropy models.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/MutableContext.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/MutableContext.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/MutableContext.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/MutableContext.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
import java.util.Arrays;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ObjectDataReader.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ObjectDataReader.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ObjectDataReader.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/ObjectDataReader.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
import java.io.IOException;
import java.io.ObjectInputStream;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/OnePassDataIndexer.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/OnePassDataIndexer.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/OnePassDataIndexer.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/OnePassDataIndexer.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
import java.io.IOException;
import java.util.ArrayList;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/OnePassRealValueDataIndexer.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/OnePassRealValueDataIndexer.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/OnePassRealValueDataIndexer.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/OnePassRealValueDataIndexer.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
import java.io.IOException;
import java.util.ArrayList;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/PlainTextFileDataReader.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/PlainTextFileDataReader.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/PlainTextFileDataReader.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/PlainTextFileDataReader.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/Prior.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/Prior.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/Prior.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/Prior.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
/**
* This interface allows one to implement a prior distribution for use in
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/RealValueFileEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/RealValueFileEventStream.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/RealValueFileEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/RealValueFileEventStream.java Fri May 31 16:23:35 2013
@@ -17,12 +17,12 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
import java.io.File;
import java.io.IOException;
-import opennlp.maxent.GIS;
-import opennlp.maxent.io.SuffixSensitiveGISModelWriter;
+import opennlp.tools.ml.maxent.GIS;
+import opennlp.tools.ml.maxent.io.SuffixSensitiveGISModelWriter;
public class RealValueFileEventStream extends FileEventStream {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/Sequence.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/Sequence.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/Sequence.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/Sequence.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
/**
* Class which models a sequence.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/SequenceStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/SequenceStream.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/SequenceStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/SequenceStream.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
/**
* Interface for streams of sequences used to train sequence models.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/SequenceStreamEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/SequenceStreamEventStream.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/SequenceStreamEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/SequenceStreamEventStream.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
import java.util.Iterator;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/TrainUtil.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/TrainUtil.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/TrainUtil.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/TrainUtil.java Fri May 31 16:23:35 2013
@@ -17,14 +17,14 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
import java.io.IOException;
import java.util.Map;
-import opennlp.maxent.quasinewton.QNTrainer;
-import opennlp.perceptron.PerceptronTrainer;
-import opennlp.perceptron.SimplePerceptronSequenceTrainer;
+import opennlp.tools.ml.maxent.quasinewton.QNTrainer;
+import opennlp.tools.ml.perceptron.PerceptronTrainer;
+import opennlp.tools.ml.perceptron.SimplePerceptronSequenceTrainer;
public class TrainUtil {
@@ -181,7 +181,7 @@ public class TrainUtil {
int threads = getIntParam(trainParams, "Threads", 1, reportMap);
- model = opennlp.maxent.GIS.trainModel(iterations, indexer,
+ model = opennlp.tools.ml.maxent.GIS.trainModel(iterations, indexer,
true, false, null, 0, threads);
}
else if (MAXENT_QN_VALUE.equals(algorithmName)) {
@@ -202,7 +202,7 @@ public class TrainUtil {
double tolerance = getDoubleParam(trainParams, "Tolerance", PerceptronTrainer.TOLERANCE_DEFAULT, reportMap);
- opennlp.perceptron.PerceptronTrainer perceptronTrainer = new opennlp.perceptron.PerceptronTrainer();
+ opennlp.tools.ml.perceptron.PerceptronTrainer perceptronTrainer = new opennlp.tools.ml.perceptron.PerceptronTrainer();
perceptronTrainer.setSkippedAveraging(useSkippedAveraging);
if (stepSizeDecrease > 0)
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/TwoPassDataIndexer.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/TwoPassDataIndexer.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/TwoPassDataIndexer.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/TwoPassDataIndexer.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
import java.io.BufferedWriter;
import java.io.File;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/UniformPrior.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/UniformPrior.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/UniformPrior.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/UniformPrior.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.model;
+package opennlp.tools.ml.model;
/**
* Provide a maximum entropy model with a uniform prior.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/BinaryPerceptronModelReader.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/BinaryPerceptronModelReader.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/BinaryPerceptronModelReader.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/BinaryPerceptronModelReader.java Fri May 31 16:23:35 2013
@@ -17,13 +17,13 @@
* under the License.
*/
-package opennlp.perceptron;
+package opennlp.tools.ml.perceptron;
import java.io.DataInputStream;
import java.io.File;
import java.io.IOException;
-import opennlp.model.BinaryFileDataReader;
+import opennlp.tools.ml.model.BinaryFileDataReader;
public class BinaryPerceptronModelReader extends PerceptronModelReader {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/BinaryPerceptronModelWriter.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/BinaryPerceptronModelWriter.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/BinaryPerceptronModelWriter.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/BinaryPerceptronModelWriter.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.perceptron;
+package opennlp.tools.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 opennlp.tools.ml.model.AbstractModel;
/**
* Model writer that saves models in binary format.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronModel.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronModel.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronModel.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronModel.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.perceptron;
+package opennlp.tools.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 opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.Context;
+import opennlp.tools.ml.model.EvalParameters;
+import opennlp.tools.ml.model.IndexHashTable;
public class PerceptronModel extends AbstractModel {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronModelReader.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronModelReader.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronModelReader.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronModelReader.java Fri May 31 16:23:35 2013
@@ -17,15 +17,15 @@
* under the License.
*/
-package opennlp.perceptron;
+package opennlp.tools.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 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 Perceptron.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronModelWriter.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronModelWriter.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronModelWriter.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronModelWriter.java Fri May 31 16:23:35 2013
@@ -17,18 +17,18 @@
* under the License.
*/
-package opennlp.perceptron;
+package opennlp.tools.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 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 Perceptron writers. It provides the persist method
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronTrainer.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronTrainer.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronTrainer.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronTrainer.java Fri May 31 16:23:35 2013
@@ -17,12 +17,12 @@
* under the License.
*/
-package opennlp.perceptron;
+package opennlp.tools.ml.perceptron;
-import opennlp.model.AbstractModel;
-import opennlp.model.DataIndexer;
-import opennlp.model.EvalParameters;
-import opennlp.model.MutableContext;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.DataIndexer;
+import opennlp.tools.ml.model.EvalParameters;
+import opennlp.tools.ml.model.MutableContext;
/**
* Trains models using the perceptron algorithm. Each outcome is represented as
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PlainTextPerceptronModelReader.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PlainTextPerceptronModelReader.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PlainTextPerceptronModelReader.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PlainTextPerceptronModelReader.java Fri May 31 16:23:35 2013
@@ -17,13 +17,13 @@
* under the License.
*/
-package opennlp.perceptron;
+package opennlp.tools.ml.perceptron;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
-import opennlp.model.PlainTextFileDataReader;
+import opennlp.tools.ml.model.PlainTextFileDataReader;
public class PlainTextPerceptronModelReader extends PerceptronModelReader {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PlainTextPerceptronModelWriter.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PlainTextPerceptronModelWriter.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PlainTextPerceptronModelWriter.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PlainTextPerceptronModelWriter.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.perceptron;
+package opennlp.tools.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 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/perceptron/SimplePerceptronSequenceTrainer.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SimplePerceptronSequenceTrainer.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SimplePerceptronSequenceTrainer.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SimplePerceptronSequenceTrainer.java Fri May 31 16:23:35 2013
@@ -17,21 +17,21 @@
* under the License.
*/
-package opennlp.perceptron;
+package opennlp.tools.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.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.DataIndexer;
+import opennlp.tools.ml.model.Event;
+import opennlp.tools.ml.model.IndexHashTable;
+import opennlp.tools.ml.model.MutableContext;
+import opennlp.tools.ml.model.OnePassDataIndexer;
+import opennlp.tools.ml.model.Sequence;
+import opennlp.tools.ml.model.SequenceStream;
+import opennlp.tools.ml.model.SequenceStreamEventStream;
/**
* Trains models for sequences using the perceptron algorithm. Each outcome is represented as
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SuffixSensitivePerceptronModelWriter.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SuffixSensitivePerceptronModelWriter.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SuffixSensitivePerceptronModelWriter.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/SuffixSensitivePerceptronModelWriter.java Fri May 31 16:23:35 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package opennlp.perceptron;
+package opennlp.tools.ml.perceptron;
import java.io.BufferedWriter;
import java.io.DataOutputStream;
@@ -28,8 +28,8 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.util.zip.GZIPOutputStream;
-import opennlp.model.AbstractModel;
-import opennlp.model.AbstractModelWriter;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.AbstractModelWriter;
/**
* A writer for GIS models which inspects the filename and invokes the
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderEventStream.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderEventStream.java Fri May 31 16:23:35 2013
@@ -22,8 +22,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import opennlp.model.Event;
-import opennlp.model.EventStream;
+import opennlp.tools.ml.model.Event;
+import opennlp.tools.ml.model.EventStream;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.PlainTextByLineStream;
import opennlp.tools.util.Span;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java Fri May 31 16:23:35 2013
@@ -30,13 +30,13 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import opennlp.maxent.GIS;
-import opennlp.maxent.GISModel;
-import opennlp.model.AbstractModel;
-import opennlp.model.EventStream;
-import opennlp.model.MaxentModel;
-import opennlp.model.TrainUtil;
-import opennlp.model.TwoPassDataIndexer;
+import opennlp.tools.ml.maxent.GIS;
+import opennlp.tools.ml.maxent.GISModel;
+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.ml.model.TwoPassDataIndexer;
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/namefind/NameSampleDataStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameSampleDataStream.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameSampleDataStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameSampleDataStream.java Fri May 31 16:23:35 2013
@@ -19,7 +19,7 @@ package opennlp.tools.namefind;
import java.io.IOException;
-import opennlp.maxent.DataStream;
+import opennlp.tools.ml.maxent.DataStream;
import opennlp.tools.util.FilterObjectStream;
import opennlp.tools.util.ObjectStream;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameSampleSequenceStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameSampleSequenceStream.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameSampleSequenceStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameSampleSequenceStream.java Fri May 31 16:23:35 2013
@@ -23,10 +23,10 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import opennlp.model.AbstractModel;
-import opennlp.model.Event;
-import opennlp.model.Sequence;
-import opennlp.model.SequenceStream;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.Event;
+import opennlp.tools.ml.model.Sequence;
+import opennlp.tools.ml.model.SequenceStream;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.featuregen.AdaptiveFeatureGenerator;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderModel.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderModel.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderModel.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderModel.java Fri May 31 16:23:35 2013
@@ -29,8 +29,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import opennlp.model.AbstractModel;
-import opennlp.model.MaxentModel;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.MaxentModel;
import opennlp.tools.util.InvalidFormatException;
import opennlp.tools.util.featuregen.AdaptiveFeatureGenerator;
import opennlp.tools.util.featuregen.AggregatedFeatureGenerator;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractParserEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractParserEventStream.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractParserEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractParserEventStream.java Fri May 31 16:23:35 2013
@@ -23,7 +23,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import opennlp.model.Event;
+import opennlp.tools.ml.model.Event;
import opennlp.tools.chunker.ChunkerContextGenerator;
import opennlp.tools.dictionary.Dictionary;
import opennlp.tools.parser.chunking.Parser;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/ParserModel.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/ParserModel.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/ParserModel.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/ParserModel.java Fri May 31 16:23:35 2013
@@ -28,7 +28,7 @@ import java.io.OutputStreamWriter;
import java.net.URL;
import java.util.Map;
-import opennlp.model.AbstractModel;
+import opennlp.tools.ml.model.AbstractModel;
import opennlp.tools.chunker.ChunkerModel;
import opennlp.tools.postag.POSModel;
import opennlp.tools.util.InvalidFormatException;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/Parser.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/Parser.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/Parser.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/Parser.java Fri May 31 16:23:35 2013
@@ -24,10 +24,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import opennlp.model.AbstractModel;
-import opennlp.model.MaxentModel;
-import opennlp.model.TrainUtil;
-import opennlp.model.TwoPassDataIndexer;
+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.chunker.Chunker;
import opennlp.tools.chunker.ChunkerME;
import opennlp.tools.chunker.ChunkerModel;
@@ -267,8 +267,8 @@ public class Parser extends AbstractBott
* will be removed soon.
*/
@Deprecated
- public static AbstractModel train(opennlp.model.EventStream es, int iterations, int cut) throws java.io.IOException {
- return opennlp.maxent.GIS.trainModel(iterations, new TwoPassDataIndexer(es, cut));
+ public static AbstractModel train(opennlp.tools.ml.model.EventStream es, int iterations, int cut) throws java.io.IOException {
+ return opennlp.tools.ml.maxent.GIS.trainModel(iterations, new TwoPassDataIndexer(es, cut));
}
public static void mergeReportIntoManifest(Map<String, String> manifest,
@@ -292,7 +292,7 @@ public class Parser extends AbstractBott
// build
System.err.println("Training builder");
- opennlp.model.EventStream bes = new ParserEventStream(parseSamples, rules, ParserEventTypeEnum.BUILD, mdict);
+ opennlp.tools.ml.model.EventStream bes = new ParserEventStream(parseSamples, rules, ParserEventTypeEnum.BUILD, mdict);
Map<String, String> buildReportMap = new HashMap<String, String>();
AbstractModel buildModel = TrainUtil.train(bes, mlParams.getSettings("build"), buildReportMap);
mergeReportIntoManifest(manifestInfoEntries, buildReportMap, "build");
@@ -314,7 +314,7 @@ public class Parser extends AbstractBott
// check
System.err.println("Training checker");
- opennlp.model.EventStream kes = new ParserEventStream(parseSamples, rules, ParserEventTypeEnum.CHECK);
+ opennlp.tools.ml.model.EventStream kes = new ParserEventStream(parseSamples, rules, ParserEventTypeEnum.CHECK);
Map<String, String> checkReportMap = new HashMap<String, String>();
AbstractModel checkModel = TrainUtil.train(kes, mlParams.getSettings("check"), checkReportMap);
mergeReportIntoManifest(manifestInfoEntries, checkReportMap, "check");
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/ParserEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/ParserEventStream.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/ParserEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/ParserEventStream.java Fri May 31 16:23:35 2013
@@ -20,7 +20,7 @@ package opennlp.tools.parser.chunking;
import java.io.FileInputStream;
import java.util.List;
-import opennlp.model.Event;
+import opennlp.tools.ml.model.Event;
import opennlp.tools.dictionary.Dictionary;
import opennlp.tools.parser.AbstractBottomUpParser;
import opennlp.tools.parser.AbstractParserEventStream;
@@ -204,7 +204,7 @@ public class ParserEventStream extends A
if (fun) {
Parse.useFunctionTags(true);
}
- opennlp.model.EventStream es = new ParserEventStream(new ParseSampleStream(new PlainTextByLineStream(new java.io.InputStreamReader(System.in))), rules, etype, dict);
+ opennlp.tools.ml.model.EventStream es = new ParserEventStream(new ParseSampleStream(new PlainTextByLineStream(new java.io.InputStreamReader(System.in))), rules, etype, dict);
while (es.hasNext()) {
System.out.println(es.next());
}
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/Parser.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/Parser.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/Parser.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/Parser.java Fri May 31 16:23:35 2013
@@ -25,10 +25,10 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import opennlp.model.AbstractModel;
-import opennlp.model.MaxentModel;
-import opennlp.model.TrainUtil;
-import opennlp.model.TwoPassDataIndexer;
+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.chunker.Chunker;
import opennlp.tools.chunker.ChunkerME;
import opennlp.tools.chunker.ChunkerModel;
@@ -462,7 +462,7 @@ public class Parser extends AbstractBott
// build
System.err.println("Training builder");
- opennlp.model.EventStream bes = new ParserEventStream(parseSamples, rules,
+ opennlp.tools.ml.model.EventStream bes = new ParserEventStream(parseSamples, rules,
ParserEventTypeEnum.BUILD, mdict);
Map<String, String> buildReportMap = new HashMap<String, String>();
AbstractModel buildModel = TrainUtil.train(bes, mlParams.getSettings("build"), buildReportMap);
@@ -472,7 +472,7 @@ public class Parser extends AbstractBott
// check
System.err.println("Training checker");
- opennlp.model.EventStream kes = new ParserEventStream(parseSamples, rules,
+ opennlp.tools.ml.model.EventStream kes = new ParserEventStream(parseSamples, rules,
ParserEventTypeEnum.CHECK);
Map<String, String> checkReportMap = new HashMap<String, String>();
AbstractModel checkModel = TrainUtil.train(kes, mlParams.getSettings("check"), checkReportMap);
@@ -482,7 +482,7 @@ public class Parser extends AbstractBott
// attach
System.err.println("Training attacher");
- opennlp.model.EventStream attachEvents = new ParserEventStream(parseSamples, rules,
+ opennlp.tools.ml.model.EventStream attachEvents = new ParserEventStream(parseSamples, rules,
ParserEventTypeEnum.ATTACH);
Map<String, String> attachReportMap = new HashMap<String, String>();
AbstractModel attachModel = TrainUtil.train(attachEvents, mlParams.getSettings("attach"), attachReportMap);
@@ -514,7 +514,7 @@ public class Parser extends AbstractBott
}
@Deprecated
- public static AbstractModel train(opennlp.model.EventStream es, int iterations, int cut) throws java.io.IOException {
- return opennlp.maxent.GIS.trainModel(iterations, new TwoPassDataIndexer(es, cut));
+ public static AbstractModel train(opennlp.tools.ml.model.EventStream es, int iterations, int cut) throws java.io.IOException {
+ return opennlp.tools.ml.maxent.GIS.trainModel(iterations, new TwoPassDataIndexer(es, cut));
}
}
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/ParserEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/ParserEventStream.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/ParserEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/treeinsert/ParserEventStream.java Fri May 31 16:23:35 2013
@@ -25,9 +25,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import opennlp.maxent.io.SuffixSensitiveGISModelReader;
-import opennlp.model.AbstractModel;
-import opennlp.model.Event;
+import opennlp.tools.ml.maxent.io.SuffixSensitiveGISModelReader;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.Event;
import opennlp.tools.dictionary.Dictionary;
import opennlp.tools.parser.AbstractBottomUpParser;
import opennlp.tools.parser.AbstractParserEventStream;
@@ -379,7 +379,7 @@ public class ParserEventStream extends A
if (fun) {
Parse.useFunctionTags(true);
}
- opennlp.model.EventStream es = new ParserEventStream(new ParseSampleStream(new PlainTextByLineStream(new java.io.InputStreamReader(System.in))), rules, etype, dict);
+ opennlp.tools.ml.model.EventStream es = new ParserEventStream(new ParseSampleStream(new PlainTextByLineStream(new java.io.InputStreamReader(System.in))), rules, etype, dict);
while (es.hasNext()) {
Event e = es.next();
if (model != null) {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSModel.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSModel.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSModel.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSModel.java Fri May 31 16:23:35 2013
@@ -24,7 +24,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.dictionary.Dictionary;
import opennlp.tools.util.BaseToolFactory;
import opennlp.tools.util.InvalidFormatException;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleEventStream.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleEventStream.java Fri May 31 16:23:35 2013
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-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/postag/POSSampleSequenceStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleSequenceStream.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleSequenceStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSSampleSequenceStream.java Fri May 31 16:23:35 2013
@@ -22,10 +22,10 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import opennlp.model.AbstractModel;
-import opennlp.model.Event;
-import opennlp.model.Sequence;
-import opennlp.model.SequenceStream;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.Event;
+import opennlp.tools.ml.model.Sequence;
+import opennlp.tools.ml.model.SequenceStream;
import opennlp.tools.util.ObjectStream;
public class POSSampleSequenceStream implements SequenceStream {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerFactory.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerFactory.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerFactory.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerFactory.java Fri May 31 16:23:35 2013
@@ -28,7 +28,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import opennlp.model.AbstractModel;
+import opennlp.tools.ml.model.AbstractModel;
import opennlp.tools.dictionary.Dictionary;
import opennlp.tools.util.BaseToolFactory;
import opennlp.tools.util.InvalidFormatException;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerME.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerME.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerME.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerME.java Fri May 31 16:23:35 2013
@@ -27,9 +27,9 @@ import java.util.Map.Entry;
import java.util.StringTokenizer;
import java.util.concurrent.atomic.AtomicInteger;
-import opennlp.model.AbstractModel;
-import opennlp.model.EventStream;
-import opennlp.model.TrainUtil;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.EventStream;
+import opennlp.tools.ml.model.TrainUtil;
import opennlp.tools.dictionary.Dictionary;
import opennlp.tools.ngram.NGramModel;
import opennlp.tools.util.BeamSearch;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerTrainer.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerTrainer.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerTrainer.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/postag/POSTaggerTrainer.java Fri May 31 16:23:35 2013
@@ -25,15 +25,15 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
-import opennlp.maxent.DataStream;
-import opennlp.maxent.GISModel;
-import opennlp.maxent.io.SuffixSensitiveGISModelWriter;
-import opennlp.model.AbstractModel;
-import opennlp.model.EventStream;
-import opennlp.model.SequenceStream;
-import opennlp.model.TwoPassDataIndexer;
-import opennlp.perceptron.SimplePerceptronSequenceTrainer;
-import opennlp.perceptron.SuffixSensitivePerceptronModelWriter;
+import opennlp.tools.ml.maxent.DataStream;
+import opennlp.tools.ml.maxent.GISModel;
+import opennlp.tools.ml.maxent.io.SuffixSensitiveGISModelWriter;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.EventStream;
+import opennlp.tools.ml.model.SequenceStream;
+import opennlp.tools.ml.model.TwoPassDataIndexer;
+import opennlp.tools.ml.perceptron.SimplePerceptronSequenceTrainer;
+import opennlp.tools.ml.perceptron.SuffixSensitivePerceptronModelWriter;
import opennlp.tools.dictionary.Dictionary;
import opennlp.tools.ngram.NGramModel;
import opennlp.tools.util.ObjectStream;
@@ -68,7 +68,7 @@ public class POSTaggerTrainer {
public static POSModel train(String languageCode, ObjectStream<POSSample> samples, POSDictionary tagDictionary,
Dictionary ngramDictionary, int cutoff, int iterations) throws IOException {
- GISModel posModel = opennlp.maxent.GIS.trainModel(iterations,
+ GISModel posModel = opennlp.tools.ml.maxent.GIS.trainModel(iterations,
new TwoPassDataIndexer(new POSSampleEventStream(samples,
new DefaultPOSContextGenerator(ngramDictionary)), cutoff));
@@ -99,11 +99,11 @@ public class POSTaggerTrainer {
*/
@Deprecated
public static AbstractModel trainMaxentModel(EventStream es, int iterations, int cut) throws IOException {
- return opennlp.maxent.GIS.trainModel(iterations, new TwoPassDataIndexer(es, cut));
+ return opennlp.tools.ml.maxent.GIS.trainModel(iterations, new TwoPassDataIndexer(es, cut));
}
public static AbstractModel trainPerceptronModel(EventStream es, int iterations, int cut, boolean useAverage) throws IOException {
- return new opennlp.perceptron.PerceptronTrainer().trainModel(iterations, new TwoPassDataIndexer(es, cut, false), cut, useAverage);
+ return new opennlp.tools.ml.perceptron.PerceptronTrainer().trainModel(iterations, new TwoPassDataIndexer(es, cut, false), cut, useAverage);
}
public static AbstractModel trainPerceptronModel(EventStream es, int iterations, int cut) throws IOException {
@@ -279,7 +279,7 @@ public class POSTaggerTrainer {
NGramModel ngramModel = new NGramModel();
- DataStream data = new opennlp.maxent.PlainTextByLineDataStream(new java.io.FileReader(inFile));
+ DataStream data = new opennlp.tools.ml.maxent.PlainTextByLineDataStream(new java.io.FileReader(inFile));
while(data.hasNext()) {
String tagStr = (String) data.nextToken();
String[] tt = tagStr.split(" ");
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/AbstractEndOfSentenceScanner.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/AbstractEndOfSentenceScanner.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/AbstractEndOfSentenceScanner.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/AbstractEndOfSentenceScanner.java Fri May 31 16:23:35 2013
@@ -21,7 +21,7 @@ package opennlp.tools.sentdetect;
import java.util.ArrayList;
import java.util.List;
-import opennlp.maxent.IntegerPool;
+import opennlp.tools.ml.maxent.IntegerPool;
/**
* Abstract class for common methods related to identifying potential ends of sentences.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/DefaultEndOfSentenceScanner.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/DefaultEndOfSentenceScanner.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/DefaultEndOfSentenceScanner.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/DefaultEndOfSentenceScanner.java Fri May 31 16:23:35 2013
@@ -21,7 +21,7 @@ package opennlp.tools.sentdetect;
import java.util.ArrayList;
import java.util.List;
-import opennlp.maxent.IntegerPool;
+import opennlp.tools.ml.maxent.IntegerPool;
/**
* Default implementation of the {@link EndOfSentenceScanner}.
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SDEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SDEventStream.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SDEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SDEventStream.java Fri May 31 16:23:35 2013
@@ -21,7 +21,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import opennlp.model.Event;
+import opennlp.tools.ml.model.Event;
import opennlp.tools.util.AbstractEventStream;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.Span;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorME.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorME.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorME.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorME.java Fri May 31 16:23:35 2013
@@ -26,10 +26,10 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-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.dictionary.Dictionary;
import opennlp.tools.sentdetect.lang.Factory;
import opennlp.tools.util.ObjectStream;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceModel.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceModel.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceModel.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceModel.java Fri May 31 16:23:35 2013
@@ -27,8 +27,8 @@ import java.io.InputStream;
import java.net.URL;
import java.util.Map;
-import opennlp.model.AbstractModel;
-import opennlp.model.GenericModelReader;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.GenericModelReader;
import opennlp.tools.dictionary.Dictionary;
import opennlp.tools.util.BaseToolFactory;
import opennlp.tools.util.InvalidFormatException;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokSpanEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokSpanEventStream.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokSpanEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokSpanEventStream.java Fri May 31 16:23:35 2013
@@ -25,7 +25,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Pattern;
-import opennlp.model.Event;
+import opennlp.tools.ml.model.Event;
import opennlp.tools.tokenize.lang.Factory;
import opennlp.tools.util.AbstractEventStream;
import opennlp.tools.util.ObjectStream;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerME.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerME.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerME.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerME.java Fri May 31 16:23:35 2013
@@ -27,10 +27,10 @@ import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
-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.dictionary.Dictionary;
import opennlp.tools.tokenize.lang.Factory;
import opennlp.tools.util.ObjectStream;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerModel.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerModel.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerModel.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerModel.java Fri May 31 16:23:35 2013
@@ -28,9 +28,9 @@ import java.io.OutputStream;
import java.net.URL;
import java.util.Map;
-import opennlp.maxent.io.BinaryGISModelReader;
-import opennlp.model.AbstractModel;
-import opennlp.model.MaxentModel;
+import opennlp.tools.ml.maxent.io.BinaryGISModelReader;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.MaxentModel;
import opennlp.tools.dictionary.Dictionary;
import opennlp.tools.util.BaseToolFactory;
import opennlp.tools.util.InvalidFormatException;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/AbstractEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/AbstractEventStream.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/AbstractEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/AbstractEventStream.java Fri May 31 16:23:35 2013
@@ -22,15 +22,15 @@ import java.io.IOException;
import java.util.Collections;
import java.util.Iterator;
-import opennlp.model.Event;
-import opennlp.model.EventStream;
+import opennlp.tools.ml.model.Event;
+import opennlp.tools.ml.model.EventStream;
/**
* This is a base class for {@link EventStream} classes.
* It takes an {@link Iterator} of sample objects as input and
* outputs the events creates by a subclass.
*/
-public abstract class AbstractEventStream<T> extends opennlp.model.AbstractEventStream {
+public abstract class AbstractEventStream<T> extends opennlp.tools.ml.model.AbstractEventStream {
private ObjectStream<T> samples;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/BeamSearch.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/BeamSearch.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/BeamSearch.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/BeamSearch.java Fri May 31 16:23:35 2013
@@ -20,7 +20,7 @@ package opennlp.tools.util;
import java.util.Arrays;
import java.util.List;
-import opennlp.model.MaxentModel;
+import opennlp.tools.ml.model.MaxentModel;
/**
* Performs k-best search over sequence. This is based on the description in
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/CollectionEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/CollectionEventStream.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/CollectionEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/CollectionEventStream.java Fri May 31 16:23:35 2013
@@ -21,12 +21,12 @@ package opennlp.tools.util;
import java.util.Collection;
import java.util.Iterator;
-import opennlp.model.Event;
+import opennlp.tools.ml.model.Event;
/**
* Creates an event stream out of a collection of events.
*/
-public class CollectionEventStream extends opennlp.model.AbstractEventStream {
+public class CollectionEventStream extends opennlp.tools.ml.model.AbstractEventStream {
private Iterator<Event> ci;
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/EventTraceStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/EventTraceStream.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/EventTraceStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/EventTraceStream.java Fri May 31 16:23:35 2013
@@ -20,8 +20,8 @@ package opennlp.tools.util;
import java.io.IOException;
import java.io.Writer;
-import opennlp.model.Event;
-import opennlp.model.EventStream;
+import opennlp.tools.ml.model.Event;
+import opennlp.tools.ml.model.EventStream;
public class EventTraceStream implements EventStream {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/HashSumEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/HashSumEventStream.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/HashSumEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/HashSumEventStream.java Fri May 31 16:23:35 2013
@@ -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 opennlp.tools.ml.model.Event;
+import opennlp.tools.ml.model.EventStream;
@Deprecated
public class HashSumEventStream implements EventStream {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/GenericModelSerializer.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/GenericModelSerializer.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/GenericModelSerializer.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/GenericModelSerializer.java Fri May 31 16:23:35 2013
@@ -23,9 +23,9 @@ import java.io.InputStream;
import java.io.OutputStream;
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.InvalidFormatException;
public class GenericModelSerializer implements ArtifactSerializer<AbstractModel> {
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/ModelUtil.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/ModelUtil.java?rev=1488299&r1=1488298&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/ModelUtil.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/model/ModelUtil.java Fri May 31 16:23:35 2013
@@ -28,10 +28,10 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import opennlp.model.AbstractModel;
-import opennlp.model.GenericModelWriter;
-import opennlp.model.MaxentModel;
-import opennlp.model.TrainUtil;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.GenericModelWriter;
+import opennlp.tools.ml.model.MaxentModel;
+import opennlp.tools.ml.model.TrainUtil;
import opennlp.tools.util.TrainingParameters;
/**
Copied: opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/PrepAttachDataUtil.java (from r1488030, opennlp/trunk/opennlp-maxent/src/test/java/opennlp/PrepAttachDataUtil.java)
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/PrepAttachDataUtil.java?p2=opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/PrepAttachDataUtil.java&p1=opennlp/trunk/opennlp-maxent/src/test/java/opennlp/PrepAttachDataUtil.java&r1=1488030&r2=1488299&rev=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-maxent/src/test/java/opennlp/PrepAttachDataUtil.java (original)
+++ opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/PrepAttachDataUtil.java Fri May 31 16:23:35 2013
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package opennlp;
+package opennlp.tools.ml;
import static org.junit.Assert.assertEquals;
@@ -26,11 +26,11 @@ import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
-import opennlp.model.AbstractModel;
-import opennlp.model.Event;
-import opennlp.model.EventStream;
-import opennlp.model.ListEventStream;
-import opennlp.perceptron.PerceptronPrepAttachTest;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.Event;
+import opennlp.tools.ml.model.EventStream;
+import opennlp.tools.ml.model.ListEventStream;
+import opennlp.tools.ml.perceptron.PerceptronPrepAttachTest;
public class PrepAttachDataUtil {
Modified: opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/MaxentPrepAttachTest.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/MaxentPrepAttachTest.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/MaxentPrepAttachTest.java (original)
+++ opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/MaxentPrepAttachTest.java Fri May 31 16:23:35 2013
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
-import static opennlp.PrepAttachDataUtil.createTrainingStream;
-import static opennlp.PrepAttachDataUtil.testModel;
+import static opennlp.tools.ml.PrepAttachDataUtil.createTrainingStream;
+import static opennlp.tools.ml.PrepAttachDataUtil.testModel;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import opennlp.model.AbstractModel;
-import opennlp.model.TrainUtil;
-import opennlp.model.TwoPassDataIndexer;
-import opennlp.model.UniformPrior;
+import opennlp.tools.ml.model.AbstractModel;
+import opennlp.tools.ml.model.TrainUtil;
+import opennlp.tools.ml.model.TwoPassDataIndexer;
+import opennlp.tools.ml.model.UniformPrior;
import org.junit.Test;
Modified: opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/RealValueModelTest.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/RealValueModelTest.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/RealValueModelTest.java (original)
+++ opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/RealValueModelTest.java Fri May 31 16:23:35 2013
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
import java.io.IOException;
-import opennlp.model.FileEventStream;
-import opennlp.model.OnePassRealValueDataIndexer;
-import opennlp.model.RealValueFileEventStream;
+import opennlp.tools.ml.model.FileEventStream;
+import opennlp.tools.ml.model.OnePassRealValueDataIndexer;
+import opennlp.tools.ml.model.RealValueFileEventStream;
import junit.framework.TestCase;
Modified: opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/ScaleDoesntMatterTest.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/ScaleDoesntMatterTest.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/ScaleDoesntMatterTest.java (original)
+++ opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/ScaleDoesntMatterTest.java Fri May 31 16:23:35 2013
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package opennlp.maxent;
+package opennlp.tools.ml.maxent;
import java.io.StringReader;
import junit.framework.TestCase;
-import opennlp.model.EventStream;
-import opennlp.model.MaxentModel;
-import opennlp.model.OnePassRealValueDataIndexer;
-import opennlp.model.RealValueFileEventStream;
+import opennlp.tools.ml.model.EventStream;
+import opennlp.tools.ml.model.MaxentModel;
+import opennlp.tools.ml.model.OnePassRealValueDataIndexer;
+import opennlp.tools.ml.model.RealValueFileEventStream;
public class ScaleDoesntMatterTest extends TestCase {
Modified: opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/io/RealValueFileEventStreamTest.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/io/RealValueFileEventStreamTest.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/io/RealValueFileEventStreamTest.java (original)
+++ opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/io/RealValueFileEventStreamTest.java Fri May 31 16:23:35 2013
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package opennlp.maxent.io;
+package opennlp.tools.ml.maxent.io;
import java.io.IOException;
import junit.framework.TestCase;
-import opennlp.model.OnePassRealValueDataIndexer;
-import opennlp.model.RealValueFileEventStream;
+import opennlp.tools.ml.model.OnePassRealValueDataIndexer;
+import opennlp.tools.ml.model.RealValueFileEventStream;
public class RealValueFileEventStreamTest extends TestCase {
Modified: opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/quasinewton/LineSearchTest.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/quasinewton/LineSearchTest.java?rev=1488299&r1=1488030&r2=1488299&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/quasinewton/LineSearchTest.java (original)
+++ opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/maxent/quasinewton/LineSearchTest.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;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;