From b16f4958c0ac1dd2e43c97ba432ad760dac0bf14 Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Fri, 7 Dec 2018 14:30:56 +0100
Subject: [PATCH] comment aco,emfer, and some runs
---
jastadd-mquat-benchmark/build.gradle | 4 +-
.../inf/st/mquat/benchmark/SolverFactory.java | 8 +--
.../src/main/resources/scenarios.json | 49 ++++++++++---------
settings.gradle | 4 +-
4 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/jastadd-mquat-benchmark/build.gradle b/jastadd-mquat-benchmark/build.gradle
index 9453101..f694b25 100644
--- a/jastadd-mquat-benchmark/build.gradle
+++ b/jastadd-mquat-benchmark/build.gradle
@@ -12,9 +12,9 @@ repositories {
dependencies {
compile project(':jastadd-mquat-base')
compile project(':jastadd-mquat-solver')
- compile project(':jastadd-mquat-solver-aco')
+// compile project(':jastadd-mquat-solver-aco')
compile project(':jastadd-mquat-solver-ilp')
- compile project(':jastadd-mquat-solver-emfer')
+// compile project(':jastadd-mquat-solver-emfer')
compile project(':jastadd-mquat-solver-genetic')
compile project(':jastadd-mquat-solver-random')
compile project(':jastadd-mquat-solver-simple')
diff --git a/jastadd-mquat-benchmark/src/main/java/de/tudresden/inf/st/mquat/benchmark/SolverFactory.java b/jastadd-mquat-benchmark/src/main/java/de/tudresden/inf/st/mquat/benchmark/SolverFactory.java
index 7cf92ce..93fe668 100644
--- a/jastadd-mquat-benchmark/src/main/java/de/tudresden/inf/st/mquat/benchmark/SolverFactory.java
+++ b/jastadd-mquat-benchmark/src/main/java/de/tudresden/inf/st/mquat/benchmark/SolverFactory.java
@@ -6,8 +6,8 @@ import de.tudresden.inf.st.mquat.solving.ilp.ILPExternalSolver;
import de.tudresden.inf.st.mquat.solving.genetic.GeneticSolver;
import de.tudresden.inf.st.mquat.solving.random.RandomSolver;
import de.tudresden.inf.st.mquat.solving.simple.SimpleSolver;
-import ir.ac.ui.eng.ACOSolver;
-import uniks.EMFeRSolver;
+//import ir.ac.ui.eng.ACOSolver;
+//import uniks.EMFeRSolver;
import java.util.Map;
import java.util.function.Function;
@@ -26,8 +26,8 @@ public class SolverFactory {
private static Map<String, BenchmarkableSolver> createAvailableSolversIfNeeded() {
if (availableSolvers == null) {
availableSolvers = Stream.of(
- new ACOSolver(),
- new EMFeRSolver(),
+// new ACOSolver(),
+// new EMFeRSolver(),
new ILPExternalSolver(),
new ILPDirectSolver(),
new SimpleSolver(),
diff --git a/jastadd-mquat-benchmark/src/main/resources/scenarios.json b/jastadd-mquat-benchmark/src/main/resources/scenarios.json
index 37a8f42..2499e06 100644
--- a/jastadd-mquat-benchmark/src/main/resources/scenarios.json
+++ b/jastadd-mquat-benchmark/src/main/resources/scenarios.json
@@ -7,43 +7,44 @@
"ilp-direct",
"ilp-external",
"random",
- "genetic",
+ "genetic_NSGA2",
+ "genetic_SPEA2",
"simple"
],
- "timeoutValue": 5,
+ "timeoutValue": 1,
"timeoutUnit": "MINUTES",
"seed": 0,
"sandBoxed": true,
- "repetitions": 3,
+ "repetitions": 1,
"scenarios": [
// { "id": 0, "name": "size0", "variants": 1, "requests": 1, "depth": 1, "resources": 1 },
{ "id": 1, "name": "size_v2_q1_d1_r15", "variants": 2, "requests": 1, "depth": 2, "resources": 1.5 },
{ "id": 2, "name": "size_v2_q1_d2_r15", "variants": 2, "requests": 1, "depth": 3, "resources": 1.5 },
- { "id": 3, "name": "size_v2_q1_d3_r15", "variants": 2, "requests": 1, "depth": 4, "resources": 1.5 },
+// { "id": 3, "name": "size_v2_q1_d3_r15", "variants": 2, "requests": 1, "depth": 4, "resources": 1.5 },
{ "id": 4, "name": "size_v2_q2_d1_r15", "variants": 2, "requests": 2, "depth": 2, "resources": 1.5 },
{ "id": 5, "name": "size_v2_q2_d2_r15", "variants": 2, "requests": 2, "depth": 3, "resources": 1.5 },
- { "id": 6, "name": "size_v2_q2_d3_r15", "variants": 2, "requests": 2, "depth": 4, "resources": 1.5 },
+// { "id": 6, "name": "size_v2_q2_d3_r15", "variants": 2, "requests": 2, "depth": 4, "resources": 1.5 },
- { "id": 7, "name": "size_v2_q3_d1_r15", "variants": 2, "requests": 3, "depth": 2, "resources": 1.5 },
- { "id": 8, "name": "size_v2_q3_d2_r15", "variants": 2, "requests": 3, "depth": 3, "resources": 1.5 },
- { "id": 9, "name": "size_v2_q3_d3_r15", "variants": 2, "requests": 3, "depth": 4, "resources": 1.5 },
+// { "id": 7, "name": "size_v2_q3_d1_r15", "variants": 2, "requests": 3, "depth": 2, "resources": 1.5 },
+// { "id": 8, "name": "size_v2_q3_d2_r15", "variants": 2, "requests": 3, "depth": 3, "resources": 1.5 },
+// { "id": 9, "name": "size_v2_q3_d3_r15", "variants": 2, "requests": 3, "depth": 4, "resources": 1.5 },
{ "id": 10, "name": "size_v2_q1_d1_r30", "variants": 2, "requests": 1, "depth": 2, "resources": 3.0 },
{ "id": 11, "name": "size_v2_q1_d2_r30", "variants": 2, "requests": 1, "depth": 3, "resources": 3.0 },
- { "id": 12, "name": "size_v2_q1_d3_r30", "variants": 2, "requests": 1, "depth": 4, "resources": 3.0 },
+// { "id": 12, "name": "size_v2_q1_d3_r30", "variants": 2, "requests": 1, "depth": 4, "resources": 3.0 },
{ "id": 13, "name": "size_v2_q2_d1_r30", "variants": 2, "requests": 2, "depth": 2, "resources": 3.0 },
{ "id": 14, "name": "size_v2_q2_d2_r30", "variants": 2, "requests": 2, "depth": 3, "resources": 3.0 },
- { "id": 15, "name": "size_v2_q2_d3_r30", "variants": 2, "requests": 2, "depth": 4, "resources": 3.0 },
+// { "id": 15, "name": "size_v2_q2_d3_r30", "variants": 2, "requests": 2, "depth": 4, "resources": 3.0 },
- { "id": 16, "name": "size_v2_q3_d1_r30", "variants": 2, "requests": 3, "depth": 2, "resources": 3.0 },
- { "id": 17, "name": "size_v2_q3_d2_r30", "variants": 2, "requests": 3, "depth": 3, "resources": 3.0 },
- { "id": 18, "name": "size_v2_q3_d3_r30", "variants": 2, "requests": 3, "depth": 4, "resources": 3.0 },
+// { "id": 16, "name": "size_v2_q3_d1_r30", "variants": 2, "requests": 3, "depth": 2, "resources": 3.0 },
+// { "id": 17, "name": "size_v2_q3_d2_r30", "variants": 2, "requests": 3, "depth": 3, "resources": 3.0 },
+// { "id": 18, "name": "size_v2_q3_d3_r30", "variants": 2, "requests": 3, "depth": 4, "resources": 3.0 },
@@ -51,29 +52,29 @@
{ "id": 19, "name": "size_v4_q1_d1_r15", "variants": 4, "requests": 1, "depth": 2, "resources": 1.5 },
{ "id": 20, "name": "size_v4_q1_d2_r15", "variants": 4, "requests": 1, "depth": 3, "resources": 1.5 },
- { "id": 21, "name": "size_v4_q1_d3_r15", "variants": 4, "requests": 1, "depth": 4, "resources": 1.5 },
+// { "id": 21, "name": "size_v4_q1_d3_r15", "variants": 4, "requests": 1, "depth": 4, "resources": 1.5 },
{ "id": 22, "name": "size_v4_q2_d1_r15", "variants": 4, "requests": 2, "depth": 2, "resources": 1.5 },
{ "id": 23, "name": "size_v4_q2_d2_r15", "variants": 4, "requests": 2, "depth": 3, "resources": 1.5 },
- { "id": 24, "name": "size_v4_q2_d3_r15", "variants": 4, "requests": 2, "depth": 4, "resources": 1.5 },
+// { "id": 24, "name": "size_v4_q2_d3_r15", "variants": 4, "requests": 2, "depth": 4, "resources": 1.5 },
- { "id": 25, "name": "size_v4_q3_d1_r15", "variants": 4, "requests": 3, "depth": 2, "resources": 1.5 },
- { "id": 26, "name": "size_v4_q3_d2_r15", "variants": 4, "requests": 3, "depth": 3, "resources": 1.5 },
- { "id": 27, "name": "size_v4_q3_d3_r15", "variants": 4, "requests": 3, "depth": 4, "resources": 1.5 },
+// { "id": 25, "name": "size_v4_q3_d1_r15", "variants": 4, "requests": 3, "depth": 2, "resources": 1.5 },
+// { "id": 26, "name": "size_v4_q3_d2_r15", "variants": 4, "requests": 3, "depth": 3, "resources": 1.5 },
+// { "id": 27, "name": "size_v4_q3_d3_r15", "variants": 4, "requests": 3, "depth": 4, "resources": 1.5 },
{ "id": 28, "name": "size_v4_q1_d1_r30", "variants": 4, "requests": 1, "depth": 2, "resources": 3.0 },
{ "id": 29, "name": "size_v4_q1_d2_r30", "variants": 4, "requests": 1, "depth": 3, "resources": 3.0 },
- { "id": 30, "name": "size_v4_q1_d3_r30", "variants": 4, "requests": 1, "depth": 4, "resources": 3.0 },
+// { "id": 30, "name": "size_v4_q1_d3_r30", "variants": 4, "requests": 1, "depth": 4, "resources": 3.0 },
{ "id": 31, "name": "size_v4_q2_d1_r30", "variants": 4, "requests": 2, "depth": 2, "resources": 3.0 },
- { "id": 32, "name": "size_v4_q2_d2_r30", "variants": 4, "requests": 2, "depth": 3, "resources": 3.0 },
- { "id": 33, "name": "size_v4_q2_d3_r30", "variants": 4, "requests": 2, "depth": 4, "resources": 3.0 },
+ { "id": 32, "name": "size_v4_q2_d2_r30", "variants": 4, "requests": 2, "depth": 3, "resources": 3.0 }
+// { "id": 33, "name": "size_v4_q2_d3_r30", "variants": 4, "requests": 2, "depth": 4, "resources": 3.0 },
- { "id": 34, "name": "size_v4_q3_d1_r30", "variants": 4, "requests": 3, "depth": 2, "resources": 3.0 },
- { "id": 35, "name": "size_v4_q3_d2_r30", "variants": 4, "requests": 3, "depth": 3, "resources": 3.0 },
- { "id": 36, "name": "size_v4_q3_d3_r30", "variants": 4, "requests": 3, "depth": 4, "resources": 3.0 }
+// { "id": 34, "name": "size_v4_q3_d1_r30", "variants": 4, "requests": 3, "depth": 2, "resources": 3.0 },
+// { "id": 35, "name": "size_v4_q3_d2_r30", "variants": 4, "requests": 3, "depth": 3, "resources": 3.0 },
+// { "id": 36, "name": "size_v4_q3_d3_r30", "variants": 4, "requests": 3, "depth": 4, "resources": 3.0 }
// { "id": 0, "name": "trivial", "variants": 1, "requests": 1, "depth": 1, "resources": 1 },
diff --git a/settings.gradle b/settings.gradle
index eeaefce..431b501 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,9 +4,9 @@ include ':jastadd-mquat-base'
include ':jastadd-mquat-benchmark'
include ':jastadd-mquat-solver'
include ':jastadd-mquat-solver-ilp'
-include ':jastadd-mquat-solver-emfer'
+//include ':jastadd-mquat-solver-emfer'
include ':jastadd-mquat-solver-genetic'
include ':jastadd-mquat-solver-random'
include ':jastadd-mquat-solver-simple'
-include 'jastadd-mquat-solver-aco'
+//include 'jastadd-mquat-solver-aco'
--
GitLab