diff --git a/src/main/java/app/controller/settings/RandomSettingsGenerator.java b/src/main/java/app/controller/settings/RandomSettingsGenerator.java index 38b6d44b..9625628c 100644 --- a/src/main/java/app/controller/settings/RandomSettingsGenerator.java +++ b/src/main/java/app/controller/settings/RandomSettingsGenerator.java @@ -359,4 +359,13 @@ private static boolean timeout() { return time < MAX_TIME; } + + public static void clearRandomGenerator() + { + obstacles.clear(); + lShape.clear(); + uShape.clear(); + iShape.clear(); + tShape.clear(); + } } diff --git a/src/test/java/experiments/Experiments.java b/src/test/java/experiments/Experiments.java index 013effad..ce28cb95 100644 --- a/src/test/java/experiments/Experiments.java +++ b/src/test/java/experiments/Experiments.java @@ -20,7 +20,7 @@ public class Experiments */ public static void main(String[] args) { - runCapture(); + runEvasion(); } private static void runCoverage(String map_name) @@ -135,7 +135,7 @@ private static void runCapture() public static void runEvasion() { StateTable.setDefaultCaptureAgent(AgentType.CAPTURE); - StateTable.setDefaultEvasionAgent(AgentType.EVASION_DIRECTED); + StateTable.setDefaultEvasionAgent(AgentType.EVASION_RANDOM); final String testName = "Evasion_Experiment_" + StateTable.getDefaultCaptureAgent() + "_" + @@ -189,6 +189,7 @@ private static void runInfiltration(String map_name) private static Map generateRandomMap() { + RandomSettingsGenerator.clearRandomGenerator(); Settings settings = RandomSettingsGenerator.generateRandomSettings(); settings.setNoOfGuards(1); settings.setNoOfIntruders(1);