From 9e3edcf700775e1a70ba5529699dbff20d4a8f83 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?= Date: Thu, 15 Aug 2019 11:18:56 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B0=D1=80=D0=B3=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=BD=D0=B0=20=D0=B0=D0=BD=D0=B3=D0=BB=D0=B8=D0=B9?= =?UTF-8?q?=D1=81=D0=BA=D0=BE=D0=BC=20=D0=B8=D0=B7-=D0=B7=D0=B0=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC=20=D1=81=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=B4=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=D0=BC=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Make.bat | 4 ++-- src/inport/Main.java | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Make.bat b/Make.bat index 1ea9f8f..9dd7525 100644 --- a/Make.bat +++ b/Make.bat @@ -1,5 +1,5 @@ set out_dir=temp if not exist %out_dir% mkdir %out_dir% -javac -d %out_dir% -encoding UTF-8 -classpath annotations-java8.jar src/inport/*.java src/inport/ConversionUtils/*.java -jar cfe Conversion.jar inport.Main -C %out_dir% inport -C src constraints +javac -d %out_dir% -encoding UTF-8 -cp "annotations-java8.jar;org.sat4j.core.jar;org.sat4j.pb.jar;args4j-2.33.jar" src/inport/*.java src/inport/ConversionUtils/*.java +jar cfm Conversion.jar MANIFEST.MF org.sat4j.core.jar org.sat4j.pb.jar args4j-2.33.jar -C %out_dir% inport -C src constraints rmdir /s /q %out_dir% diff --git a/src/inport/Main.java b/src/inport/Main.java index 86be427..5820ad9 100644 --- a/src/inport/Main.java +++ b/src/inport/Main.java @@ -70,16 +70,16 @@ public class Main { private static void solve(Collection args) { try { class Arguments { - @Option(name = "-fzs", aliases = "--flat_zinc_solver", usage = "Путь к исполняемому файлу flatZinc solver-а.", forbids = {"-s"}) + @Option(name = "-fzs", aliases = "--flat_zinc_solver", usage = "Path to executable of flatZinc solver.", forbids = {"-s"}) private String flatZincSolver = ""; - @Argument(usage = "Путь к задаче.", required = true) + @Argument(usage = "Path to task.", required = true) private String pathToTask = ""; - @Option(name = "-ct", usage = "Тип сведения, один из " + ConversionType.legalValues + ".") + @Option(name = "-ct", usage = "Type of conversion, one of " + ConversionType.legalValues + ".") private String conversionType = ConversionType.WithoutSplitting.text; - @Option(name = "-s", aliases = "--solver", usage = "Тип solver-а из предопределённого списка : " + Solver.SolverName.legalValues + ".", + @Option(name = "-s", aliases = "--solver", usage = "Solver from list : " + Solver.SolverName.legalValues + ".", forbids = {"-fzs"}) private String solverName = Solver.SolverName.Chuffed.text; } @@ -140,13 +140,13 @@ public class Main { private static void tippToMzn(Collection args) { try { class Arguments { - @Argument(usage = "Путь к задаче.", required = true) + @Argument(usage = "Path to task.", required = true) private String pathToTask = ""; - @Option(name = "-ct", usage = "Тип сведения, один из " + ConversionType.legalValues + ".") + @Option(name = "-ct", usage = "Type of conversion, one of " + ConversionType.legalValues + ".") private String conversionType = ConversionType.WithoutSplitting.text; - @Option(name = "-o", usage = "Директория, в которую будет записан ответ.") + @Option(name = "-o", usage = "Directory for results.") private String outDir = "."; } @@ -191,13 +191,13 @@ public class Main { private static void debug(Collection args) { class Arguments { - @Option(name = "-fzs", aliases = "--flat_zinc_solver", usage = "Путь к исполняемому файлу flatZinc solver-а.", forbids = {"-s"}) + @Option(name = "-fzs", aliases = "--flat_zinc_solver", usage = "Path to executable of flatZinc solver.", forbids = {"-s"}) private String flatZincSolver = ""; - @Option(name = "-ct", usage = "Тип сведения, один из " + ConversionType.legalValues + ".") + @Option(name = "-ct", usage = "Type of conversion, one of " + ConversionType.legalValues + ".") private String conversionType = ConversionType.WithoutSplitting.text; - @Option(name = "-s", aliases = "--solver", usage = "Тип solver-а из предопределённого списка : " + Solver.SolverName.legalValues + ".", + @Option(name = "-s", aliases = "--solver", usage = "Solver from list : " + Solver.SolverName.legalValues + ".", forbids = {"-fzs"}) private String solverName = Solver.SolverName.Chuffed.text; } @@ -233,10 +233,10 @@ public class Main { private static void resolveResults(Collection args) { class Arguments { - @Argument(usage = "Путь к решению.", required = true) + @Argument(usage = "Path to solution.", required = true) private String pathToSolution = ""; - @Argument(usage = "Путь к задаче.", required = true, index = 1) + @Argument(usage = "Path to task.", required = true, index = 1) private String pathToTask = ""; } -- GitLab