svn commit: r1522652 - in /opennlp/trunk: opennlp-tools/src/main/java/opennlp/tools/ml/model/TrainUtil.java opennlp-tools/src/test/java/opennlp/tools/ml/TrainerFactoryTest.java opennlp-uima/src/main/java/opennlp/uima/util/OpennlpUtil.java

[co...@apache.org]

Author: colen
Date: Thu Sep 12 16:31:07 2013
New Revision: 1522652

URL: http://svn.apache.org/r1522652
Log:
OPENNLP-581 My last commit broke the OpenNLP-UIMA build. I fixed it and restored the TrainUtil for now

Modified:
    opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/ml/model/TrainUtil.java
    opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/TrainerFactoryTest.java
    opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/util/OpennlpUtil.java

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=1522652&r1=1522651&r2=1522652&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 Thu Sep 12 16:31:07 2013
@@ -27,6 +27,13 @@ import opennlp.tools.ml.SequenceTrainer;
 import opennlp.tools.ml.TrainerFactory;
 
 public class TrainUtil {
+
+  /**
+   * @deprecated Use {@link TrainerFactory#isValid(Map)} instead.
+   */
+  public static boolean isValid(Map<String, String> trainParams) {
+    return TrainerFactory.isValid(trainParams);
+  }
   
   // TODO: Need a way to report results and settings back for inclusion in model ...
   
@@ -46,6 +53,16 @@ public class TrainUtil {
   }
   
   /**
+   * Detects if the training algorithm requires sequence based feature
+   * generation or not.
+   * 
+   * @deprecated Use {@link TrainerFactory#isSequenceTraining(Map)} instead.
+   */
+  public static boolean isSequenceTraining(Map<String, String> trainParams) {
+	return TrainerFactory.isSequenceTraining(trainParams);
+  }
+  
+  /**
    * @deprecated Use {@link TrainerFactory#getSequenceTrainer(Map, Map)} to get an
    *             {@link SequenceTrainer} instead.
    */

Modified: opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/TrainerFactoryTest.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/TrainerFactoryTest.java?rev=1522652&r1=1522651&r2=1522652&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/TrainerFactoryTest.java (original)
+++ opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/ml/TrainerFactoryTest.java Thu Sep 12 16:31:07 2013
@@ -54,9 +54,9 @@ public class TrainerFactoryTest {
   @Test
   public void testIsSequenceTrainerFalse() {
     mlParams.put(AbstractTrainer.ALGORITHM_PARAM,
-        SimplePerceptronSequenceTrainer.SEQUENCE_VALUE);
+        GIS.MAXENT_VALUE);
 
-    assertTrue(TrainerFactory.isSequenceTraining(mlParams.getSettings()));
+    assertFalse(TrainerFactory.isSequenceTraining(mlParams.getSettings()));
   }
 
 }

Modified: opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/util/OpennlpUtil.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/util/OpennlpUtil.java?rev=1522652&r1=1522651&r2=1522652&view=diff
==============================================================================
--- opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/util/OpennlpUtil.java (original)
+++ opennlp/trunk/opennlp-uima/src/main/java/opennlp/uima/util/OpennlpUtil.java Thu Sep 12 16:31:07 2013
@@ -28,6 +28,7 @@ import java.io.OutputStream;
 
 import org.apache.uima.resource.ResourceInitializationException;
 
+import opennlp.tools.ml.TrainerFactory;
 import opennlp.tools.ml.maxent.GISModel;
 import opennlp.tools.ml.model.TrainUtil;
 import opennlp.tools.util.TrainingParameters;
@@ -104,11 +105,11 @@ final public class OpennlpUtil {
         }
       }
 
-      if (!TrainUtil.isValid(params.getSettings())) {
+      if (!TrainerFactory.isValid(params.getSettings())) {
         throw new ResourceInitializationException(new Exception("Training parameters file is invalid!"));
       }
 
-      if (!isSequenceTrainingAllowed && TrainUtil.isSequenceTraining(params.getSettings())) {
+      if (!isSequenceTrainingAllowed && TrainerFactory.isSequenceTraining(params.getSettings())) {
         throw new ResourceInitializationException(new Exception("Sequence training is not supported!"));
       }
     }