Rename train-instances command line option

Author: oshando

swan-pipeline/src/main/java/de/fraunhofer/iem/swan/cli/CliRunner.java

@@ -21,7 +21,7 @@ public class CliRunner implements Callable<Integer> {
     private String datasetJson = "/dataset/swan-dataset.json";
 
     @CommandLine.Option(names = {"-in", "--train-instances"}, description = {"Path to ARFF files that contain training instances"})
-    private List<String> instancesArff = new ArrayList<>();
+    private List<String> arffInstancesFiles = new ArrayList<>();
 
     @CommandLine.Option(names = {"-o", "--output"}, description = {"Directory to save output files"})
     private String outputDir = "";
@@ -72,7 +72,7 @@ public SwanOptions initializeOptions(){
                 split,
                 phase);
         options.setPredictionThreshold(predictionThreshold);
-        options.setInstances(instancesArff);
+        options.setInstances(arffInstancesFiles);
 
         return options;
     }

swan-pipeline/src/main/java/de/fraunhofer/iem/swan/cli/SwanCli.java

@@ -37,7 +37,7 @@ public Integer run(SwanOptions options) throws Exception {
             options.setFeatureSet(Arrays.asList("code", "doc-manual", "doc-auto"));
         }
 
-        if (options.getInstances().isEmpty()) {
+        if (options.getArffInstancesFiles().isEmpty() && options.getTrainDataDir().isEmpty()) {
 
             List<String> instances = new ArrayList<>();
 

swan-pipeline/src/main/java/de/fraunhofer/iem/swan/cli/SwanOptions.java

@@ -24,7 +24,7 @@ public class SwanOptions {
     private double trainTestSplit;
     private String phase;
     private double predictionThreshold;
-    private List<String> instancesArff;
+    private List<String> arffInstancesFiles;
 
     public SwanOptions(String testDataDir, String trainDataDir, String datasetJson, String outputDir,
                        List<String> featureSet, String toolkit, List<String> srmClasses,
@@ -178,12 +178,12 @@ public void setPredictionThreshold(double predictionThreshold) {
         this.predictionThreshold = predictionThreshold;
     }
 
-    public List<String> getInstances() {
-        return instancesArff;
+    public List<String> getArffInstancesFiles() {
+        return arffInstancesFiles;
     }
 
     public void setInstances(List<String> instancesArff) {
-        this.instancesArff = instancesArff;
+        this.arffInstancesFiles = instancesArff;
     }
 
     @Override
@@ -192,7 +192,7 @@ public String toString() {
                 "testData='" + testDataDir + '\'' +
                 ", trainData='" + trainDataDir + '\'' +
                 ", datasetJson='" + datasetJson + '\'' +
-                ", instances='" + instancesArff + '\'' +
+                ", instances='" + arffInstancesFiles + '\'' +
                 ", outputDir='" + outputDir + '\'' +
                 ", featureSet='" + featureSet + '\'' +
                 ", learningMode='" + toolkit + '\'' +

swan-pipeline/src/main/java/de/fraunhofer/iem/swan/features/MekaFeatureSet.java

@@ -35,7 +35,7 @@ public void createFeatures() {
         initializeFeatures();
 
         //Create and set attributes for the train instances
-        if (options.getInstances().isEmpty()) {
+        if (options.getArffInstancesFiles().isEmpty()) {
             ArrayList<Attribute> trainAttributes = createAttributes(getCategories(options.getAllClasses()), dataset.getTrainMethods(), featureSets);
             structure = new Instances("swan-srm", trainAttributes, 0);
             convertToMekaInstances(structure);
@@ -49,7 +49,7 @@ public void createFeatures() {
             ArffLoader loader = new ArffLoader();
 
             try {
-                loader.setSource(new File(options.getInstances().get(0)));
+                loader.setSource(new File(options.getArffInstancesFiles().get(0)));
                 trainInstances = loader.getDataSet();
                 structure = loader.getStructure();
             } catch (IOException e) {