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 2011/03/01 13:25:24 UTC
svn commit: r1075789 - in
/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind:
DefaultNameContextGenerator.java NameFinderME.java
Author: joern
Date: Tue Mar 1 12:25:24 2011
New Revision: 1075789
URL: http://svn.apache.org/viewvc?rev=1075789&view=rev
Log:
OPENNLP-138 Feature generation is now initialized correctly
Modified:
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/DefaultNameContextGenerator.java
incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/DefaultNameContextGenerator.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/DefaultNameContextGenerator.java?rev=1075789&r1=1075788&r2=1075789&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/DefaultNameContextGenerator.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/DefaultNameContextGenerator.java Tue Mar 1 12:25:24 2011
@@ -38,6 +38,7 @@ public class DefaultNameContextGenerator
private AdaptiveFeatureGenerator featureGenerators[];
+ @Deprecated
private static AdaptiveFeatureGenerator windowFeatures = new CachedFeatureGenerator(
new AdaptiveFeatureGenerator[]{
new WindowFeatureGenerator(new TokenFeatureGenerator(), 2, 2),
@@ -49,7 +50,9 @@ public class DefaultNameContextGenerator
/**
* Creates a name context generator.
+ * @deprecated use the other constructor and always provide the feature generators
*/
+ @Deprecated
public DefaultNameContextGenerator() {
this((AdaptiveFeatureGenerator[]) null);
}
Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java?rev=1075789&r1=1075788&r2=1075789&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java Tue Mar 1 12:25:24 2011
@@ -125,12 +125,10 @@ public class NameFinderME implements Tok
public NameFinderME(TokenNameFinderModel model, AdaptiveFeatureGenerator generator, int beamSize) {
this.model = model.getNameFinderModel();
- contextGenerator = new DefaultNameContextGenerator();
-
if (generator != null)
- contextGenerator.addFeatureGenerator(generator);
+ contextGenerator = new DefaultNameContextGenerator(generator);
else
- contextGenerator.addFeatureGenerator(createFeatureGenerator());
+ contextGenerator = new DefaultNameContextGenerator(createFeatureGenerator());
contextGenerator.addFeatureGenerator(
new WindowFeatureGenerator(additionalContextFeatureGenerator, 8, 8));
@@ -148,6 +146,8 @@ public class NameFinderME implements Tok
* Creates a new name finder with the specified model.
*
* @param mod The model to be used to find names.
+ *
+ * @deprecated Use the new model API!
*/
@Deprecated
public NameFinderME(MaxentModel mod) {