diff --git a/jastadd-mquat-solver-aco/src/main/java/ir/ac/ui/eng/ACOSolver.java b/jastadd-mquat-solver-aco/src/main/java/ir/ac/ui/eng/ACOSolver.java index 2de63bd38845180303780ea665f33857dc762417..3df22f147fc9e64c198df6d8ca4201acdfb07da3 100644 --- a/jastadd-mquat-solver-aco/src/main/java/ir/ac/ui/eng/ACOSolver.java +++ b/jastadd-mquat-solver-aco/src/main/java/ir/ac/ui/eng/ACOSolver.java @@ -47,6 +47,16 @@ public class ACOSolver implements BenchmarkableSolver { reset(); } + public ACOSolver setPopulation_size(int population_size) { + this.population_size = population_size; + return this; + } + + public ACOSolver setIteration_size(int iteration_size) { + this.iteration_size = iteration_size; + return this; + } + public Assignment ACOCreateSoftwareAssignment(Request request, Component component, boolean topLevel, int i) { Assignment assignment = new Assignment(); assignment.setRequest(request); @@ -110,7 +120,7 @@ public class ACOSolver implements BenchmarkableSolver { for (int pop = 0; pop < population_size; pop++) { - System.out.println("pop: " + pop); + logger.trace("pop: {}", pop); Solution currentSolution = new Solution(); currentSolution.setModel(model); de.tudresden.inf.st.mquat.jastadd.model.List<Request> requests = model.getRequests(); @@ -174,7 +184,7 @@ public class ACOSolver implements BenchmarkableSolver { } if(isHardwareValid == true){ numSoftwareSolutions++; - System.out.println("valid:" + numSoftwareSolutions); + logger.trace("valid: {}", numSoftwareSolutions); Solution clone = currentSolution.deepCopy(); currentSolutions.add(clone); currentPossibleResources.add(possibleResources); 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 603967d6c60e2e1bde6333680f8577be54640690..1ab605f95823022c0fb0c682f1d9d370859bc55f 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(); + return new ACOSolver().setPopulation_size(100); } }