From 2619ab883c6034f2c2b2c26a1537e4f1b950e4a8 Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Wed, 18 Jul 2018 17:08:48 +0200
Subject: [PATCH] add both random and genetic to benchmarks. note, that gnetic
ignores the timeout and random always times out. also, tests take VERY long
with genetic.
---
.../java/de/tudresden/inf/st/mquat/benchmark/SolverFactory.java | 2 ++
jastadd-mquat-benchmark/src/main/resources/scenarios.json | 2 ++
2 files changed, 4 insertions(+)
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 cdfe604..7e9e463 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
@@ -4,6 +4,7 @@ import de.tudresden.inf.st.mquat.solving.BenchmarkableSolver;
import de.tudresden.inf.st.mquat.solving.ilp.ILPDirectSolver;
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;
@@ -30,6 +31,7 @@ public class SolverFactory {
new ILPExternalSolver(),
new ILPDirectSolver(),
new SimpleSolver(),
+ new RandomSolver(),
new GeneticSolver()
).collect(Collectors.toMap(BenchmarkableSolver::getName, Function.identity()));
}
diff --git a/jastadd-mquat-benchmark/src/main/resources/scenarios.json b/jastadd-mquat-benchmark/src/main/resources/scenarios.json
index 564e51f..e9163b0 100644
--- a/jastadd-mquat-benchmark/src/main/resources/scenarios.json
+++ b/jastadd-mquat-benchmark/src/main/resources/scenarios.json
@@ -6,6 +6,8 @@
"emfer",
"ilp-direct",
// "ilp-external",
+ "random",
+ "genetic",
"simple"
],
"timeoutValue": 15,
--
GitLab