Skip to content
Snippets Groups Projects
Commit b16f4958 authored by Johannes Mey's avatar Johannes Mey
Browse files

comment aco,emfer, and some runs

parent c58b21d5
Branches
Tags
No related merge requests found
...@@ -12,9 +12,9 @@ repositories { ...@@ -12,9 +12,9 @@ repositories {
dependencies { dependencies {
compile project(':jastadd-mquat-base') compile project(':jastadd-mquat-base')
compile project(':jastadd-mquat-solver') 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-ilp')
compile project(':jastadd-mquat-solver-emfer') // compile project(':jastadd-mquat-solver-emfer')
compile project(':jastadd-mquat-solver-genetic') compile project(':jastadd-mquat-solver-genetic')
compile project(':jastadd-mquat-solver-random') compile project(':jastadd-mquat-solver-random')
compile project(':jastadd-mquat-solver-simple') compile project(':jastadd-mquat-solver-simple')
......
...@@ -6,8 +6,8 @@ import de.tudresden.inf.st.mquat.solving.ilp.ILPExternalSolver; ...@@ -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.genetic.GeneticSolver;
import de.tudresden.inf.st.mquat.solving.random.RandomSolver; import de.tudresden.inf.st.mquat.solving.random.RandomSolver;
import de.tudresden.inf.st.mquat.solving.simple.SimpleSolver; import de.tudresden.inf.st.mquat.solving.simple.SimpleSolver;
import ir.ac.ui.eng.ACOSolver; //import ir.ac.ui.eng.ACOSolver;
import uniks.EMFeRSolver; //import uniks.EMFeRSolver;
import java.util.Map; import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
...@@ -26,8 +26,8 @@ public class SolverFactory { ...@@ -26,8 +26,8 @@ public class SolverFactory {
private static Map<String, BenchmarkableSolver> createAvailableSolversIfNeeded() { private static Map<String, BenchmarkableSolver> createAvailableSolversIfNeeded() {
if (availableSolvers == null) { if (availableSolvers == null) {
availableSolvers = Stream.of( availableSolvers = Stream.of(
new ACOSolver(), // new ACOSolver(),
new EMFeRSolver(), // new EMFeRSolver(),
new ILPExternalSolver(), new ILPExternalSolver(),
new ILPDirectSolver(), new ILPDirectSolver(),
new SimpleSolver(), new SimpleSolver(),
......
...@@ -7,43 +7,44 @@ ...@@ -7,43 +7,44 @@
"ilp-direct", "ilp-direct",
"ilp-external", "ilp-external",
"random", "random",
"genetic", "genetic_NSGA2",
"genetic_SPEA2",
"simple" "simple"
], ],
"timeoutValue": 5, "timeoutValue": 1,
"timeoutUnit": "MINUTES", "timeoutUnit": "MINUTES",
"seed": 0, "seed": 0,
"sandBoxed": true, "sandBoxed": true,
"repetitions": 3, "repetitions": 1,
"scenarios": [ "scenarios": [
// { "id": 0, "name": "size0", "variants": 1, "requests": 1, "depth": 1, "resources": 1 }, // { "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": 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": 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": 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": 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": 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": 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": 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": 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": 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": 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": 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": 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": 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": 18, "name": "size_v2_q3_d3_r30", "variants": 2, "requests": 3, "depth": 4, "resources": 3.0 },
...@@ -51,29 +52,29 @@ ...@@ -51,29 +52,29 @@
{ "id": 19, "name": "size_v4_q1_d1_r15", "variants": 4, "requests": 1, "depth": 2, "resources": 1.5 }, { "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": 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": 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": 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": 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": 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": 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": 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": 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": 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": 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": 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": 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": 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": 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 }, // { "id": 0, "name": "trivial", "variants": 1, "requests": 1, "depth": 1, "resources": 1 },
......
...@@ -4,9 +4,9 @@ include ':jastadd-mquat-base' ...@@ -4,9 +4,9 @@ include ':jastadd-mquat-base'
include ':jastadd-mquat-benchmark' include ':jastadd-mquat-benchmark'
include ':jastadd-mquat-solver' include ':jastadd-mquat-solver'
include ':jastadd-mquat-solver-ilp' include ':jastadd-mquat-solver-ilp'
include ':jastadd-mquat-solver-emfer' //include ':jastadd-mquat-solver-emfer'
include ':jastadd-mquat-solver-genetic' include ':jastadd-mquat-solver-genetic'
include ':jastadd-mquat-solver-random' include ':jastadd-mquat-solver-random'
include ':jastadd-mquat-solver-simple' include ':jastadd-mquat-solver-simple'
include 'jastadd-mquat-solver-aco' //include 'jastadd-mquat-solver-aco'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment