From 12dee0164c0b74cae1811841d047c61406e8b232 Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Fri, 1 Feb 2019 09:32:09 +0100
Subject: [PATCH] remove 'legacy' grouped mode, simplify single mode
---
jastadd-mquat-eris/build.gradle | 11 -------
.../de/tudresden/inf/st/mquat/eris/Main.java | 32 ++-----------------
2 files changed, 2 insertions(+), 41 deletions(-)
diff --git a/jastadd-mquat-eris/build.gradle b/jastadd-mquat-eris/build.gradle
index b04fd9d..d4b5345 100644
--- a/jastadd-mquat-eris/build.gradle
+++ b/jastadd-mquat-eris/build.gradle
@@ -45,15 +45,4 @@ task eris(type: JavaExec, dependsOn: assemble) {
if (project.hasProperty("scenario")) {
args(scenario.split(','))
}
-}
-
-task erisGrouped(type: JavaExec, dependsOn: assemble) {
- group "application"
- classpath = sourceSets.test.runtimeClasspath
- main = 'de.tudresden.inf.st.mquat.eris.Main'
- args = ['incremental']
- systemProperty "java.library.path", project.glpkPath
- if (project.hasProperty("scenario")) {
- args(scenario.split(','))
- }
}
\ No newline at end of file
diff --git a/jastadd-mquat-eris/src/main/java/de/tudresden/inf/st/mquat/eris/Main.java b/jastadd-mquat-eris/src/main/java/de/tudresden/inf/st/mquat/eris/Main.java
index d674bbe..7f95ba1 100644
--- a/jastadd-mquat-eris/src/main/java/de/tudresden/inf/st/mquat/eris/Main.java
+++ b/jastadd-mquat-eris/src/main/java/de/tudresden/inf/st/mquat/eris/Main.java
@@ -1,12 +1,5 @@
package de.tudresden.inf.st.mquat.eris;
-import de.tudresden.inf.st.mquat.benchmark.SolverFactory;
-import de.tudresden.inf.st.mquat.eris.coupling.ERISConnector;
-import de.tudresden.inf.st.mquat.jastadd.model.MquatWriteSettings;
-import de.tudresden.inf.st.mquat.jastadd.model.Root;
-import de.tudresden.inf.st.mquat.jastadd.model.Solution;
-import de.tudresden.inf.st.mquat.solving.SolvingException;
-import de.tudresden.inf.st.mquat.solving.ilp.ILPExternalSolver;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -18,12 +11,9 @@ public class Main {
public static void main(String[] args) {
- boolean useCurrentConfig = false;
boolean continuous = false;
- if (args.length > 0 & args[0].equals("incremental")) {
- useCurrentConfig = true;
- } else if (args.length > 0 & args[0].equals("continuous")) {
+ if (args.length > 0 & args[0].equals("continuous")) {
continuous = true;
}
@@ -32,26 +22,8 @@ public class Main {
logger.info("Running MQuAT");
timer.schedule(new ErisTask(), 0, 5000);
} else {
- ERISConnector erisConnector = new ERISConnector();
- erisConnector.read();
- Root model = ErisMQuATBuilder.createModel(erisConnector.getErisModel(), useCurrentConfig);
-
- logger.info(model.print(new MquatWriteSettings(" ")));
-
- ILPExternalSolver solver = (ILPExternalSolver) SolverFactory.getSolverByName("ilp-scip");
- solver.setDeleteFilesOnExit(false);
-
- try {
- Solution solution = solver.solve(model);
- logger.info(solution.print(new MquatWriteSettings(" ")));
- erisConnector.write(solution);
-
-
- } catch (SolvingException e) {
- e.printStackTrace();
- }
+ new ErisTask().run();
}
-
}
}
--
GitLab