diff --git a/src/inport/ConversionUtils/Solver.java b/src/inport/ConversionUtils/Solver.java index d9317212845e1d42ee55ef2e9d86e66b37788955..ece7ea00783a893cc3fc555c53357b0239aab32d 100644 --- a/src/inport/ConversionUtils/Solver.java +++ b/src/inport/ConversionUtils/Solver.java @@ -15,11 +15,10 @@ import java.util.stream.Collectors; public class Solver { public enum SolverName { Undefined(""), - Chuffed ("Chuffed"), - OrTools ("OrTools"); + Chuffed ("Chuffed"); public final String text; - public static final String legalValues = "\"Chuffed\", \"OrTools\""; + public static final String legalValues = "\"Chuffed\""; SolverName(String text) { this.text = text; @@ -145,30 +144,6 @@ public class Solver { solverProcess = pb.start(); break; } - case OrTools: { - isResultsInOutput = true; - { - ProcessBuilder lPB = new ProcessBuilder("mzn2fzn", - "-o", flatZincConstraints, - constraints, - minizincData); - Process process = lPB.start(); - process.waitFor(); - - BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream())); - String output = br.lines().collect(Collectors.joining("\n")); - - if (output.trim().equals("=====UNSATISFIABLE=====")) { - task.setSolution(new ArrayList<>()); - task.setSolution_result(-1); - return ""; - } - } - pb = new ProcessBuilder("external_tools/or-tools_flatzinc_Ubuntu-18.04-64bit_v7.2.6977/bin/fzn-or-tools", - flatZincConstraints); - solverProcess = pb.start(); - break; - } case Undefined: { if (flatZincSolver.isEmpty()) { return "FlatZinc solver not defined!";