Merge pull request #4 from secure-software-engineering/feature/interruptable

Make Learner Algorithm interruptable

Author: ingo-budde

swan_core/src/main/java/de/fraunhofer/iem/swan/Learner.java

@@ -1,15 +1,21 @@
 package de.fraunhofer.iem.swan;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.Random;
+import java.util.Set;
 
 import de.fraunhofer.iem.swan.data.Category;
 import de.fraunhofer.iem.swan.data.Method;
-
 import weka.classifiers.Evaluation;
 import weka.classifiers.bayes.BayesNet;
 import weka.classifiers.bayes.NaiveBayes;
@@ -53,7 +59,7 @@ public Learner(Writer writer) {
 
     public double classify(Set<Method> trainingSet, Set<Method> testSet,
                            Map<Category, Set<IFeature>> features, Set<Category> categories,
-                           String outputFile, boolean cweMode) throws IOException {
+                           String outputFile, boolean cweMode) throws IOException, InterruptedException {
 
 
         double fmeasure = 0;
@@ -317,6 +323,9 @@ sb, new Range(attributes.indexOf(idAttr) + 1
         writer.writeResultsToFiles(outputFile, methods, categories);
         //writer.writeResultsToFilesQWEL(outputFile, methods, categories);
 
+        if (Thread.currentThread().isInterrupted()) {
+        	throw new InterruptedException();
+        }
         Runtime.getRuntime().gc();
         analysisTime = System.currentTimeMillis() - startAnalysisTime;
         System.out.println("Time to classify " + categories.toString() + ": " + analysisTime + " ms");

swan_core/src/main/java/de/fraunhofer/iem/swan/Main.java

@@ -61,6 +61,8 @@ public static void main(String[] args) {
 			// System.out.println("Done.");
 		} catch (IOException e) {
 			e.printStackTrace();
+		} catch (InterruptedException e) {
+			e.printStackTrace();
 		}
 	}
 
@@ -89,8 +91,9 @@ public static void main(String[] args) {
 	 * @param outputDir       Directory where the output should be written.
 	 * @throws IOException In case an error occurs during the preparation or
 	 *                     execution of the analysis.
+	 * @throws InterruptedException 
 	 */
-	public void run(String sourceDir, String outputDir) throws IOException {
+	public void run(String sourceDir, String outputDir) throws IOException, InterruptedException {
 		run(sourceDir, null, null, outputDir);
 	}
 
@@ -108,8 +111,9 @@ public void run(String sourceDir, String outputDir) throws IOException {
 	 * @param outputDir       Directory where the output should be written.
 	 * @throws IOException In case an error occurs during the preparation or
 	 *                     execution of the analysis.
+	 * @throws InterruptedException 
 	 */
-	public void run(String sourceDir, String trainSourceCode, String trainJson, String outputDir) throws IOException {
+	public void run(String sourceDir, String trainSourceCode, String trainJson, String outputDir) throws IOException, InterruptedException {
 
 		// This helper object keeps track of created temporary directories and files to
 		// to be deleted before exiting the
@@ -138,7 +142,7 @@ public void run(String sourceDir, String trainSourceCode, String trainJson, Stri
 	}
 
 	private void internalRun(String sourceDir, String trainSourceCode, String trainJson, String outputDir)
-			throws IOException {
+			throws IOException, InterruptedException {
 
 		int iterations = 0;
 		if (runOAT)
@@ -236,7 +240,7 @@ private void internalRun(String sourceDir, String trainSourceCode, String trainJ
 
 	}
 
-	private double runClassifier(HashSet<Category> categories, boolean cweMode) throws IOException {
+	private double runClassifier(HashSet<Category> categories, boolean cweMode) throws IOException, InterruptedException {
 		parser.resetMethods();
 		loader.resetMethods();
 		// System.out.println("***** Starting classification for " +