Commit 07dc3af8 authored by Vladislav Kiselev's avatar Vladislav Kiselev

Из улучшенного интерфейса доступны основные возможности.

parent 80a9c005
......@@ -40,7 +40,7 @@ public class Solver {
private TaskCase task;
private final String constraintName;
private final BiConsumer<TaskCase, String> converterToMinizincFormat;
private final BiConsumer<TaskCase, String> converterToMiniZincFormat;
private final BiConsumer<TaskCase, String> interpreter;
private String tempDir = "temp_data";
private int timeLimitS;
......@@ -71,12 +71,18 @@ public class Solver {
public String getFlatZincSolver() {
return flatZincSolver;
}
public BiConsumer<TaskCase, String> getConverterToMiniZincFormat() {
return converterToMiniZincFormat;
}
public String getConstraintName() {
return constraintName;
}
public Solver(String constraintName,
BiConsumer<TaskCase, String> converterToMinizincFormat,
BiConsumer<TaskCase, String> converterToMiniZincFormat,
BiConsumer<TaskCase, String> interpreter) {
this.constraintName = constraintName;
this.converterToMinizincFormat = converterToMinizincFormat;
this.converterToMiniZincFormat = converterToMiniZincFormat;
this.interpreter = interpreter;
}
......@@ -122,7 +128,7 @@ public class Solver {
res.write(line + "\n");
}
}
converterToMinizincFormat.accept(task, minizincData);
converterToMiniZincFormat.accept(task, minizincData);
ProcessBuilder pb;
boolean isResultsInOutput;
......
This diff is collapsed.
......@@ -57,7 +57,11 @@ public class Testing {
}
public static void testGroup(String group, Solver solver, int timeLimitS) {
File testDir = new File("tests/" + group + "/");
testGroup("tests", group, solver, timeLimitS);
}
public static void testGroup(String topDir, String group, Solver solver, int timeLimitS) {
File testDir = new File(topDir + "/" + group + "/");
System.out.println(testDir.toString() + " :");
solver.setTimeLimitS(timeLimitS);
......
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