OPENNLP-621
Fixed errors and changed all approprate imports to opennlp.tools.ml. Builds but no testing done yet.
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/CorefModel.java b/opennlp-coref/src/main/java/opennlp/tools/coref/CorefModel.java
index afcf27a..d74e037 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/CorefModel.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/CorefModel.java
@@ -26,9 +26,10 @@
import java.io.FileReader;
import java.io.IOException;
import java.util.zip.GZIPInputStream;
-
-import opennlp.maxent.io.BinaryGISModelReader;
-import opennlp.model.AbstractModel;
+import opennlp.tools.ml.maxent.io.BinaryGISModelReader;
+//import opennlp.maxent.io.BinaryGISModelReader;
+//import opennlp.model.AbstractModel;
+import opennlp.tools.ml.model.AbstractModel;
import opennlp.tools.dictionary.Dictionary;
import opennlp.tools.util.StringList;
import opennlp.tools.util.model.BaseModel;
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/DefaultNonReferentialResolver.java b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/DefaultNonReferentialResolver.java
index 1f3b8c6..87f9df8 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/DefaultNonReferentialResolver.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/DefaultNonReferentialResolver.java
@@ -25,14 +25,26 @@
import java.util.Iterator;
import java.util.List;
-import opennlp.maxent.GIS;
-import opennlp.maxent.io.BinaryGISModelReader;
-import opennlp.maxent.io.SuffixSensitiveGISModelReader;
-import opennlp.maxent.io.SuffixSensitiveGISModelWriter;
-import opennlp.model.Event;
-import opennlp.model.MaxentModel;
+//import opennlp.maxent.GIS;
+//import opennlp.maxent.io.BinaryGISModelReader;
+//import opennlp.maxent.io.SuffixSensitiveGISModelReader;
+//import opennlp.maxent.io.SuffixSensitiveGISModelWriter;
+//import opennlp.maxent.GIS;
+import opennlp.tools.ml.maxent.io.BinaryGISModelReader;
+import opennlp.tools.ml.maxent.GIS;
+import opennlp.tools.ml.maxent.io.SuffixSensitiveGISModelWriter;
+import opennlp.tools.ml.maxent.io.SuffixSensitiveGISModelReader;
+//import opennlp.maxent.io.SuffixSensitiveGISModelReader;
+//import opennlp.maxent.io.SuffixSensitiveGISModelWriter;
+//import opennlp.model.Event;
+import opennlp.tools.ml.model.MaxentModel;
+//import opennlp.model.MaxentModel;
+
+import opennlp.tools.ml.model.EventStream;
+//import opennlp.model.MaxentModel;
import opennlp.tools.coref.mention.MentionContext;
import opennlp.tools.coref.mention.Parse;
+import opennlp.tools.ml.model.Event;
import opennlp.tools.util.CollectionEventStream;
/**
@@ -124,7 +136,7 @@
}
writer.close();
}
- (new SuffixSensitiveGISModelWriter(GIS.trainModel(new CollectionEventStream(events),100,10),new File(modelName+modelExtension))).persist();
+ (new SuffixSensitiveGISModelWriter(GIS.trainModel((EventStream)new CollectionEventStream(events),100,10),new File(modelName+modelExtension))).persist();
}
}
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/MaxentResolver.java b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/MaxentResolver.java
index a15f67d..0490dcb 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/MaxentResolver.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/resolver/MaxentResolver.java
@@ -24,15 +24,28 @@
import java.util.Iterator;
import java.util.List;
-import opennlp.maxent.GIS;
-import opennlp.maxent.io.SuffixSensitiveGISModelReader;
-import opennlp.maxent.io.SuffixSensitiveGISModelWriter;
-import opennlp.model.Event;
-import opennlp.model.MaxentModel;
+//import opennlp.maxent.GIS;
+//import opennlp.maxent.io.SuffixSensitiveGISModelReader;
+//import opennlp.maxent.io.SuffixSensitiveGISModelWriter;
+//import opennlp.model.EventStream;
+//import opennlp.model.MaxentModel;
+
+
+import opennlp.tools.ml.maxent.GIS;
+import opennlp.tools.ml.maxent.io.SuffixSensitiveGISModelWriter;
+import opennlp.tools.ml.maxent.io.SuffixSensitiveGISModelReader;
+//import opennlp.maxent.GIS;
+//import opennlp.maxent.io.SuffixSensitiveGISModelReader;
+//import opennlp.maxent.io.SuffixSensitiveGISModelWriter;
+//import opennlp.model.Event;
+//import opennlp.model.MaxentModel;
+import opennlp.tools.ml.model.MaxentModel;
+import opennlp.tools.ml.model.EventStream;
import opennlp.tools.coref.DiscourseEntity;
import opennlp.tools.coref.DiscourseModel;
import opennlp.tools.coref.mention.MentionContext;
import opennlp.tools.coref.sim.TestSimilarityModel;
+import opennlp.tools.ml.model.Event;
import opennlp.tools.util.CollectionEventStream;
/**
@@ -55,7 +68,7 @@
private double[] candProbs;
private int sameIndex;
private ResolverMode mode;
- private List<Event> events;
+ private List<opennlp.tools.ml.model.Event> events;
/** When true, this designates that the resolver should use the first referent encountered which it
* more preferable than non-reference. When false all non-excluded referents within this resolvers range
@@ -314,7 +327,7 @@
}
writer.close();
}
- (new SuffixSensitiveGISModelWriter(GIS.trainModel(new CollectionEventStream(events),100,10),new File(modelName+modelExtension))).persist();
+ (new SuffixSensitiveGISModelWriter(GIS.trainModel((EventStream)new CollectionEventStream(events),100,10),new File(modelName+modelExtension))).persist();
nonReferentialResolver.train();
}
}
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/GenderModel.java b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/GenderModel.java
index 33c63b6..9b93255 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/GenderModel.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/GenderModel.java
@@ -25,17 +25,26 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import opennlp.maxent.GIS;
-import opennlp.maxent.io.SuffixSensitiveGISModelReader;
-import opennlp.maxent.io.SuffixSensitiveGISModelWriter;
-import opennlp.model.Event;
-import opennlp.model.MaxentModel;
+//import opennlp.maxent.GIS;
+import opennlp.tools.ml.maxent.GIS;
+import opennlp.tools.ml.maxent.io.SuffixSensitiveGISModelWriter;
+import opennlp.tools.ml.maxent.io.SuffixSensitiveGISModelReader;
+//import opennlp.maxent.io.SuffixSensitiveGISModelReader;
+//import opennlp.maxent.io.SuffixSensitiveGISModelWriter;
+//import opennlp.model.Event;
+import opennlp.tools.ml.model.Event;
+import opennlp.tools.ml.model.MaxentModel;
+//import opennlp.model.MaxentModel;
import opennlp.tools.coref.resolver.ResolverUtils;
+import opennlp.tools.ml.model.AbstractModel;
+
+import opennlp.tools.ml.model.EventStream;
import opennlp.tools.util.CollectionEventStream;
import opennlp.tools.util.HashList;
@@ -51,7 +60,7 @@
private String modelName;
private String modelExtension = ".bin.gz";
private MaxentModel testModel;
- private List<Event> events;
+ private Collection<Event> events;
private boolean debugOn = true;
private Set<String> maleNames;
@@ -267,9 +276,8 @@
writer.close();
}
new SuffixSensitiveGISModelWriter(
- GIS.trainModel(
- new CollectionEventStream(events), true),
- new File(modelName+modelExtension)).persist();
+ // GIS.trainModel((EventStream)new CollectionEventStream(events), true)).persist();
+ (AbstractModel) GIS.trainModel((EventStream)new CollectionEventStream(events), true), new File(modelName+modelExtension)).persist();
}
public int getFemaleIndex() {
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/NumberModel.java b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/NumberModel.java
index 1d4e47a..02776a5 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/NumberModel.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/NumberModel.java
@@ -22,12 +22,16 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-
-import opennlp.maxent.GIS;
-import opennlp.maxent.io.SuffixSensitiveGISModelReader;
-import opennlp.maxent.io.SuffixSensitiveGISModelWriter;
-import opennlp.model.Event;
-import opennlp.model.MaxentModel;
+import opennlp.tools.ml.maxent.GIS;
+import opennlp.tools.ml.maxent.io.SuffixSensitiveGISModelWriter;
+import opennlp.tools.ml.maxent.io.SuffixSensitiveGISModelReader;
+//import opennlp.maxent.GIS;
+//import opennlp.maxent.io.SuffixSensitiveGISModelReader;
+//import opennlp.maxent.io.SuffixSensitiveGISModelWriter;
+//import opennlp.model.Event;
+import opennlp.tools.ml.model.Event;
+//import opennlp.model.MaxentModel;
+import opennlp.tools.ml.model.MaxentModel;
import opennlp.tools.coref.resolver.ResolverUtils;
import opennlp.tools.util.CollectionEventStream;
import opennlp.tools.util.HashList;
diff --git a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/SimilarityModel.java b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/SimilarityModel.java
index 0ea01a0..9a4b8d0 100644
--- a/opennlp-coref/src/main/java/opennlp/tools/coref/sim/SimilarityModel.java
+++ b/opennlp-coref/src/main/java/opennlp/tools/coref/sim/SimilarityModel.java
@@ -29,12 +29,17 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-
-import opennlp.maxent.GIS;
-import opennlp.maxent.io.SuffixSensitiveGISModelReader;
-import opennlp.maxent.io.SuffixSensitiveGISModelWriter;
-import opennlp.model.Event;
-import opennlp.model.MaxentModel;
+import opennlp.tools.ml.maxent.GIS;
+import opennlp.tools.ml.maxent.io.SuffixSensitiveGISModelWriter;
+import opennlp.tools.ml.maxent.io.SuffixSensitiveGISModelReader;
+//import opennlp.maxent.GIS;
+//import opennlp.maxent.io.SuffixSensitiveGISModelReader;
+//import opennlp.maxent.io.SuffixSensitiveGISModelWriter;
+import opennlp.tools.ml.model.Event;
+//import opennlp.model.MaxentModel;
+import opennlp.tools.ml.model.MaxentModel;
+//import opennlp.model.Event;
+//import opennlp.model.MaxentModel;
import opennlp.tools.coref.resolver.ResolverUtils;
import opennlp.tools.util.CollectionEventStream;
import opennlp.tools.util.HashList;
