Skip to content
Snippets Groups Projects
Commit f3d245ae authored by Daniel Plagge's avatar Daniel Plagge
Browse files

- added check directly at start-up if a SAT solver can be used

- log level is now increased to SEVERE

git-svn-id: https://cobra.cs.uni-duesseldorf.de/prob/trunk/experimental/plagge/probkodkod@12350 7aec93f6-bc54-0410-ac70-7d7c9efa889a
parent 39670979
Branches
No related tags found
No related merge requests found
...@@ -4,6 +4,7 @@ import java.io.FileWriter; ...@@ -4,6 +4,7 @@ import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.io.PrintStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.Reader; import java.io.Reader;
import java.util.logging.FileHandler; import java.util.logging.FileHandler;
...@@ -12,6 +13,7 @@ import java.util.logging.Level; ...@@ -12,6 +13,7 @@ import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.logging.SimpleFormatter; import java.util.logging.SimpleFormatter;
import kodkod.engine.satlab.SATFactory;
import de.prob.prolog.output.IPrologTermOutput; import de.prob.prolog.output.IPrologTermOutput;
import de.prob.prolog.output.PrologTermOutput; import de.prob.prolog.output.PrologTermOutput;
import de.stups.probkodkod.parser.lexer.Lexer; import de.stups.probkodkod.parser.lexer.Lexer;
...@@ -74,7 +76,7 @@ public class KodkodInteraction { ...@@ -74,7 +76,7 @@ public class KodkodInteraction {
filehandler.setFormatter(new SimpleFormatter()); filehandler.setFormatter(new SimpleFormatter());
logger.setUseParentHandlers(false); logger.setUseParentHandlers(false);
logger.addHandler(filehandler); logger.addHandler(filehandler);
logger.setLevel(Level.SEVERE); logger.setLevel(Level.INFO);
final FileWriter fw = createDumpFile(); final FileWriter fw = createDumpFile();
final Reader in; final Reader in;
...@@ -91,6 +93,8 @@ public class KodkodInteraction { ...@@ -91,6 +93,8 @@ public class KodkodInteraction {
System.out), merge.createWriter("Kodkod:"))); System.out), merge.createWriter("Kodkod:")));
} }
is_up_and_running(System.out);
KodkodInteraction interaction = new KodkodInteraction(); KodkodInteraction interaction = new KodkodInteraction();
interaction.interaction(in, out); interaction.interaction(in, out);
...@@ -103,6 +107,11 @@ public class KodkodInteraction { ...@@ -103,6 +107,11 @@ public class KodkodInteraction {
} }
} }
private static void is_up_and_running(PrintStream out) {
SATFactory satfac = SolverChecker.determineSatFactory();
out.println("ProB-Kodkod started: " + satfac.toString());
}
protected static FileWriter createDumpFile() throws IOException { protected static FileWriter createDumpFile() throws IOException {
return null; return null;
// return new FileWriter("dump.txt"); // return new FileWriter("dump.txt");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment