From 01f3a880a89591eca4570a95a5f8b96a0572157a Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Thu, 14 Jun 2018 12:58:54 +0200
Subject: [PATCH] Small modification to reduce output volume and test time.
---
.../src/main/java/ir/ac/ui/eng/ACOSolver.java | 14 ++++++++++++--
.../test/java/ir/ac/ui/eng/ACOHandwrittenTest.java | 2 +-
2 files changed, 13 insertions(+), 3 deletions(-)
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 2de63bd..3df22f1 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 603967d..1ab605f 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);
}
}
--
GitLab