diff --git a/build.gradle b/build.gradle index bf85a37026ca99cef2324fe89e521a99855b69fb..e721e82945810bbd1aa3ebd2d9d63ef3436b910e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -project.version = '1.0.4-SNAPSHOT'; +project.version = '1.0.4'; project.group = 'de.hhu.stups' apply plugin: 'java' diff --git a/src/main/java/de/stups/probkodkod/SolverChecker.java b/src/main/java/de/stups/probkodkod/SolverChecker.java index 77f01842a73dae51e398993bb45ae7bf35d856ad..d8438777e2507661b94eefb436c0521569379aac 100644 --- a/src/main/java/de/stups/probkodkod/SolverChecker.java +++ b/src/main/java/de/stups/probkodkod/SolverChecker.java @@ -8,6 +8,7 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; +import de.stups.probkodkod.sat.SAT4JWithTimeoutFactory; import kodkod.ast.Formula; import kodkod.ast.IntConstant; import kodkod.ast.Relation; @@ -15,7 +16,6 @@ import kodkod.engine.Solver; import kodkod.engine.satlab.SATFactory; import kodkod.instance.Bounds; 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 @@ -24,9 +24,8 @@ import de.stups.probkodkod.sat.SAT4JWithTimeoutFactory; * @author plagge */ public class SolverChecker { - private static final Logger LOGGER = Logger - .getLogger("de.stups.probkodkod"); - private static final SATFactory[] FACTORIES = { new SAT4JWithTimeoutFactory() }; + private static final Logger LOGGER = Logger.getLogger("de.stups.probkodkod"); + private static final SATFactory[] FACTORIES = { SATFactory.MiniSat, new SAT4JWithTimeoutFactory() }; // private static final SATFactory[] FACTORIES = { // new SAT4JWithTimeoutFactory(), SATFactory.MiniSat, @@ -48,8 +47,7 @@ public class SolverChecker { } LOGGER.severe("No SAT solver back-end found."); for (final Map.Entry<String, Throwable> entry : throwables.entrySet()) { - final String msg = "Error when trying to use solver: " - + entry.getKey(); + final String msg = "Error when trying to use solver: " + entry.getKey(); LOGGER.log(Level.SEVERE, msg, entry.getValue()); } throw new Error("No SAT solver back-end for Kodkod found.");