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 2014/03/10 22:29:26 UTC

svn commit: r1576093 - in /opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind: NameFinderME.java TokenNameFinderCrossValidator.java

Author: joern
Date: Mon Mar 10 21:29:26 2014
New Revision: 1576093

URL: http://svn.apache.org/r1576093
Log:
OPENNLP-580 Fixed a test error

Modified:
    opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/NameFinderME.java
    opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderCrossValidator.java

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=1576093&r1=1576092&r2=1576093&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 Mon Mar 10 21:29:26 2014
@@ -466,8 +466,7 @@ public class NameFinderME implements Tok
    @Deprecated
   public static TokenNameFinderModel train(String languageCode, String type,
       ObjectStream<NameSample> samples, TrainingParameters trainParams,
-      byte[] featureGeneratorBytes, final Map<String, Object> resources,
-      TokenNameFinderFactory factory)
+      byte[] featureGeneratorBytes, final Map<String, Object> resources)
       throws IOException {
 
     TokenNameFinderModel model = train(languageCode, type, samples, trainParams,
@@ -481,18 +480,6 @@ public class NameFinderME implements Tok
   }
 
    /**
-    * 
-    * @deprecated use {@link NameFinderME#train(String, String, ObjectStream, TrainingParameters, TokenNameFinderFactory)} instead.
-    */
-   @Deprecated
-  public static TokenNameFinderModel train(String languageCode, String type,
-      ObjectStream<NameSample> samples, TrainingParameters trainParams,
-      byte[] featureGeneratorBytes, final Map<String, Object> resources)
-      throws IOException {
-    return train(languageCode, type, samples, trainParams, featureGeneratorBytes, resources);
-  }
-
-   /**
     * @deprecated use {@link NameFinderME#train(String, String, ObjectStream, TrainingParameters, TokenNameFinderFactory)} instead.
     */
    @Deprecated

Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderCrossValidator.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderCrossValidator.java?rev=1576093&r1=1576092&r2=1576093&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderCrossValidator.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/namefind/TokenNameFinderCrossValidator.java Mon Mar 10 21:29:26 2014
@@ -223,7 +223,7 @@ public class TokenNameFinderCrossValidat
       }
       else {
         model  = opennlp.tools.namefind.NameFinderME.train(languageCode, type,
-            new DocumentToNameSampleStream(trainingSampleStream), params, featureGeneratorBytes, resources, codec);
+            new DocumentToNameSampleStream(trainingSampleStream), params, featureGeneratorBytes, resources);
         
       }