diff --git a/src/inport/ConversionException.java b/src/inport/ConversionException.java deleted file mode 100644 index f266122b06e46bc76ee81ea6a260e238d18b21d3..0000000000000000000000000000000000000000 --- a/src/inport/ConversionException.java +++ /dev/null @@ -1,7 +0,0 @@ -package inport; - -public class ConversionException extends Exception { - ConversionException(String mess) { - super(mess); - } -} diff --git a/src/inport/Main.java b/src/inport/Main.java index 7a1175092232cc81f2413237dea59c34ef319def..d25127a344d0940c31b7436f4bb5835cbf01ada6 100644 --- a/src/inport/Main.java +++ b/src/inport/Main.java @@ -51,22 +51,18 @@ public class Main { long start = System.currentTimeMillis(); - Process p = Runtime.getRuntime().exec("minizinc --solver Chuffed " + constraints + " " + minizincData); - p.waitFor(); + ProcessBuilder pb = new ProcessBuilder("minizinc", + "--solver", "Chuffed", + constraints, minizincData, + "-o", solverResults); + Process process = pb.start(); + int exitCode = process.waitFor(); + assert exitCode == 0; long finish = System.currentTimeMillis(); System.out.println((finish - start) + " milliseconds"); - try (FileWriter res = new FileWriter(solverResults)) { - BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream())); - - String line; - while ((line = reader.readLine()) != null) { - res.write(line + "\n"); - } - } - ConversionUtil.resolveMiniZincResults(task, solverResults); task.serialize(fileName); } catch (IOException | InterruptedException ex) {