From 78d614f36eedfbc26cc6361be8c192a32a3b6432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D1=81=D0=B5=D0=BB=D1=91=D0=B2=20=D0=92=D0=BB?=
 =?UTF-8?q?=D0=B0=D0=B4=D0=B8=D1=81=D0=BB=D0=B0=D0=B2?=
 <vladislav-a-k@mail.ru>
Date: Thu, 15 Aug 2019 21:43:13 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D1=80=D0=B5=D0=B7=D0=B0=D0=BD=20?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B8=D0=BD=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D1=8B=D0=B9=20solver.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/inport/ConversionUtils/Solver.java | 29 ++------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/src/inport/ConversionUtils/Solver.java b/src/inport/ConversionUtils/Solver.java
index d931721..ece7ea0 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!";
-- 
GitLab