Fix suggest algorithm bugs

Author: oshando

swan_assist/build.gradle

@@ -10,6 +10,7 @@ sourceCompatibility = 1.8
 
 repositories {
     mavenCentral()
+    mavenLocal()
 }
 
 dependencies {

swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/suggest/SuggestAction.java

@@ -12,21 +12,16 @@
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.util.messages.MessageBus;
 import de.fraunhofer.iem.swan.assist.comm.SuggestNotifier;
 import de.fraunhofer.iem.swan.assist.data.JSONFileLoader;
-import de.fraunhofer.iem.swan.assist.ui.dialog.SwanLauncherDialog;
+import de.fraunhofer.iem.swan.assist.data.PropertiesManager;
 import de.fraunhofer.iem.swan.assist.util.Constants;
 
-import java.io.File;
-import java.util.HashMap;
-
 public class SuggestAction extends AnAction {
 
     /**
      * Obtains suggested methods from SWAN and loads them in a dialog for user classification.
-     *
      * @param e source event
      */
     @Override
@@ -36,50 +31,17 @@ public void actionPerformed(AnActionEvent e) {
         MessageBus messageBus = project.getMessageBus();
 
         //Set output directory for plugin, if not set
-        if (!PropertiesComponent.getInstance(project).isValueSet(Constants.SWAN_OUTPUT_DIR)) {
-
-            setProjectPath(project);
-        } else {
-            File trainFile = new File(PropertiesComponent.getInstance(project).getValue(Constants.SWAN_OUTPUT_DIR));
-
-            if (!trainFile.exists())
-                setProjectPath(project);
-        }
+        PropertiesManager.setProjectOutputPath(project);
 
         SuggestThread suggestThread = new SuggestThread(project,
-                "/Users/oshando/Projects/IdeaProjects/mois-evaluation/mois-rq3/resources/gxa-methods-r.json",
-                "/Users/oshando/Projects/IdeaProjects/mois-evaluation/mois-executor/project-jars/gxa"
-        );
+                PropertiesComponent.getInstance(project).getValue(Constants.SWAN_CONFIG_FILE),
+                PropertiesComponent.getInstance(project).getValue(Constants.SWAN_SOURCE_DIR));
         suggestThread.start();
 
         SuggestNotifier suggestNotifier = messageBus.syncPublisher(SuggestNotifier.SUGGEST_METHOD_TOPIC);
         suggestNotifier.startSuggestMethod();
     }
 
-    private void setProjectPath(Project project) {
-
-        //Launch SWAN Properties Dialog
-        SwanLauncherDialog dialog = new SwanLauncherDialog(project, true);
-        dialog.show();
-
-        if (dialog.getExitCode() == DialogWrapper.OK_EXIT_CODE) {
-
-            HashMap<String, String> swanParameters = dialog.getParameters();
-
-            File outputFolder = new File(swanParameters.get(Constants.SWAN_OUTPUT_DIR));
-
-            if(!outputFolder.exists())
-                outputFolder.mkdir();
-
-            PropertiesComponent.getInstance(project).setValue(Constants.SWAN_OUTPUT_DIR, swanParameters.get(Constants.SWAN_OUTPUT_DIR));
-
-
-
-
-            System.out.println("Set project path: : "+ swanParameters.get(Constants.SWAN_OUTPUT_DIR));
-        }
-    }
-
     /**
      * Controls whether the action is enabled or disabled
      *

swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/suggest/SuggestThread.java

@@ -70,9 +70,8 @@ public void run() {
         boolean methodPairFound = false;
 
         //Get training methods
-        Set<String> trainingMethods = new HashSet<>();
         TrainingFileManager trainingFileManager = new TrainingFileManager(project);
-        trainingMethods = trainingFileManager.getTrainingMethods().keySet();
+        Set<String> trainingMethods = new HashSet<>(trainingFileManager.getTrainingMethods().keySet());
         trainingMethods.addAll(MethodListTree.suggestedMethodsList);
 
         while (!methodPairFound) {
@@ -81,20 +80,15 @@ public void run() {
 
             if (methodPair != null) {
 
-                System.out.println("SUGMET: " + methodPair.getMethod1().getSignature(true) + " " + methodPair.getMethod2().getSignature(true));
-
                 if (trainingMethods.contains(methodPair.getMethod1().getSignature(true)) ||
                         trainingMethods.contains(methodPair.getMethod2().getSignature(true))) {
-
-                    System.out.println("skipping: " + methodPair.getMethod1().getSignature(true) + "\n" + methodPair.getMethod2().getSignature(true));
                     continue;
                 }
 
                 methodPair.getMethod1().setStatus(MethodWrapper.MethodStatus.SUGGESTED);
                 suggestedMethods.add(methodPair.getMethod1());
                 methodPair.getMethod2().setStatus(MethodWrapper.MethodStatus.SUGGESTED);
                 suggestedMethods.add(methodPair.getMethod2());
-                System.out.println("adding: ");
                 methodPairFound = true;
             }
         }