diff --git a/jastadd-mquat-benchmark/build.gradle b/jastadd-mquat-benchmark/build.gradle index 8af65710869459ddde81c454925f1e17388b603d..75a95b1bc018bcb60a39e804896f6b7f7bbad979 100644 --- a/jastadd-mquat-benchmark/build.gradle +++ b/jastadd-mquat-benchmark/build.gradle @@ -12,12 +12,12 @@ 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-genetic') - compile project(':jastadd-mquat-solver-random') - compile project(':jastadd-mquat-solver-simple') +// compile project(':jastadd-mquat-solver-emfer') +// compile project(':jastadd-mquat-solver-genetic') +// compile project(':jastadd-mquat-solver-random') +// compile project(':jastadd-mquat-solver-simple') compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.8.1' compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.10.0' compile "org.gradle:gradle-tooling-api:${toolingApiVersion}" 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 30d9a80c57a80a7b9be22b2f294e859177f49ea2..0dae7bbc67ef172b34e6f4838eca962b3560dcc5 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,12 +4,12 @@ import de.tudresden.inf.st.mquat.solving.BenchmarkableSolver; import de.tudresden.inf.st.mquat.solving.ilp.GLPKSolver; import de.tudresden.inf.st.mquat.solving.ilp.GurobiSolver; import de.tudresden.inf.st.mquat.solving.ilp.ILPDirectSolver; -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.ilp.SCIPSolver; -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 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 java.util.Map; import java.util.function.Function; @@ -28,15 +28,15 @@ public class SolverFactory { private static Map<String, BenchmarkableSolver> createAvailableSolversIfNeeded() { if (availableSolvers == null) { availableSolvers = Stream.of( - new ACOSolver(), - new EMFeRSolver(), +// new ACOSolver(), +// new EMFeRSolver(), new GLPKSolver(), new SCIPSolver(), new GurobiSolver(), - new ILPDirectSolver(), - new SimpleSolver(), - new RandomSolver(0, 0), - new GeneticSolver() + new ILPDirectSolver() +// new SimpleSolver(), +// new RandomSolver(0, 0), +// new GeneticSolver() ).collect(Collectors.toMap(BenchmarkableSolver::getName, Function.identity())); } return availableSolvers; diff --git a/settings.gradle b/settings.gradle index afcd7667861e5a4c1306fd6e76b0aabe4f386a58..a4017275fda2786aac35d78a210c48c71c3d92cb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,9 +5,9 @@ include ':jastadd-mquat-benchmark' include ':jastadd-mquat-solver' include ':jastadd-mquat-solver-ilp' include ':jastadd-mquat-solver-abi' -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-emfer' +// include ':jastadd-mquat-solver-genetic' +// include ':jastadd-mquat-solver-random' +// include ':jastadd-mquat-solver-simple' +// include 'jastadd-mquat-solver-aco'