From f3d81d3de681a090d265c78a2f5a8e2f6a7c8aeb Mon Sep 17 00:00:00 2001 From: rschoene <rene.schoene@tu-dresden.de> Date: Tue, 26 Jun 2018 20:29:49 +0200 Subject: [PATCH] ACO: Enlarge population and iteration size to (probably) always pass test_05. --- .../src/test/java/ir/ac/ui/eng/ACOHandwrittenTest.java | 2 +- .../tudresden/inf/st/mquat/solving/HandwrittenTestSuite.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jastadd-mquat-solver-aco/src/test/java/ir/ac/ui/eng/ACOHandwrittenTest.java b/jastadd-mquat-solver-aco/src/test/java/ir/ac/ui/eng/ACOHandwrittenTest.java index 1ab605f..7b6fbf0 100644 --- a/jastadd-mquat-solver-aco/src/test/java/ir/ac/ui/eng/ACOHandwrittenTest.java +++ b/jastadd-mquat-solver-aco/src/test/java/ir/ac/ui/eng/ACOHandwrittenTest.java @@ -11,6 +11,6 @@ import de.tudresden.inf.st.mquat.solving.Solver; public class ACOHandwrittenTest extends HandwrittenTestSuite { @Override protected Solver getSolver() { - return new ACOSolver().setPopulation_size(100); + return new ACOSolver().setPopulation_size(1000).setIteration_size(5); } } diff --git a/jastadd-mquat-solver/src/test/java/de/tudresden/inf/st/mquat/solving/HandwrittenTestSuite.java b/jastadd-mquat-solver/src/test/java/de/tudresden/inf/st/mquat/solving/HandwrittenTestSuite.java index 13d6099..d4ee2f2 100644 --- a/jastadd-mquat-solver/src/test/java/de/tudresden/inf/st/mquat/solving/HandwrittenTestSuite.java +++ b/jastadd-mquat-solver/src/test/java/de/tudresden/inf/st/mquat/solving/HandwrittenTestSuite.java @@ -13,6 +13,7 @@ import java.net.URL; import java.util.Iterator; import static org.hamcrest.core.IsEqual.equalTo; +import static org.junit.Assert.assertEquals; public abstract class HandwrittenTestSuite { private static Logger logger; @@ -72,7 +73,7 @@ public abstract class HandwrittenTestSuite { String instanceName, Assignment expectedProvidingAssignment) { Instance instance = requiringAssignment.getImplementation().resolveInstance(instanceName).get(); Assignment actualProvidingAssignment = requiringAssignment.mappedAssignment(instance); - Assert.assertEquals(String.format("Not matching assignment for %s", instanceName), + assertEquals(String.format("Not matching assignment for %s", instanceName), expectedProvidingAssignment, actualProvidingAssignment); } @@ -150,6 +151,8 @@ public abstract class HandwrittenTestSuite { assertComponentRequirement(configB,"delta", configD); assertComponentRequirement(configE,"phi", configF); assertComponentRequirement(configE,"gamma", configG); + assertEquals("Objective does not fit", 21885.66, + modelAndSolution.getSecondElement().computeObjective(), 0.01); } } -- GitLab