Pull-Request final Version BA ACO

.gitignore

@@ -112,3 +112,4 @@ gradle-app.setting
 
 ## Local properties
 local.properties
+ant.log

app/build.gradle

@@ -64,12 +64,12 @@ task checkstyle(type: Checkstyle) {
 }
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.3'
     defaultConfig {
         applicationId "org.mate"
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -97,7 +97,7 @@ android {
 
 dependencies {
     implementation 'com.android.support:appcompat-v7:28.0.0'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
     implementation 'com.android.support.test:runner:1.0.2'
 }

app/src/androidTest/java/org/mate/ExecuteMATEAntColony.java

@@ -0,0 +1,20 @@
+package org.mate;
+
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class ExecuteMATEAntColony {
+
+
+    @Test
+    public void useAppContext() throws Exception {
+
+        MATE.log_acc("Starting Ant Colony Exploration...");
+
+        MATE mate = new MATE();
+        mate.testApp("AntColonyExploration");
+    }
+}

app/src/main/java/org/mate/MATE.java

@@ -15,6 +15,7 @@
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.accessibility.AccessibilityWindowInfo;
 
+import org.mate.exploration.ant.AntColony;
 import org.mate.exploration.genetic.algorithm.RandomSearch;
 import org.mate.exploration.genetic.fitness.BranchDistanceFitnessFunction;
 import org.mate.exploration.genetic.fitness.BranchDistanceFitnessFunctionMultiObjective;
@@ -49,6 +50,8 @@
 import org.mate.exploration.genetic.fitness.TestLengthFitnessFunction;
 import org.mate.exploration.genetic.crossover.UniformSuiteCrossoverFunction;
 import org.mate.exploration.genetic.termination.NeverTerminationCondition;
+import org.mate.exploration.genetic.termination.TargetLineCoveredTerminationCondition;
+import org.mate.exploration.genetic.fitness.LineCoveredPercentageFitnessFunction;
 import org.mate.exploration.heuristical.HeuristicExploration;
 import org.mate.exploration.heuristical.RandomExploration;
 import org.mate.interaction.DeviceMgr;
@@ -251,6 +254,16 @@ public Void call() throws Exception {
                             .withTerminationCondition(IterTerminationCondition.TERMINATION_CONDITION_ID)
                             .build();
                     nsga.run();
+                } else if (explorationStrategy.equals("AntColonyExploration")) {
+                    uiAbstractionLayer = new UIAbstractionLayer(deviceMgr, packageName);
+
+                    AntColony antColony = new AntColony();
+                    antColony.run();
+
+                    if (Properties.STORE_COVERAGE()) {
+                        Registry.getEnvironmentManager().storeCoverageData(antColony, null);
+                        MATE.log_acc("Total coverage: " + Registry.getEnvironmentManager().getCombinedCoverage());
+                    }
                 } else if (explorationStrategy.equals("PrimitiveStandardGeneticAlgorithm")) {
                     uiAbstractionLayer = new UIAbstractionLayer(deviceMgr, packageName);
                     MATE.log_acc("Activities");
@@ -286,42 +299,25 @@ public Void call() throws Exception {
                     }
                 } else if (explorationStrategy.equals("StandardGeneticAlgorithm")) {
                     uiAbstractionLayer = new UIAbstractionLayer(deviceMgr, packageName);
-                    MATE.log_acc("Activities");
-                    for (String s : Registry.getEnvironmentManager().getActivityNames()) {
-                        MATE.log_acc("\t" + s);
-                    }
-
-                    if (Properties.COVERAGE() == Coverage.BRANCH_COVERAGE) {
-                        // init the CFG
-                        boolean isInit = Registry.getEnvironmentManager().initCFG();
-
-                        if (!isInit) {
-                            MATE.log("Couldn't initialise CFG! Aborting.");
-                            throw new IllegalStateException("Graph initialisation failed!");
-                        }
-                    }
 
                     final IGeneticAlgorithm<TestCase> genericGA = new GeneticAlgorithmBuilder()
                             .withAlgorithm(StandardGeneticAlgorithm.ALGORITHM_NAME)
                             .withChromosomeFactory(AndroidRandomChromosomeFactory.CHROMOSOME_FACTORY_ID)
                             .withSelectionFunction(FitnessProportionateSelectionFunction.SELECTION_FUNCTION_ID)
                             .withCrossoverFunction(TestCaseMergeCrossOverFunction.CROSSOVER_FUNCTION_ID)
                             .withMutationFunction(CutPointMutationFunction.MUTATION_FUNCTION_ID)
-                            .withFitnessFunction(BranchDistanceFitnessFunction.FITNESS_FUNCTION_ID)
-                            .withTerminationCondition(NeverTerminationCondition.TERMINATION_CONDITION_ID)
-                            .withPopulationSize(50)
-                            .withBigPopulationSize(100)
+                            .withFitnessFunction(LineCoveredPercentageFitnessFunction.FITNESS_FUNCTION_ID,
+                                    Properties.TARGET_LINE())
+                            .withTerminationCondition(TargetLineCoveredTerminationCondition.TERMINATION_CONDITION_ID)
+                            .withPopulationSize(20)
+                            .withBigPopulationSize(40)
                             .withMaxNumEvents(50)
                             .withPMutate(0.3)
                             .withPCrossover(0.7)
                             .build();
-                    TimeoutRun.timeoutRun(new Callable<Void>() {
-                        @Override
-                        public Void call() throws Exception {
-                            genericGA.run();
-                            return null;
-                        }
-                    }, MATE.TIME_OUT);
+
+                    TargetLineCoveredTerminationCondition.INSTANCE.setGeneticAlgorithm(genericGA);
+                    genericGA.run();
 
                     if (Properties.STORE_COVERAGE()) {
                         if (Properties.COVERAGE() == Coverage.BRANCH_COVERAGE) {
@@ -398,15 +394,8 @@ public Void call() throws Exception {
                         MATE.log_acc("\t" + s);
                     }
 
-                    final RandomExploration randomExploration = new RandomExploration(50);
-
-                    TimeoutRun.timeoutRun(new Callable<Void>() {
-                        @Override
-                        public Void call() throws Exception {
-                            randomExploration.run();
-                            return null;
-                        }
-                    }, MATE.TIME_OUT);
+                    final RandomExploration randomExploration = new RandomExploration(Properties.STORE_COVERAGE(), true, 50);
+                    randomExploration.run();
 
                     if (Properties.STORE_COVERAGE()) {
                         Registry.getEnvironmentManager().storeCoverageData(randomExploration, null);

app/src/main/java/org/mate/Properties.java

@@ -125,6 +125,10 @@ public static Coverage COVERAGE() {
         return propertyOr(Coverage.LINE_COVERAGE);
     }
 
+    public static String TARGET_LINE() {
+        return propertyOr(null);
+    }
+
 
 
     // Primitive actions or widget based actions?