Skip to content
Snippets Groups Projects
Commit 0a1ae422 authored by Sebastian Krings's avatar Sebastian Krings
Browse files

reenable minisat and increment version number

parent 68f5de66
No related branches found
No related tags found
No related merge requests found
project.version = '1.0.4-SNAPSHOT'; project.version = '1.0.4';
project.group = 'de.hhu.stups' project.group = 'de.hhu.stups'
apply plugin: 'java' apply plugin: 'java'
......
...@@ -8,6 +8,7 @@ import java.util.Map; ...@@ -8,6 +8,7 @@ import java.util.Map;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import de.stups.probkodkod.sat.SAT4JWithTimeoutFactory;
import kodkod.ast.Formula; import kodkod.ast.Formula;
import kodkod.ast.IntConstant; import kodkod.ast.IntConstant;
import kodkod.ast.Relation; import kodkod.ast.Relation;
...@@ -15,7 +16,6 @@ import kodkod.engine.Solver; ...@@ -15,7 +16,6 @@ import kodkod.engine.Solver;
import kodkod.engine.satlab.SATFactory; import kodkod.engine.satlab.SATFactory;
import kodkod.instance.Bounds; import kodkod.instance.Bounds;
import kodkod.instance.Universe; import kodkod.instance.Universe;
import de.stups.probkodkod.sat.SAT4JWithTimeoutFactory;
/** /**
* Here we determine if we use Minisat or SAT4J as back-end. We do this by * Here we determine if we use Minisat or SAT4J as back-end. We do this by
...@@ -24,9 +24,8 @@ import de.stups.probkodkod.sat.SAT4JWithTimeoutFactory; ...@@ -24,9 +24,8 @@ import de.stups.probkodkod.sat.SAT4JWithTimeoutFactory;
* @author plagge * @author plagge
*/ */
public class SolverChecker { public class SolverChecker {
private static final Logger LOGGER = Logger private static final Logger LOGGER = Logger.getLogger("de.stups.probkodkod");
.getLogger("de.stups.probkodkod"); private static final SATFactory[] FACTORIES = { SATFactory.MiniSat, new SAT4JWithTimeoutFactory() };
private static final SATFactory[] FACTORIES = { new SAT4JWithTimeoutFactory() };
// private static final SATFactory[] FACTORIES = { // private static final SATFactory[] FACTORIES = {
// new SAT4JWithTimeoutFactory(), SATFactory.MiniSat, // new SAT4JWithTimeoutFactory(), SATFactory.MiniSat,
...@@ -48,8 +47,7 @@ public class SolverChecker { ...@@ -48,8 +47,7 @@ public class SolverChecker {
} }
LOGGER.severe("No SAT solver back-end found."); LOGGER.severe("No SAT solver back-end found.");
for (final Map.Entry<String, Throwable> entry : throwables.entrySet()) { for (final Map.Entry<String, Throwable> entry : throwables.entrySet()) {
final String msg = "Error when trying to use solver: " final String msg = "Error when trying to use solver: " + entry.getKey();
+ entry.getKey();
LOGGER.log(Level.SEVERE, msg, entry.getValue()); LOGGER.log(Level.SEVERE, msg, entry.getValue());
} }
throw new Error("No SAT solver back-end for Kodkod found."); throw new Error("No SAT solver back-end for Kodkod found.");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment