Include origin of instances in file names

Author: oshando

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

@@ -107,7 +107,7 @@ public Instances convertToMekaInstances(Instances instances) {
             output = Filter.useFilter(instances, filter);
             output.setRelationName("swan-srm:" + output.relationName());
 
-            Util.exportInstancesToArff(output);
+            Util.exportInstancesToArff(output, "meka");
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -36,7 +36,7 @@ public void createFeatures() {
             String instanceName = category.getId().toLowerCase() + "-train-instances";
             Instances trainInstances = createInstances(trainAttributes, dataset.getTrainMethods(), Collections.singleton(category));
             this.instances.put(category.getId().toLowerCase(), trainInstances);
-            Util.exportInstancesToArff(trainInstances);
+            Util.exportInstancesToArff(trainInstances, "weka");
 
             //Create and set attributes for the test instances.
             /*ArrayList<Attribute> testAttributes = createAttributes(getCategories(category), testData.getMethods(), featureSets);

swan-pipeline/src/main/java/de/fraunhofer/iem/swan/model/toolkit/MLPlan.java

@@ -49,7 +49,7 @@ public MLPlan() {
      */
     public HashMap<String, ArrayList<Double>> evaluateDataset(Instances instances1) {
 
-        String arffFilePath = Util.exportInstancesToArff(instances1);
+        String arffFilePath = Util.exportInstancesToArff(instances1, "mlplan");
         ArffDatasetAdapter arffDatasetAdapter = new ArffDatasetAdapter();
 
         String mClass = Util.getClassName(instances1);
@@ -148,7 +148,7 @@ public HashMap<String, ArrayList<Double>> evaluateDataset(Instances instances1)
     public void evaluateDataset(Instances instances, int k) {
 
         //arffFilePath = "swan/swan_core/src/main/resources/waveform.arff";
-        String arffFilePath = Util.exportInstancesToArff(instances);
+        String arffFilePath = Util.exportInstancesToArff(instances, "mlplan");
         ArffDatasetAdapter arffDatasetAdapter = new ArffDatasetAdapter();
 
         String mClass = Util.getClassName(instances);

swan-pipeline/src/main/java/de/fraunhofer/iem/swan/util/Util.java

@@ -294,10 +294,10 @@ public static String getClassName(Instances instances) {
      *
      * @param instances WEKA instances to be exported
      */
-    public static String exportInstancesToArff(Instances instances) {
+    public static String exportInstancesToArff(Instances instances, String source) {
         ArffSaver saver = new ArffSaver();
 
-        if (SwanPipeline.options.isExportArffData() && !SwanPipeline.options.getOutputDir().isEmpty() ) {
+        if (SwanPipeline.options.isExportArffData() && !SwanPipeline.options.getOutputDir().isEmpty()) {
             // Save arff data.
             saver.setInstances(instances);
 
@@ -308,16 +308,15 @@ public static String exportInstancesToArff(Instances instances) {
                 if (instances.relationName().contains(":"))
                     relationName = relationName.substring(0, instances.relationName().indexOf(":"));
 
-                String arffFile = SwanPipeline.options.getOutputDir() + File.separator + "arff-data" + File.separator + relationName + ".arff";
+                String arffFile = SwanPipeline.options.getOutputDir() + File.separator + "arff-data" + File.separator + relationName + "-" + source + ".arff";
                 saver.setFile(new File(arffFile));
                 saver.writeBatch();
             } catch (IOException e) {
                 e.printStackTrace();
             }
             return saver.retrieveFile().getAbsolutePath();
         }
-
-     return null;
+        return null;
     }
 
     /**