#535 - CrossValidation code is redundant

dkpro · Jan 9, 2019 · c486284 · c486284
1 parent 8283b07
commit c486284
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 22 deletions.
diff --git a/dkpro-tc-ml/src/main/java/org/dkpro/tc/ml/experiment/AbstractCrossValidation.java b/dkpro-tc-ml/src/main/java/org/dkpro/tc/ml/experiment/AbstractCrossValidation.java
@@ -20,7 +20,6 @@
 import java.io.File;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Comparator;
 
 import org.apache.commons.io.FileUtils;
 import org.dkpro.lab.engine.TaskContext;
@@ -35,7 +34,6 @@ public abstract class AbstractCrossValidation
     implements Constants
 {
     protected int aNumFolds = 10;
-    protected Comparator<String> comparator;
 
     /**
      * Sets the number of folds
@@ -48,17 +46,6 @@ public void setNumFolds(int numFolds)
         this.aNumFolds = numFolds;
     }
 
-    /**
-     * Sets a comparator
-     * 
-     * @param aComparator
-     *            the comparator
-     */
-    public void setComparator(Comparator<String> aComparator)
-    {
-        comparator = aComparator;
-    }
-
     /**
      * creates required number of CAS
      * 

diff --git a/dkpro-tc-ml/src/main/java/org/dkpro/tc/ml/experiment/ExperimentCrossValidation.java b/dkpro-tc-ml/src/main/java/org/dkpro/tc/ml/experiment/ExperimentCrossValidation.java
@@ -50,6 +50,7 @@
 public class ExperimentCrossValidation
     extends AbstractCrossValidation
 {
+    protected Comparator<String> comparator;
     protected InitTask initTask;
     protected OutcomeCollectionTask collectionTask;
     protected MetaInfoTask metaTask;
@@ -100,6 +101,11 @@ public ExperimentCrossValidation(String aExperimentName, int aNumFolds,
         setType("Evaluation-" + experimentName);
     }
 
+    private void setComparator(Comparator<String> aComparator)
+    {
+        this.comparator = aComparator;        
+    }
+
     /**
      * Initializes the experiment. This is called automatically before execution. It's not done
      * directly in the constructor, because we want to be able to use setters instead of the

diff --git a/dkpro-tc-ml/src/main/java/org/dkpro/tc/ml/experiment/ExperimentLearningCurveTrainTest.java b/dkpro-tc-ml/src/main/java/org/dkpro/tc/ml/experiment/ExperimentLearningCurveTrainTest.java
@@ -52,7 +52,6 @@
 public class ExperimentLearningCurveTrainTest
     extends AbstractCrossValidation
 {
-
     protected InitTask initTaskTrain;
     protected InitTask initTaskTest;
     protected OutcomeCollectionTask collectionTask;
@@ -269,7 +268,7 @@ public void initialize(TaskContext aContext)
         addTask(initTaskTest);
         addTask(crossValidationTask);
     }
-    
+
     /**
      * 
      * @param fileNames
@@ -278,7 +277,7 @@ public void initialize(TaskContext aContext)
      */
     protected LearningCurveDimBundleFixedTestSet getFoldDim(String[] fileNames)
     {
-        return new LearningCurveDimBundleFixedTestSet("files",
-                Dimension.create("", fileNames), aNumFolds, limitPerStage);
+        return new LearningCurveDimBundleFixedTestSet("files", Dimension.create("", fileNames),
+                aNumFolds, limitPerStage);
     }
 }
diff --git a/...ml/src/main/java/org/dkpro/tc/ml/experiment/deep/DeepLearningExperimentLearningCurve.java b/...ml/src/main/java/org/dkpro/tc/ml/experiment/deep/DeepLearningExperimentLearningCurve.java
@@ -20,7 +20,6 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.List;
 
 import org.dkpro.lab.engine.TaskContext;
@@ -49,8 +48,6 @@
 public class DeepLearningExperimentLearningCurve
     extends AbstractCrossValidation
 {
-
-    protected Comparator<String> comparator;
     protected int numFolds = 10;
 
     protected InitTaskDeep initTask;

diff --git a/...in/java/org/dkpro/tc/ml/experiment/deep/DeepLearningExperimentLearningCurveTrainTest.java b/...in/java/org/dkpro/tc/ml/experiment/deep/DeepLearningExperimentLearningCurveTrainTest.java
@@ -48,7 +48,6 @@
 public class DeepLearningExperimentLearningCurveTrainTest
     extends AbstractCrossValidation
 {
-
     protected InitTaskDeep initTask;
     protected PreparationTask preparationTask;
     protected EmbeddingTask embeddingTask;

diff --git a/...-tc-ml/src/main/java/org/dkpro/tc/ml/experiment/deep/DeepLearningExperimentTrainTest.java b/...-tc-ml/src/main/java/org/dkpro/tc/ml/experiment/deep/DeepLearningExperimentTrainTest.java
@@ -41,7 +41,6 @@
 public class DeepLearningExperimentTrainTest
     extends Experiment_ImplBase
 {
-
     protected InitTaskDeep initTaskTrain;
     protected InitTaskDeep initTaskTest;
     protected PreparationTask preparationTask;