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

remove 'legacy' grouped mode, simplify single mode

parent be8c7d06
No related branches found
No related tags found
No related merge requests found
......@@ -46,14 +46,3 @@ task eris(type: JavaExec, dependsOn: assemble) {
args(scenario.split(','))
}
}
\ No newline at end of file
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
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();
}
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment