Commit 78d614f3 authored by Vladislav Kiselev's avatar Vladislav Kiselev

Вырезан один локальный solver.

parent 7dd601f5
...@@ -15,11 +15,10 @@ import java.util.stream.Collectors; ...@@ -15,11 +15,10 @@ import java.util.stream.Collectors;
public class Solver { public class Solver {
public enum SolverName { public enum SolverName {
Undefined(""), Undefined(""),
Chuffed ("Chuffed"), Chuffed ("Chuffed");
OrTools ("OrTools");
public final String text; public final String text;
public static final String legalValues = "\"Chuffed\", \"OrTools\""; public static final String legalValues = "\"Chuffed\"";
SolverName(String text) { SolverName(String text) {
this.text = text; this.text = text;
...@@ -145,30 +144,6 @@ public class Solver { ...@@ -145,30 +144,6 @@ public class Solver {
solverProcess = pb.start(); solverProcess = pb.start();
break; 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: { case Undefined: {
if (flatZincSolver.isEmpty()) { if (flatZincSolver.isEmpty()) {
return "FlatZinc solver not defined!"; return "FlatZinc solver not defined!";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment