From a73c7d1e00d379d0221968edb0a95182de952d29 Mon Sep 17 00:00:00 2001 From: Vlad_kv Date: Fri, 15 Nov 2019 09:27:32 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=81=20opl-=D1=81=D0=BE?= =?UTF-8?q?=D0=BB=D0=B2=D0=B5=D1=80=D0=BE=D0=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/inport/Main.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/inport/Main.java b/src/inport/Main.java index 3598e50..2ebff98 100644 --- a/src/inport/Main.java +++ b/src/inport/Main.java @@ -324,14 +324,17 @@ public class Main { private static void testing(Collection args) { class Arguments { - @Option(name = "-fzs", aliases = "--flat_zinc_solver", usage = "Путь к исполняемому файлу flatZinc solver-а.", forbids = {"-s"}) + @Option(name = "-fzs", aliases = "--flat_zinc_solver", usage = "Путь к исполняемому файлу flatZinc solver-а.", forbids = {"-s", "-opls"}) private String flatZincSolver = ""; + @Option(name = "-opls", aliases = "--opl_solver", usage = "Path to \"oplrun\" from CPLEX.", forbids = {"-s", "-fzs"}) + private String oplSolver = ""; + @Option(name = "-ct", usage = "Тип сведения, один из " + ConversionType.legalValues + ".") private String conversionType = ConversionType.WithoutSplitting.text; @Option(name = "-s", aliases = "--solver", usage = "Тип solver-а из предопределённого списка : " + Solver.SolverName.legalValues + ".", - forbids = {"-fzs"}) + forbids = {"-fzs", "-opls"}) private String solverName = Solver.SolverName.Chuffed.text; @Option(name = "-d", aliases = "--test_dir", usage = "Директория, задачи из которых необходимо протестировать.") @@ -355,10 +358,14 @@ public class Main { } Solver s = t.solversGetter.get(); - if (arguments.flatZincSolver.isEmpty()) { - s.setSolverName(arguments.solverName); - } else { + if (! arguments.flatZincSolver.isEmpty()) { s.setFlatZincSolver(arguments.flatZincSolver); + } else if (! arguments.oplSolver.isEmpty()) { + s.setOPLSolver(arguments.oplSolver); + s.setConstraintName(s.getConstraintName().replace(".mzn", ".mod")); + s.setConversionFormat(Task.ConversionFormat.OPL); + } else { + s.setSolverName(arguments.solverName); } testGroup(arguments.testDir, "", s, DEFAULT_TIME_LIMIT_S); } catch (CmdLineException ex) { -- GitLab