Skip to content

GitLab

C
Conversion
Commit b956d73f authored by Vladislav Kiselev's avatar Vladislav Kiselev
Browse files
Options

Исправлены ошибки аргументов командной строки.

parent 648a3509
Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 56 deletions
src/inport/Main.java
View file @ b956d73f
...@@ -4,29 +4,38 @@ import java.io.*; ...@@ -4,29 +4,38 @@ import java.io.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.function.BiFunction; import java.util.function.Supplier;
import static inport.Testing.*; import static inport.Testing.*;
import inport.ConversionUtils.MZnResultsResolver; import inport.ConversionUtils.MZnResultsResolver;
import inport.ConversionUtils.ParserException; import inport.ConversionUtils.ParserException;
import inport.ConversionUtils.Solver;
import inport.ConversionUtils.Task; import inport.ConversionUtils.Task;
import org.kohsuke.args4j.CmdLineException;
import org.kohsuke.args4j.CmdLineParser;
import org.kohsuke.args4j.Option;
public class Main { public class Main {
private static final int DEFAULT_TIME_LIMIT_S = 3600; private static final int DEFAULT_TIME_LIMIT_S = 3600;
@Option(name="-fzs", aliases="--flat_zinc_solver", usage="Path to executable file of flat zinc solver.")
private String flatZincSolver = "";
private enum ConversionType { private enum ConversionType {
Undefined ("", (TaskCase t, Integer i) -> ""), Undefined ("", Testing::getTask_2_Solver),
WithoutSplitting("Without splitting", Testing::solveTask_2), WithoutSplitting("Without splitting", Testing::getTask_2_Solver),
WithSplitting ("With splitting", Testing::solveTaskWithPartialCargoOp), WithSplitting ("With splitting", Testing::getTaskWithPartialCargoOp_Solver),
Greedy ("Greedy", Testing::solveTaskWithGreedyConstraints), Greedy ("Greedy", Testing::getTaskWithGreedyConstraints_Solver),
Greedy_v2 ("Greedy v2", Testing::solveTaskWithGreedyConstraintsV2); Greedy_v2 ("Greedy v2", Testing::getTaskWithGreedyConstraintsV2_Solver);
private final String text; private final String text;
private final BiFunction<TaskCase, Integer, String> solver; private final Supplier<Solver> solversGetter;
ConversionType(String text, BiFunction<TaskCase, Integer, String> solver) {
ConversionType(String text, Supplier<Solver> solversGerrer) {
this.text = text; this.text = text;
this.solver = solver; this.solversGetter = solversGerrer;
} }
public static ConversionType fromString(String text) { public static ConversionType fromString(String text) {
for (ConversionType t : ConversionType.values()) { for (ConversionType t : ConversionType.values()) {
...@@ -50,11 +59,21 @@ public class Main { ...@@ -50,11 +59,21 @@ public class Main {
return s.toString(); return s.toString();
} }
public static void main(String[] args) { private void doMain(final String[] args) throws IOException {
if (args.length == 0) { final CmdLineParser parser = new CmdLineParser(this);
System.out.println("To few arguments."); if (args.length < 1) {
return; parser.printUsage(System.out);
System.exit(-1);
} }
/* TODO
try {
parser.parseArgument(args);
} catch (CmdLineException clEx) {
System.out.println("ERROR: Unable to parse command-line options: " + clEx);
}
*/
// flatZincSolver = "external_tools/or-tools_flatzinc_Ubuntu-18.04-64bit_v7.2.6977/bin/fzn-or-tools";
String type = args[0]; String type = args[0];
switch (type) { switch (type) {
...@@ -63,16 +82,11 @@ public class Main { ...@@ -63,16 +82,11 @@ public class Main {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
TaskCase task = new TaskCase(); TaskCase task = new TaskCase();
try {
task.deserialize(fileName); task.deserialize(fileName);
} catch (IOException e) {
System.out.println(e.getMessage());
break;
}
String error; Solver solver;
if (!task.isTypified()) { if (!task.isTypified()) {
error = solveTask_1(task, DEFAULT_TIME_LIMIT_S); solver = getTask_2_Solver();
} else { } else {
ConversionType t = (args.length == 2) ? ConversionType.WithoutSplitting ConversionType t = (args.length == 2) ? ConversionType.WithoutSplitting
: ConversionType.fromString(args[2]); : ConversionType.fromString(args[2]);
...@@ -80,9 +94,15 @@ public class Main { ...@@ -80,9 +94,15 @@ public class Main {
System.out.println(undefinedTypeErrorMess(args[2])); System.out.println(undefinedTypeErrorMess(args[2]));
return; return;
} }
error = t.solver.apply(task, DEFAULT_TIME_LIMIT_S); solver = t.solversGetter.get();
} }
solver.setTask(task);
solver.setTimeLimitS(DEFAULT_TIME_LIMIT_S);
solver.setTempDir("temp_data");
String error = solver.solve();
long finish = System.currentTimeMillis(); long finish = System.currentTimeMillis();
System.out.println((finish - start) + " milliseconds"); System.out.println((finish - start) + " milliseconds");
...@@ -97,24 +117,17 @@ public class Main { ...@@ -97,24 +117,17 @@ public class Main {
String input = args[1]; String input = args[1];
String output = args[2]; String output = args[2];
TaskCase task = new TaskCase(); TaskCase task = new TaskCase();
try {
task.deserialize(input); task.deserialize(input);
Task.portToMiniZinc_0(task, output); Task.portToMiniZinc_0(task, output);
} catch (IOException ex) {
System.out.println(ex.getMessage());
}
break; break;
} }
case "to_MiniZinc_1" : { case "to_MiniZinc_1" : {
String input = args[1]; String input = args[1];
String output = args[2]; String output = args[2];
TaskCase task = new TaskCase(); TaskCase task = new TaskCase();
try {
task.deserialize(input); task.deserialize(input);
Task.portToMiniZinc_1(task, output); Task.portToMiniZinc_1(task, output);
} catch (IOException ex) {
System.out.println(ex.getMessage());
}
break; break;
} }
case "resolve_result" : { case "resolve_result" : {
...@@ -129,7 +142,7 @@ public class Main { ...@@ -129,7 +142,7 @@ public class Main {
MZnResultsResolver.resolveMiniZincResults(task, fileWIthResult); MZnResultsResolver.resolveMiniZincResults(task, fileWIthResult);
task.serialize(output); task.serialize(output);
} catch (IOException | ParserException ex) { } catch (ParserException ex) {
System.out.println(ex.getMessage()); System.out.println(ex.getMessage());
} }
break; break;
...@@ -141,8 +154,12 @@ public class Main { ...@@ -141,8 +154,12 @@ public class Main {
System.out.println(undefinedTypeErrorMess(args[1])); System.out.println(undefinedTypeErrorMess(args[1]));
return; return;
} }
System.out.println(t.text); Solver s = t.solversGetter.get();
debug(t.solver, DEFAULT_TIME_LIMIT_S);
System.out.println(args[1] + " " + t.text + " " + s.getFlatZincSolver());
s.setFlatZincSolver(flatZincSolver);
debug(s, DEFAULT_TIME_LIMIT_S);
break; break;
} }
case "debug read-write" : { case "debug read-write" : {
...@@ -156,14 +173,12 @@ public class Main { ...@@ -156,14 +173,12 @@ public class Main {
System.out.println(undefinedTypeErrorMess(args[1])); System.out.println(undefinedTypeErrorMess(args[1]));
return; return;
} }
testGroup("with_typing", t.solver, DEFAULT_TIME_LIMIT_S); testGroup("with_typing", t.solversGetter.get(), DEFAULT_TIME_LIMIT_S);
test_2(DEFAULT_TIME_LIMIT_S);
break; break;
case "test_experiment": case "test_experiment":
testGroup("experiments", Testing::solveTask_2, DEFAULT_TIME_LIMIT_S); testGroup("experiments", getTask_2_Solver(), DEFAULT_TIME_LIMIT_S);
break; break;
case "different_parameters": case "different_parameters":
try {
testingWithDiffParameters( testingWithDiffParameters(
"tests/with_typing/Case2.tipp", "tests/with_typing/Case2.tipp",
1, 30, 1, 30,
...@@ -175,17 +190,22 @@ public class Main { ...@@ -175,17 +190,22 @@ public class Main {
// 10, 10, // 10, 10,
// 32, 32, // 32, 32,
// 1.1, 10); // 1.1, 10);
} catch (IOException ex) {
System.out.println(ex.getMessage());
}
break; break;
default: default:
System.out.println("Unknown type \"" + type + "\""); System.out.println("Unknown type \"" + type + "\"");
} }
} }
private static void debug(BiFunction<TaskCase, Integer, String> solver, int timeLimitS) { public static void main(String[] args) {
final Main instance = new Main();
try {
instance.doMain(args);
} catch (IOException ioEx) {
System.out.println("ERROR: I/O Exception encountered: " + ioEx);
}
}
private static void debug(Solver solver, int timeLimitS) {
String fileName = "experiment/in.ipp"; String fileName = "experiment/in.ipp";
String solverResults = "temp_data/solver_results.txt"; String solverResults = "temp_data/solver_results.txt";
String output = "experiment/debug_info.txt"; String output = "experiment/debug_info.txt";
...@@ -200,7 +220,10 @@ public class Main { ...@@ -200,7 +220,10 @@ public class Main {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
String error = solver.apply(task, timeLimitS); solver.setTimeLimitS(timeLimitS);
solver.setTempDir("temp_data");
solver.setTask(task);
String error = solver.solve();
long finish = System.currentTimeMillis(); long finish = System.currentTimeMillis();
System.out.println(" " + (finish - start) / 1000.0 + " s"); System.out.println(" " + (finish - start) / 1000.0 + " s");
...@@ -212,7 +235,8 @@ public class Main { ...@@ -212,7 +235,8 @@ public class Main {
task.serialize(fileName); task.serialize(fileName);
} }
debugInfo(task, solverResults, output); // TODO переделать для or-tools
// debugInfo(task, solverResults, output);
} }
private static void debugReadWrite() { private static void debugReadWrite() {
......
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